summaryrefslogtreecommitdiff
path: root/src/core/Game.cpp
AgeCommit message (Collapse)Author
2021-08-12Merge branch 'miami' into lcsSergeanur
# Conflicts: # src/audio/AudioLogic.cpp # src/audio/sampman.h # src/audio/sampman_miles.cpp # src/core/Radar.cpp # src/core/config.h
2021-08-12Sync audio changes from masterSergeanur
2021-08-08mergeNikolay Korolev
2021-08-01Fix R* optimization that prevents peds to spawnerorcun
2021-08-01Add ped and car density slider to menu, remove dumb collision "optimization"erorcun
2021-07-27fixNikolay Korolev
2021-07-25low effort save supportNikolay Korolev
2021-06-25syncNikolay Korolev
2021-06-24Use bool8 in audio codeSergeanur
2021-06-24Use bool8 in audio codeSergeanur
2021-04-09Merge remote-tracking branch 'origin/miami' into lcsSergeanur
# Conflicts: # src/modelinfo/PedModelInfo.cpp
2021-02-28update librwaap
2021-02-16Merge remote-tracking branch 'origin/miami' into lcsSergeanur
# Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt
2021-02-07ferriesNikolay Korolev
2021-02-05fix generic.txd crashaap
2021-01-29fix shutdownaap
2021-01-24CVehicleModelInfoaap
2021-01-24CPedModelInfo and CTempColModelsaap
2021-01-23Merge remote-tracking branch 'origin/miami' into lcsSergeanur
# Conflicts: # src/modelinfo/BaseModelInfo.cpp
2021-01-23Remove restrictions in CGame::ProcessSergeanur
2021-01-23Includes overhaul, fix some compiler warningserorcun
2021-01-22Merge remote-tracking branch 'origin/miami' into lcsSergeanur
# Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp
2021-01-22get rid of most --MIAMI commentswithmorten
2021-01-20Merge branch 'miami' into lcsSergeanur
# Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp
2021-01-14add the bad crack "features" behind SECUROM definewithmorten
2021-01-13Merge remote-tracking branch 'origin/miami' into lcsSergeanur
* origin/miami: more securom fixes move stuff back into class; securom comments More font fixes fix fix CreateInstance virtual overload order escalator fix ProcessWheel bug
2021-01-13move stuff back into class; securom commentswithmorten
2021-01-09scriptNikolay Korolev
2021-01-08Disable water creaturesSergeanur
2021-01-08first commit for LCSaap
2021-01-02CVarConsoleSergeanur
2020-12-29fix custom pipes mem leakaap
2020-12-27move cfo populate func.erorcun
2020-12-20main.cpp mostly checked against ps2 nowaap
2020-12-20Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap
2020-12-20some PS2 thingsaap
2020-12-20uncomment InitRadioStationPositionListSergeanur
2020-12-19fixed review stuffNikolay Korolev
2020-12-19merge attemptNikolay Korolev
2020-12-18little cleanup and synch on templates and configaap
2020-12-13some rendering thingsaap
2020-12-04bit more GTA_VERSION and GTA_PS2aap
2020-12-03forgot some junkaap
2020-12-03more PS2 stuff; memory movement doneaap
2020-12-02added GTA_SCENE_EDITNikolay Korolev
2020-12-01TexturePoolsSergeanur
# Conflicts: # src/core/Game.cpp # src/rw/RwHelper.cpp
2020-12-01Remove ifndef GTA_PS2 around replaysSergeanur
2020-12-01TexturePoolsSergeanur
2020-12-01some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet)aap
2020-12-01some more GTA_VERSIONaap