summaryrefslogtreecommitdiffstats
path: root/src/control/GameLogic.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-07-031-8/+8
|\ | | | | | | | | # Conflicts: # premake5.lua
| * Fix use of integer in RemoveBuildingsNotInArea callSergeanur2021-07-021-1/+1
| |
| * GameLogic - type fixesSergeanur2021-07-021-7/+7
| |
* | Merge branch 'miami' into lcsSergeanur2021-06-281-5/+6
|\| | | | | | | | | | | # Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
| * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-5/+6
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * get rid of most --MIAMI commentswithmorten2021-01-221-2/+0
| |
| * m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-1/+1
| |
* | syncNikolay Korolev2021-01-181-1/+2
| |
* | lcs particleFire-Head2021-01-121-1/+1
| |
* | first commit for LCSaap2021-01-081-4/+4
|/
* neo screen dropletsaap2020-11-191-0/+10
|
* Control updatesNikolay Korolev2020-10-111-2/+3
|
* Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-301-1/+1
|
* call streaming funcsaap2020-08-211-1/+1
|
* Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-141-1/+5
|
* Merge branch 'master' into miamiSergeanur2020-07-131-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarAI.cpp # src/control/Phones.cpp # src/control/Phones.h # src/control/Record.cpp # src/control/Restart.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.h # src/core/Streaming.cpp # src/core/TempColModels.cpp # src/core/Wanted.cpp # src/core/Zones.cpp # src/core/config.h # src/core/main.cpp # src/core/re3.cpp # src/entities/Entity.cpp # src/entities/Physical.cpp # src/extras/frontendoption.cpp # src/modelinfo/ModelInfo.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/CivilianPed.cpp # src/peds/CopPed.cpp # src/peds/EmergencyPed.cpp # src/peds/Ped.cpp # src/peds/Ped.h # src/peds/Population.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # src/skel/win/win.cpp # src/vehicles/Automobile.cpp # src/vehicles/Boat.cpp # src/vehicles/Boat.h # src/vehicles/Vehicle.cpp
| * Rename LEVEL_NONE to LEVEL_GENERICSergeanur2020-07-131-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
| * Merge branch 'master' into ps2menuFire_Head2020-06-291-1/+25
| |\
| * | mips overdoseFire-Head2020-06-271-3/+3
| | |
* | | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-221-1/+1
| | |
* | | fixesSergeanur2020-06-081-4/+4
| | |
* | | Mission audio slotsSergeanur2020-06-081-4/+4
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-2/+27
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h
| * | mission replayNikolay Korolev2020-05-261-1/+25
| |/
* / game logicNikolay Korolev2020-05-311-13/+311
|/
* Adding getters and setters for type and statusSergeanur2020-04-301-6/+6
|
* Try to build with mingwFilip Gawin2020-04-201-2/+2
|
* Remove patchesSergeanur2020-04-171-9/+1
|
* rem refsFire-Head2020-04-171-1/+1
|
* normalized line endings to LFaap2020-04-091-286/+286
|
* CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-281-1/+1
|
* CCopPed done and #include cleanuperay orçunus2020-03-281-0/+1
|
* CPopulation done, CCopPed and fixeseray orçunus2020-03-111-1/+1
|
* Fixed use of boolean type for in CGameLogicSergeanur2019-10-261-6/+6
|
* Fixed CGameLogic::PassTime typesSergeanur2019-10-261-1/+1
|
* Moved CCutsceneMgr::ms_cutsceneProcessing to privateSergeanur2019-10-191-1/+1
|
* Full CGameLogicSergeanur2019-10-081-0/+293