Commit Graph

1244 Commits

Author SHA1 Message Date
827f0ffbb6 move debug 2021-08-07 20:35:01 +03:00
883e8390c9 move debug script stuff to a separate file 2021-08-07 20:26:33 +03:00
c69edce800 mission replay 2021-08-07 20:24:01 +03:00
a481b900b9 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/modelinfo/MloModelInfo.cpp
#	src/modelinfo/MloModelInfo.h
#	src/renderer/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
2021-07-31 20:43:52 +03:00
835fa4e74b Make cars and peds to not despawn when you look away
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/core/config.h
#	src/peds/Population.cpp
2021-07-31 20:32:13 +03:00
ec7d702185 Merge pull request #1255 from Nick007J/lcs
low effort save support
2021-07-27 20:59:08 +03:00
6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
0461a36a4e fix 2021-07-26 21:59:56 +03:00
ed9c911a0e Fix traffic light corona facing wrong side 2021-07-26 04:40:23 +03:00
c7d3b88cb7 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-25 21:44:31 +03:00
bf4b39781b low effort save support 2021-07-25 21:44:21 +03:00
d83b8cf940 Merge branch 'miami' into lcs
# Conflicts:
#	src/renderer/Hud.cpp
2021-07-25 21:01:00 +03:00
b69222e017 friggin the riggin 2021-07-25 11:58:03 +03:00
dc729009ac Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-24 01:02:23 +03:00
aec797671e Fix aiming with minigun and flamethrower with PC controls 2021-07-22 22:15:27 +03:00
cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
76558e9313 fix garbage data written in garage save block 2021-07-19 23:44:01 +02:00
91d958bf27 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-12 10:32:01 +03:00
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
776d46aacb Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-11 10:23:59 +03:00
6f103a3b82 finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 02:06:43 +02:00
d781db6c0f Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	premake5.lua
2021-07-09 00:05:26 +03:00
72f6780905 Use CPad functions to check key states in script loader 2021-07-08 03:37:14 +03:00
79c010f082 fix macro redefinition warnings on win-glfw build 2021-07-08 01:44:55 +02:00
62425b5866 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-04 15:24:54 +03:00
5d5e0f62e8 Merge branch 'miami' into lcs
# Conflicts:
#	premake5.lua
2021-07-03 16:39:22 +03:00
10cc444482 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-02 11:28:46 +03:00
987e09515b Fix use of integer in RemoveBuildingsNotInArea call 2021-07-02 10:33:45 +03:00
9ea3549743 GameLogic - type fixes 2021-07-02 10:30:39 +03:00
ae4bfef590 Refactor OnscreenTimer 2021-07-02 10:22:34 +03:00
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
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
1c5a864598 Fix script load 2021-06-28 05:23:58 +03:00
eaebaa6db3 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
2021-06-28 05:16:21 +03:00
f8297df9c5 Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
636f67ca3f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-26 14:34:52 +03:00
831737ecc8 Fixes 2021-06-26 14:25:40 +03:00
8a5afd0db2 sync 2021-06-25 10:15:19 +03:00
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
3aac4ea62a Fix sin & cos calls 2021-06-24 21:45:48 +03:00
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
c7821635fd Wait states ported (scripted animations) 2021-06-24 21:42:10 +03:00
1471c82a20 LCS sfx + mission audio 2021-06-24 21:42:08 +03:00
6e4a2947ea Fix sin & cos calls 2021-06-24 21:34:33 +03:00
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
8f54093de1 Merge branch 'miami' into lcs
# Conflicts:
#	src/core/World.cpp
2021-05-10 02:48:56 +03:00
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
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
60bc816af5 nil -> false 2021-02-19 16:32:25 +01:00
cba1f85026 Add russian support 2021-02-18 11:34:23 +02:00