Nikolay Korolev
6fbb7da82d
cherrypick fixes
2021-08-03 22:14:58 +03:00
Nikolay Korolev
5a22896197
move debug
2021-08-03 21:53:45 +03:00
Nikolay Korolev
8bcbee4ea7
move debug script stuff to a separate file
2021-08-03 21:53:42 +03:00
Nikolay Korolev
5999ddc76d
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-03 21:44:18 +03:00
Nikolay Korolev
2b99f2634b
sync
2021-08-01 14:00:16 +03:00
Nikolay Korolev
6d7dec96af
move debug script stuff to a separate file
2021-08-01 13:58:15 +03:00
erorcun
192190769d
Add ped and car density slider to menu, remove dumb collision "optimization"
2021-08-01 13:56:09 +03:00
Nikolay Korolev
1479093d33
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-01 12:54:20 +03:00
Nikolay Korolev
70080f1fdb
mission replay
2021-08-01 12:54:05 +03:00
Sergeanur
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
Sergeanur
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
Sergeanur
ec7d702185
Merge pull request #1255 from Nick007J/lcs
...
low effort save support
2021-07-27 20:59:08 +03:00
Sergeanur
6dc8c5bd92
Merge branch 'miami' into lcs
2021-07-27 20:58:17 +03:00
Nikolay Korolev
0461a36a4e
fix
2021-07-26 21:59:56 +03:00
Sergeanur
f73dfa12e6
Make cars and peds to not despawn when you look away
2021-07-26 04:43:26 +03:00
Sergeanur
ed9c911a0e
Fix traffic light corona facing wrong side
2021-07-26 04:40:23 +03:00
Nikolay Korolev
c7d3b88cb7
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-25 21:44:31 +03:00
Nikolay Korolev
bf4b39781b
low effort save support
2021-07-25 21:44:21 +03:00
Sergeanur
d83b8cf940
Merge branch 'miami' into lcs
...
# Conflicts:
# src/renderer/Hud.cpp
2021-07-25 21:01:00 +03:00
Nikolay Korolev
b69222e017
friggin the riggin
2021-07-25 11:58:03 +03:00
Nikolay Korolev
dc729009ac
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-24 01:02:23 +03:00
Nikolay Korolev
a7e673c2ec
sync
2021-07-24 00:47:04 +03:00
Sergeanur
aec797671e
Fix aiming with minigun and flamethrower with PC controls
2021-07-22 22:15:27 +03:00
Sergeanur
cc13e31264
Merge branch 'miami' into lcs
2021-07-22 21:17:55 +03:00
withmorten
76558e9313
fix garbage data written in garage save block
2021-07-19 23:44:01 +02:00
withmorten
a437d2bc26
fix garbage data written in garage save block
2021-07-19 23:43:51 +02:00
withmorten
8018e40ebf
Merge pull request #1217 from Nopey/master
...
Fix debug script loader crashing missions
2021-07-15 23:09:28 +02:00
Nikolay Korolev
91d958bf27
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-12 10:32:01 +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
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
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
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
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
withmorten
79c010f082
fix macro redefinition warnings on win-glfw build
2021-07-08 01:44:55 +02:00
withmorten
f9a2f1daf7
fix macro redefinition warnings on win-glfw build
2021-07-08 01:40:58 +02:00
Nikolay Korolev
62425b5866
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-04 15:24:54 +03:00
Sergeanur
5d5e0f62e8
Merge branch 'miami' into lcs
...
# Conflicts:
# premake5.lua
2021-07-03 16:39:22 +03:00
Nikolay Korolev
10cc444482
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-02 11:28:46 +03:00
Sergeanur
987e09515b
Fix use of integer in RemoveBuildingsNotInArea call
2021-07-02 10:33:45 +03:00
Sergeanur
9ea3549743
GameLogic - type fixes
2021-07-02 10:30:39 +03:00
Sergeanur
ae4bfef590
Refactor OnscreenTimer
2021-07-02 10:22:34 +03:00
Sergeanur
7df71c9673
Refactor OnscreenTimer
2021-07-02 10:18:22 +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
