summaryrefslogtreecommitdiff
path: root/src/control
AgeCommit message (Collapse)Author
2021-08-08disable mission replay for lcsNikolay Korolev
2021-08-07more cherry-pick fixNikolay Korolev
2021-08-07cherrypick fixesNikolay Korolev
2021-08-07move debugNikolay Korolev
2021-08-07move debug script stuff to a separate fileNikolay Korolev
2021-08-07mission replayNikolay Korolev
2021-07-31Merge branch 'miami' into lcsSergeanur
# 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-31Make cars and peds to not despawn when you look awaySergeanur
# Conflicts: # src/control/CarCtrl.cpp # src/core/config.h # src/peds/Population.cpp
2021-07-27Merge pull request #1255 from Nick007J/lcsSergeanur
low effort save support
2021-07-27Merge branch 'miami' into lcsSergeanur
2021-07-26fixNikolay Korolev
2021-07-26Fix traffic light corona facing wrong sideSergeanur
2021-07-25Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-07-25low effort save supportNikolay Korolev
2021-07-25Merge branch 'miami' into lcsSergeanur
# Conflicts: # src/renderer/Hud.cpp
2021-07-25friggin the rigginNikolay Korolev
2021-07-24Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-07-22Fix aiming with minigun and flamethrower with PC controlsSergeanur
2021-07-22Merge branch 'miami' into lcsSergeanur
2021-07-19fix garbage data written in garage save blockwithmorten
2021-07-12Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-07-12Merge branch 'miami' into lcsSergeanur
# 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-11Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-07-10finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten
2021-07-09Merge branch 'miami' into lcsSergeanur
# Conflicts: # README.md # premake5.lua
2021-07-08Use CPad functions to check key states in script loaderSergeanur
2021-07-08fix macro redefinition warnings on win-glfw buildwithmorten
2021-07-04Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-07-03Merge branch 'miami' into lcsSergeanur
# Conflicts: # premake5.lua
2021-07-02Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-07-02Fix use of integer in RemoveBuildingsNotInArea callSergeanur
2021-07-02GameLogic - type fixesSergeanur
2021-07-02Refactor OnscreenTimerSergeanur
2021-06-30Merge branch 'miami' into lcsSergeanur
# Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
2021-06-28rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for ↵withmorten
consistency sake)
2021-06-28Fix script loadSergeanur
2021-06-28Merge branch 'miami' into lcsSergeanur
# Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
2021-06-28Redo ReadSaveBuf + common.h cleanupSergeanur
2021-06-26Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev
2021-06-26FixesSergeanur
2021-06-25syncNikolay Korolev
2021-06-24FixesSergeanur
2021-06-24Fix sin & cos callsSergeanur
2021-06-24Use bool8 in audio codeSergeanur
2021-06-24Wait states ported (scripted animations)Sergeanur
2021-06-24LCS sfx + mission audioSergeanur
2021-06-24Fix sin & cos callsSergeanur
2021-06-24Use bool8 in audio codeSergeanur
2021-05-10Merge branch 'miami' into lcsSergeanur
# Conflicts: # src/core/World.cpp
2021-05-10Use some GetMatrix/SetMatrix logic based on SASergeanur
# 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