mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-11-10 21:04:55 +00:00
Code Issues Projects Releases Wiki Activity
4857 commits 3 branches 0 tags 56 MiB
Commit graph

4085 commits

Author SHA1 Message Date
Sergeanur 601f63f4fb Sync fix from master 2021-07-25 19:50:00 +03:00
Nikolay Korolev b69222e017 friggin the riggin 2021-07-25 11:58:03 +03:00
Nikolay Korolev dc729009ac Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-24 01:02:23 +03:00
Sergeanur bf757fc960 Fix CPlayerInfo distance types 2021-07-24 00:59:19 +03:00
Sergeanur aec797671e Fix aiming with minigun and flamethrower with PC controls 2021-07-22 22:15:27 +03:00
Sergeanur cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
Sergeanur 5e34b1efcf Possible fix of RemoveAndAdd crash 2021-07-22 20:37:49 +03:00
Sergeanur 953e4fc4ff Fix falling damage 2021-07-22 20:07:51 +03:00
Sergeanur bbbe9b2632 Fix enum use 2021-07-22 07:06:54 +03:00
Sergeanur a1444b992f Fix Predator shooting sound 2021-07-22 07:01:04 +03:00
withmorten 76558e9313 fix garbage data written in garage save block 2021-07-19 23:44:01 +02:00
Sergeanur 7a034142c9 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
 2021-07-18 00:05:51 +03:00
Sergeanur c937bdbfea render -> renderer (original name) 2021-07-18 00:03:57 +03:00
Nikolay Korolev cb7f18f268 fix 2021-07-17 15:49:28 +03:00
Nikolay Korolev 0a23afebb7 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-17 10:06:37 +03:00
withmorten ec5a07b049 Merge remote-tracking branch 'origin/miami' into lcs 2021-07-15 19:11:32 +02:00
withmorten c8cb1ed013
Merge pull request #1219 from withmorten/miami-ini 
miami: switch out current ini_parser.hpp with pulzed/mINI
 2021-07-15 18:56:14 +02:00
Sergeanur 780cd225e9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:12 +03:00
Sergeanur 3377709c4b Merge branch 'miami' into lcs 2021-07-15 00:51:01 +03:00
Sergeanur 02c4ada807 Remove stupid cast 2021-07-15 00:49:46 +03:00
Nikolay Korolev 81aece7117 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-13 19:43:48 +03:00
Magnus Larsen fb5a207abc Fix NearPed count going negative 2021-07-13 17:45:01 +02:00
withmorten 523b23339c disable USE_CUTSCENE_SHADOW_FOR_PED if COMPATIBLE_SAVES isn't defined 2021-07-13 00:21:11 +02:00
Sergeanur c982700a69 Enable cutscene shadows 2021-07-13 01:00:00 +03:00
withmorten 6f0f9d7d69 Merge remote-tracking branch 'origin/miami' into lcs 2021-07-12 23:36:37 +02:00
withmorten 6c097398d1 fix FixGarages 2021-07-12 22:47:17 +02:00
Nikolay Korolev 91d958bf27 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-12 10:32:01 +03:00
Nikolay Korolev bef07b6353 small changes 2021-07-12 10:31:48 +03:00
withmorten 2f7ae611ed Vanilla config for Windows and win-x86 only 2021-07-12 04:26:27 +02:00
Sergeanur 55d30a11ec Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioManager.h
#	src/control/Garages.cpp
#	src/control/Garages.h
#	src/control/Script5.cpp
#	src/core/config.h
#	utils/gxt/american.txt
#	utils/gxt/spanish.txt
 2021-07-12 04:13:22 +03:00
Sergeanur 3f5fdc39a5 Reorganize config.h 2021-07-12 03:58:34 +03:00
withmorten 6f52ad190e miami: switch out current ini_parser.hpp with pulzed/mINI 2021-07-12 01:23:46 +02:00
erorcun 02e84b4b97
Merge pull request #1150 from withmorten/miami-saves 
miami: finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
 2021-07-12 01:07:32 +03:00
Nikolay Korolev 776d46aacb Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-11 10:23:59 +03:00
withmorten f686065769 get rid of // done comments in audiomanager.h 2021-07-11 03:59:37 +02:00
withmorten 58de524d70 tiny diff fix 2021-07-11 03:26:59 +02:00
withmorten 8a114514d9 fix hotring flap stat line 2021-07-11 00:30:26 +02:00
erorcun 9f0a96ac89 Physical: division by zero fix 2021-07-10 23:27:00 +03:00
withmorten 6f103a3b82 finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 02:06:43 +02:00
Sergeanur 71d1b46417 Merge branch 'miami' into lcs 
# Conflicts:
#	utils/gxt/german.txt
 2021-07-10 02:07:14 +03:00
Sergeanur 4981fe3091 Remove redundant SampleManager.InitialiseChannel call 2021-07-10 02:06:35 +03:00
withmorten ffe199290b fix jittery cars at 15fps 2021-07-09 18:51:27 +02:00
withmorten 0b269571d7 add librw defines to vanilla defines undefs 2021-07-09 18:05:26 +02:00
Sergeanur d781db6c0f Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
 2021-07-09 00:05:26 +03:00
Sergeanur 7a1ff3b2ad Mission audio cleanup + sound pause 2021-07-09 00:02:35 +03:00
Sergeanur 72f6780905 Use CPad functions to check key states in script loader 2021-07-08 03:37:14 +03:00
withmorten 79c010f082 fix macro redefinition warnings on win-glfw build 2021-07-08 01:44:55 +02:00
withmorten e6544a6983 fix sampman_null build 2021-07-07 01:59:16 +02:00
mssx86 c5e896c420 fix: add missing limits.h includes to enable bulding on musl. 2021-07-05 22:40:21 +02:00
Nikolay Korolev 62425b5866 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-04 15:24:54 +03:00
withmorten 70876d3cde fix screenshot name 2021-07-03 16:43:35 +02:00
Sergeanur 5d5e0f62e8 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
 2021-07-03 16:39:22 +03:00
Sergeanur 3ed4cdf109 Fix overflow in audio code 2021-07-03 15:57:08 +03:00
erorcun 1c0878f65b Sanitizer fixes 2 2021-07-03 02:57:32 +03:00
withmorten 43631ba203 smol fix 2 2021-07-03 01:40:26 +02:00
withmorten f9f854c4a8 smol fix 2021-07-03 01:36:44 +02:00
erorcun 4eea98c66b Peds: Efforts to find the reason of crashes on GCC 7.5.0 
* Prevent deleted peds to be in nearPeds list (was always needed, might be unrelated to crashes)
* Add asserts to nearPeds and PedIK ctor (crash reasons)
* Shouldn't fix reported crashes since they were caused by null peds.
 2021-07-02 23:56:54 +03:00
Nikolay Korolev 10cc444482 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-02 11:28:46 +03:00
Sergeanur 987e09515b Fix use of integer in RemoveBuildingsNotInArea call 2021-07-02 10:33:45 +03:00
Sergeanur 9ea3549743 GameLogic - type fixes 2021-07-02 10:30:39 +03:00
Sergeanur ae4bfef590 Refactor OnscreenTimer 2021-07-02 10:22:34 +03:00
Sergeanur 8e6e46a919 Fix collision loading for mission entities 2021-07-02 00:18:38 +03:00
withmorten 65219365db fix compilation when ctype.h is included 2021-07-01 21:51:52 +02:00
Sergeanur 3988fec6e7 Fix sound of water when changing MSAA or windowed/fullscreen mode 2021-07-01 21:39:15 +03:00
withmorten 2d38eb923d zero out work_buff before writing padding in save 2021-07-01 18:09:32 +02:00
Sergeanur dd790b00e5 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/MusicManager.cpp
 2021-06-30 21:46:08 +03:00
Sergeanur cb72fee941 fix 2021-06-30 21:45:19 +03:00
Sergeanur 138abb91f6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script4.cpp
#	src/core/Frontend.cpp
 2021-06-30 21:26:36 +03:00
Sergeanur a73a2c9179 Pause radio when game is paused 2021-06-30 21:21:45 +03:00
Sergeanur b1c9340fd3 Fix unused code 2021-06-30 21:16:48 +03:00
withmorten abe57fefa0 fix some string sizes to be MAX_PATH 2021-06-30 16:28:07 +02:00
Sergeanur d31a7e24a8 Fix text in elevator cam 2021-06-30 13:53:10 +03:00
erorcun cac1c5bd42 Saner loop 2021-06-30 04:12:59 +03:00
erorcun 9f0daee186 Sanitizer fixes 2021-06-30 03:31:10 +03:00
withmorten de4699a97e fix no VALIDATE_SAVE_SIZE build 2021-06-28 18:14:15 +02:00
erorcun fdbd414299 Fix MP3 finding stack crash 2021-06-28 17:44:48 +03:00
withmorten d17d437de3 rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake) 2021-06-28 13:57:05 +02:00
Sergeanur 1c5a864598 Fix script load 2021-06-28 05:23:58 +03:00
Sergeanur eaebaa6db3 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
 2021-06-28 05:16:21 +03:00
Sergeanur f8297df9c5 Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
Sergeanur 3e9c983f5c
Merge pull request #1153 from kusst/texread 
Make colors in texture conversion dialog more LCSy.
 2021-06-27 23:24:16 +03:00
Nikolay Korolev 73e112a217 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-27 14:53:43 +03:00
Sergeanur 879761af2c Merge fixes 2021-06-27 14:51:48 +03:00
Sergeanur c7243aa2e9 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:49:14 +03:00
erorcun 3587cb029e Remove waiting for stream closure in multi-thread audio 2021-06-27 14:42:52 +03:00
Sergeanur 883d8172b0 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:33:39 +03:00
erorcun 05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03:00
erorcun 9c8ef3cca0
Merge pull request #1151 from erorcun/miami 
Multi-threaded audio streams on OAL
 2021-06-26 16:28:43 +03:00
erorcun 107c4df69c Multi-threaded audio streams 
Under MULTITHREADED_AUDIO define.
 2021-06-26 16:24:23 +03:00
Nikolay Korolev 636f67ca3f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-26 14:34:52 +03:00
Sergeanur d4ba7c387b Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/render/Particle.cpp
 2021-06-26 14:27:54 +03:00
Sergeanur 831737ecc8 Fixes 2021-06-26 14:25:40 +03:00
withmorten 9ab4f1a2d9 fix screenshot name space 2021-06-26 13:13:43 +02:00
Sergeanur 225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
kusst ebd980bf14
Make colors in texture conversion dialog more LCSy. 2021-06-25 22:45:21 +02:00
withmorten c869602b6d
Merge pull request #1148 from withmorten/miami-githash 
miami: add no-git-hash option to premake
 2021-06-25 19:51:52 +02:00
erorcun 9382e86d38 Fix Particle FPE 2021-06-25 18:29:38 +03:00
Nikolay Korolev 8a5afd0db2 sync 2021-06-25 10:15:19 +03:00
withmorten 4e3fc35401 add no-git-hash option to premake 2021-06-25 02:41:40 +02:00
Sergeanur a3ae267e83 Merge branch 'miami' into lcs 2021-06-25 02:41:33 +03:00