Sergeanur
4f78733836
Remove stupid cast
2021-07-15 00:47:11 +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
erorcun
d2e594db2b
Merge pull request #1236 from Nopey/fix_nearPeds
...
Fix NearPed count going negative
2021-07-13 18:10:59 +03:00
Magnus Larsen
894495689f
Fix NearPed count going negative
2021-07-12 23:51:28 -07:00
Adrian Graber
7f544f9049
Fix artifact path
2021-07-13 01:32:43 +02:00
Adrian Graber
6665b16ba2
Nintendo Switch support
2021-07-13 01:18:49 +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
a4b92fe9be
fix premake
2021-07-12 23:26:49 +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
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
erorcun
3515363df5
Merge pull request #1218 from withmorten/ini
...
switch out current ini_parser.hpp with pulzed/mINI
2021-07-12 02:40:15 +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
Sergeanur
dc29e7c044
Add PED DENSITY and CAR DENSITY lines to GXT
2021-07-11 23:55:11 +03:00
Sergeanur
11434f96cc
Add PED DENSITY and CAR DENSITY lines to GXT
2021-07-11 23:52:55 +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
3194fdb2c1
fix the fix (and another fix)
2021-07-11 03:34:43 +02:00
withmorten
58de524d70
tiny diff fix
2021-07-11 03:26:59 +02:00
withmorten
d7ceb4870c
tiny diff fixes
2021-07-11 03:26:21 +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
erorcun
e9baf31ad8
Physical: division by zero fix
2021-07-10 23:24:27 +03:00
erorcun
d82dbf91ef
Merge/sync fixes after threaded audio
2021-07-10 23:14:13 +03:00
erorcun
db4ae18e5d
Remove waiting for stream closure in multi-thread audio
2021-07-10 23:14:08 +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
Magnus Larsen
12efd1209b
Fix Cheat menu debug script loader
2021-07-10 10:18:32 -07:00
Magnus Larsen
33c45e4ae0
Fix debug script loader crashing missions
...
* open_script is now exposed in Script.h, perhaps it should be namespaced
as a static method on CTheScripts? I'm unsure what is preferred.
* I've moved the joypad code out of open_script to prevent buttons held
down at mission load time from changing the scriptToLoad.
2021-07-10 09:34:17 -07: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
withmorten
61c2398b67
readme: fix lto option
2021-07-10 01:17:38 +02:00
withmorten
71f28c8cf5
readme: fix lto option
2021-07-10 01:17:03 +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