Commit Graph

1974 Commits

Author SHA1 Message Date
Adrian Graber
28f266302f Add Nintendo Switch initial support 2021-07-13 00:49:13 +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
Nikolay Korolev
91d958bf27 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-12 10:32:01 +03:00
withmorten
2f7ae611ed Vanilla config for Windows and win-x86 only 2021-07-12 04:26:27 +02:00
withmorten
f50026828a Vanilla config for Windows and win-x86 only 2021-07-12 04:24:10 +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
withmorten
ac3905123e fix 2021-07-12 03:10:02 +02:00
Sergeanur
3f5fdc39a5 Reorganize config.h 2021-07-12 03:58:34 +03:00
Sergeanur
b4364c3672 Reorganize config.h 2021-07-12 03:34:37 +03:00
withmorten
6f52ad190e miami: switch out current ini_parser.hpp with pulzed/mINI 2021-07-12 01:23:46 +02:00
withmorten
c0cbf8045f switch out current ini_parser.hpp with pulzed/mINI 2021-07-12 01:19:22 +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
erorcun
a8fd3f828a
Merge pull request #1149 from withmorten/saves
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-12 01:06:59 +03:00
erorcun
291213ed40 Unite all sliders 2021-07-12 00:51:45 +03:00
erorcun
2a6f9c2757 Add ped and car density slider to menu, remove dumb collision "optimization" 2021-07-12 00:12:25 +03:00
Nikolay Korolev
776d46aacb Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-11 10:23:59 +03:00
withmorten
8a114514d9 fix hotring flap stat line 2021-07-11 00:30:26 +02:00
erorcun
d82dbf91ef Merge/sync fixes after threaded audio 2021-07-10 23:14:13 +03:00
erorcun
5458632c40 Multi-threaded audio fixes 2021-07-10 23:13:51 +03:00
erorcun
ab73c2f539 Multi-threaded audio streams
Under MULTITHREADED_AUDIO define.
2021-07-10 23:13:42 +03:00
withmorten
011aafa043 finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 17:30:27 +02: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
withmorten
0b269571d7 add librw defines to vanilla defines undefs 2021-07-09 18:05:26 +02:00
withmorten
e2ae17d994 add librw defines to vanilla defines undefs 2021-07-09 18:02:36 +02:00
Sergeanur
d781db6c0f Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	premake5.lua
2021-07-09 00:05:26 +03:00
Sergeanur
72f6780905 Use CPad functions to check key states in script loader 2021-07-08 03:37:14 +03:00
Sergeanur
47f153fe76 Use CPad functions to check key states in script loader 2021-07-08 03:24:47 +03:00
mssx86
c5e896c420 fix: add missing limits.h includes to enable bulding on musl. 2021-07-05 22:40:21 +02:00
erorcun
386b113603
Merge pull request #1187 from mssx86/musl_fix
fix: add missing limits.h includes to enable bulding on musl.
2021-07-05 20:50:18 +03: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
withmorten
060c1181bc fix previous PED_SKIN commit, add comments 2021-07-03 02:52:54 +02:00
erorcun
1c0878f65b Sanitizer fixes 2 2021-07-03 02:57:32 +03:00
withmorten
63d9d9c148 disable PED_SKIN and PEDS_REPORT_CRIMES_ON_PHONE when COMPATIBLE_SAVES is disabled 2021-07-03 01:32:04 +02:00
erorcun
a8549e86a7 Sanitizer fixes 2 2021-07-03 01:42:24 +03:00
Nikolay Korolev
10cc444482 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-02 11:28:46 +03:00
Sergeanur
3988fec6e7 Fix sound of water when changing MSAA or windowed/fullscreen mode 2021-07-01 21:39:15 +03:00
mssx86
b8e80a67ea
fix: add missing limits.h includes to enable bulding on musl. 2021-07-01 20:12:28 +03:00
Sergeanur
a3964dfd4a Pause radio when game is paused 2021-06-30 21:36:11 +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
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
withmorten
cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +02: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
erorcun
cc235be3aa Less invasive red tint on Delete Game page 2021-06-27 18:14:34 +03:00
Nikolay Korolev
73e112a217 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-27 14:53:43 +03:00
Sergeanur
883d8172b0 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:33:39 +03:00
erorcun
a923728877 Fix map texture leak 2021-06-27 00:34:46 +03:00
erorcun
05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03:00
withmorten
f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe.
2021-06-26 19:14:46 +02: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
withmorten
9ab4f1a2d9 fix screenshot name space 2021-06-26 13:13:43 +02:00
withmorten
171d9fd036 fix screenshot name space 2021-06-26 13:13:07 +02:00
Sergeanur
225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
Sergeanur
6cb8c11285 Fix premature CTimer calls 2021-06-26 04:09:45 +03:00
Sergeanur
3092b9a46e Small timer fix 2021-06-26 01:56:29 +03:00
erorcun
9b5caa190e Pool fixes
Mostly for Linux
2021-06-26 00:27:20 +03:00
erorcun
af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup"
This reverts commit 2b67aba94c.
2021-06-26 00:25:59 +03:00
withmorten
4bab6d5356
Merge pull request #1147 from withmorten/githash
add no-git-hash option to premake
2021-06-25 19:51:45 +02:00
Sergeanur
2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +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
withmorten
84fb48825d add no-git-hash option to premake 2021-06-25 02:40:42 +02:00
Sergeanur
a3ae267e83 Merge branch 'miami' into lcs 2021-06-25 02:41:33 +03:00
Sergeanur
f46461331c Refactor CTimer::Update 2021-06-25 02:40:56 +03:00
Sergeanur
1f082a85cb Refactor CTimer::Update 2021-06-25 02:33:40 +03:00
Sergeanur
4660491243 Timer fix 2021-06-25 02:22:07 +03:00
Sergeanur
e671fe682d Merge remote-tracking branch 'GitHub/miami' into lcs 2021-06-25 00:47:06 +03:00
Sergeanur
e5aa150557 Frontend fix 2021-06-25 00:40:00 +03:00
Sergeanur
14c71f39ff High FPS Fixes 2021-06-25 00:39:47 +03:00
Sergeanur
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur
776e8ff2ee Fix some timer calls 2021-06-24 21:45:48 +03:00
Sergeanur
3aac4ea62a Fix sin & cos calls 2021-06-24 21:45:48 +03:00
Sergeanur
1558788df1 Fix IsSphereVisible calls 2021-06-24 21:45:48 +03:00
aap
e014bb5359 CEntity done; C(Vu)Vector fixes and cleanup 2021-06-24 21:45:21 +03:00
Sergeanur
fb03ee45b5 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES
# Conflicts:
#	src/core/config.h
2021-06-24 21:45:21 +03:00
Sergeanur
60bb16d26c Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:45:18 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
0c3ee871f4 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:42:10 +03:00
Sergeanur
714cd47db9 Original pool sizes 2021-06-24 21:42:10 +03:00
Sergeanur
499b16678f Fix engine sounds, player and male01 ped comments 2021-06-24 21:42:10 +03:00
Sergeanur
fad64667a7 Fix some timer calls 2021-06-24 21:34:33 +03:00
Sergeanur
6e4a2947ea Fix sin & cos calls 2021-06-24 21:34:33 +03:00
Sergeanur
f2c8522daa Fix IsSphereVisible calls 2021-06-24 21:34:33 +03:00
aap
93e9929925 CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:34:33 +03:00
Sergeanur
be019c6126 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES
# Conflicts:
#	src/core/config.h
2021-06-24 21:34:33 +03:00
Sergeanur
02655313e9 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:34:33 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur
bd94c16e78 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:34:32 +03:00
erorcun
618d689dff Pool fixes + peds not forming circle fix 2021-06-24 21:34:28 +03:00
Sergeanur
2592da2273 Remove frameTime, fix pause mode timer 2021-06-24 21:32:44 +03:00
Sergeanur
b90784da90 Make times more accurate 2021-06-24 21:32:44 +03:00
Sergeanur
f741101e44 Fix redone + add hud fix 2021-06-24 21:32:44 +03:00
Sergeanur
cacec36dd1 Fix cut off sfx on high framerates 2021-06-24 21:32:44 +03:00
Sergeanur
68b5270fe4 Fix some timer calls 2021-06-24 21:32:43 +03:00
Sergeanur
a11bf19b93 Fix sin & cos calls 2021-06-24 21:32:43 +03:00
Sergeanur
2ad3a75be5 Fix IsSphereVisible calls 2021-06-24 21:32:43 +03:00
aap
50058371ef CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:32:43 +03:00
Sergeanur
ce0a097392 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES 2021-06-24 21:32:43 +03:00
Sergeanur
7a2dbd9112 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:32:43 +03:00
Sergeanur
786e101acf Use bool8 in audio code 2021-06-24 21:32:43 +03:00
Sergeanur
596e12b897 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:32:43 +03:00
Sergeanur
6537dfe7f1 Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fix 2021-06-24 21:32:43 +03:00
aap
c58d98a39e fix new renderer 2021-06-24 21:32:43 +03:00
Sergeanur
19dd95a1cb Merge branch 'miami' into lcs
* miami:
  Pool fixes + peds not forming circle fix
2021-05-18 08:12:47 +03:00
Sergeanur
3596897961 Merge pull request 'Pool fixes + peds not forming circle fix' (#4) from erorcun/re3:miami into miami
Reviewed-on: https://git.jacksmininetwork.co.uk/re/re3/pulls/4
2021-05-18 04:33:47 +00:00
Sergeanur
8f54093de1 Merge branch 'miami' into lcs
# Conflicts:
#	src/core/World.cpp
2021-05-10 02:48:56 +03:00
Sergeanur
3dda658e42 Use some GetMatrix/SetMatrix logic based on SA
# Conflicts:
#	src/control/Pickups.cpp
#	src/control/RoadBlocks.cpp
#	src/core/World.cpp
#	src/entities/Entity.cpp
#	src/objects/CutsceneHead.cpp
#	src/objects/Object.cpp
2021-05-10 02:45:04 +03:00
Sergeanur
1817727a66 Small Acos fix 2021-05-10 02:36:18 +03:00
Sergeanur
519218572a Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
2021-04-09 04:31:46 +03:00
erorcun
62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +03:00
aap
6122f6980b fix new renderer 2021-02-28 19:07:46 +01:00
aap
82245789ed proper radar clipping 2021-02-28 14:55:14 +01:00
aap
931bc690cd proper radar clipping 2021-02-28 14:55:01 +01:00
aap
d2b5a422e4 update librw 2021-02-28 14:17:14 +01:00
aap
087174c6a6 update librw; little fix 2021-02-28 14:15:22 +01:00
erorcun
a311f643f9 Fixes 2021-02-28 15:50:51 +03:00
Sergeanur
f6910d35f7 Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/render/Font.cpp
2021-02-26 11:07:32 +02:00
aap
b88cf7b939 make debug render groups optional 2021-02-19 18:41:47 +01:00
aap
9a7fa47857 make debug render groups optional 2021-02-19 18:41:31 +01:00
withmorten
82322293fe rename error strings to RELCS 2021-02-18 23:01:46 +01:00
withmorten
4eea06e620 name error strings to REVC 2021-02-18 22:59:40 +01:00
withmorten
781617d484 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:55:26 +01:00
withmorten
48cec4a786 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:40:32 +01:00
aap
3457ff48ce d3d9 debug render groups 2021-02-18 13:08:29 +01:00
aap
253021866c d3d9 debug render groups 2021-02-18 13:08:22 +01:00
aap
146ad3b4a1 fix last commit 2021-02-18 12:23:33 +01:00
aap
e8b435a624 fix last commit 2021-02-18 12:23:26 +01:00
aap
996772faf2 add debug render groups 2021-02-18 12:21:52 +01:00
aap
9db87fc636 add debug render groups 2021-02-18 12:21:47 +01:00
Sergeanur
cba1f85026 Add russian support 2021-02-18 11:34:23 +02:00
withmorten
037c332158 Merge remote-tracking branch 'origin/miami' into lcs 2021-02-18 02:38:12 +01:00
Sergeanur
ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02:00
Sergeanur
ee6b7152c7 Fix endless vibration in pause menu 2021-02-17 15:04:53 +02:00
Steve Wills
2b6628aa65 Fix seg fault when configuring controller 2021-02-17 01:12:39 +03:00
erorcun
4d8f340827
Merge pull request #1050 from swills/controller_config_segfault_fix
Fix seg fault when configuring controller
2021-02-16 22:29:55 +03:00
Sergeanur
d37dc246eb Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  Fix buffer overflow on re3_sem_open/close
2021-02-16 19:41:02 +02:00
Adrian Graber
88c11e92d3 Fix buffer overflow on re3_sem_open/close 2021-02-16 18:26:07 +01:00
Adrian Graber
19b39f49fa
Fix buffer overflow on re3_sem_open/close 2021-02-16 18:12:21 +01:00
Steve Wills
e482ab6292 Fix mistake 2021-02-16 11:13:20 -05:00
Sergeanur
21278356ec Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  Fix FindClose->closedir
  Only include sys/syscall.h when __linux__ is defined
  Add unnamed semaphore define toggle for CdStreamPosix
  Fix rare stream deadlock on Windows
2021-02-16 18:08:34 +02:00
Sergeanur
e38467ef3a Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	premake5.lua
#	src/animation/AnimManager.cpp
#	src/animation/AnimationId.h
#	src/audio/MusicManager.cpp
#	src/audio/audio_enums.h
#	src/control/Script7.cpp
#	src/core/FileLoader.cpp
#	src/core/re3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/postfx.cpp
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_PS.hlsl
#	src/extras/shaders/make_hlsl.cmd
#	src/extras/shaders/obj/colourfilterVC_PS.cso
#	src/extras/shaders/obj/colourfilterVC_PS.inc
#	src/extras/shaders/obj/colourfilterVC_frag.inc
#	src/peds/PedFight.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Particle.cpp
#	src/render/WaterCannon.cpp
#	src/skel/win/gtavc.ico
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt
2021-02-16 18:08:19 +02:00