Commit graph

4800 commits

Author SHA1 Message Date
Nikolay Korolev
dc729009ac Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-24 01:02:23 +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
026a2b3f1f Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp
#	src/core/config.h
2021-07-15 18:07:22 +03: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
17fca82401 Update GXT 2021-07-15 00:50:41 +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
b69cee3801 fix premake 2021-07-12 23:28:05 +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
Sergeanur
dc29e7c044 Add PED DENSITY and CAR DENSITY lines to GXT 2021-07-11 23:55:11 +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
withmorten
61c2398b67
readme: fix lto option 2021-07-10 01:17:38 +02:00
Sergeanur
6a2ce20313 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	gamefiles/TEXT/german.gxt
#	utils/gxt/german.txt
2021-07-10 02:10:12 +03:00
withmorten
41f3d4d9d7 recompile german.gxt 2021-07-10 01:07:47 +02:00
Sergeanur
71d1b46417 Merge branch 'miami' into lcs
# Conflicts:
#	utils/gxt/german.txt
2021-07-10 02:07:14 +03:00
withmorten
df8ef2d58d
Merge pull request #1135 from RuesanG/patch-2
Update reVC German.txt
2021-07-10 01:07:13 +02:00
Sergeanur
4981fe3091 Remove redundant SampleManager.InitialiseChannel call 2021-07-10 02:06:35 +03:00
Sergeanur
ddf2b09e55 Update GXT compiler with fix of German 2021-07-10 02:04:35 +03:00
withmorten
026cd10f3f
Update german.txt 2021-07-10 00:43:26 +02: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