Commit Graph

217 Commits

Author SHA1 Message Date
Sergeanur
d7e764d519 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/AudioLogic.cpp
#	src/core/config.h
#	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-08-16 10:09:39 +03:00
erorcun
435b8fe52e Fix impossible bullets 2021-08-15 18:34:43 +03:00
Nikolay Korolev
74f00c3c63 merge 2021-08-08 15:46:47 +03:00
Nikolay Korolev
88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Nikolay Korolev
c69edce800 mission replay 2021-08-07 20:24:01 +03:00
Nikolay Korolev
70080f1fdb mission replay 2021-08-01 12:54:05 +03:00
Sergeanur
6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
Sergeanur
250727c9ca Fix muzzleflash rotation 2021-07-26 09:52:39 +03:00
Sergeanur
cafc0f3c10 Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:28:01 +03:00
Sergeanur
123f2fda9b Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:22:57 +03:00
Nikolay Korolev
b69222e017 friggin the riggin 2021-07-25 11:58:03 +03:00
Sergeanur
cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
Sergeanur
bbbe9b2632 Fix enum use 2021-07-22 07:06:54 +03: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
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
erorcun
a8549e86a7 Sanitizer fixes 2 2021-07-03 01:42:24 +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
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
withmorten
f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe.
2021-06-26 19:14:46 +02:00
erorcun
af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup"
This reverts commit 2b67aba94c.
2021-06-26 00:25:59 +03:00
Sergeanur
2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur
786e101acf Use bool8 in audio code 2021-06-24 21:32:43 +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
Sergeanur
9fce8636b0 Fix muzzleflash rotation 2021-02-26 20:37:22 +02:00
Sergeanur
c5303c2ea4 Fix muzzleflash rotation 2021-02-26 20:31:26 +02: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
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
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
Sergeanur
97351ad2c2 Use original animation names from VCS 2021-01-27 18:50:24 +02:00
Sergeanur
0f623c2354 Use original animation names from VCS 2021-01-26 19:35:40 +02:00
Sergeanur
9647901ba0 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Sergeanur
cc94419a72 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
2021-01-20 19:32:03 +02:00
Fire-Head
8989b5ea39 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-15 19:13:05 +03:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
aap
7994b80dcf fixed weapon LOS check 2021-01-13 20:10:04 +01:00
Fire-Head
3648ef4687 lcs particle 2021-01-13 00:07:24 +03:00
shfil
d11325cf0f
Fix UB in ProjectileInfo.cpp 2020-12-31 16:34:50 +01:00
shfil
9938d04ca7
Fix UB in ProjectileInfo.cpp 2020-12-31 16:33:34 +01:00