Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-29 | 1 | -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 ps2menu | Fire_Head | 2020-06-29 | 1 | -1/+25 |
| |\ | |||||
| * | | mips overdose | Fire-Head | 2020-06-27 | 1 | -3/+3 |
| | | | |||||
* | | | CWanted, anim fix, ped objs renaming, remove III beta features | eray orçunus | 2020-06-22 | 1 | -1/+1 |
| | | | |||||
* | | | fixes | Sergeanur | 2020-06-08 | 1 | -4/+4 |
| | | | |||||
* | | | Mission audio slots | Sergeanur | 2020-06-08 | 1 | -4/+4 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-03 | 1 | -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 replay | Nikolay Korolev | 2020-05-26 | 1 | -1/+25 |
| |/ | |||||
* / | game logic | Nikolay Korolev | 2020-05-31 | 1 | -13/+311 |
|/ | |||||
* | Adding getters and setters for type and status | Sergeanur | 2020-04-30 | 1 | -6/+6 |
| | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -2/+2 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -9/+1 |
| | |||||
* | rem refs | Fire-Head | 2020-04-17 | 1 | -1/+1 |
| | |||||
* | normalized line endings to LF | aap | 2020-04-09 | 1 | -286/+286 |
| | |||||
* | CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names | Fire-Head | 2020-03-28 | 1 | -1/+1 |
| | |||||
* | CCopPed done and #include cleanup | eray orçunus | 2020-03-28 | 1 | -0/+1 |
| | |||||
* | CPopulation done, CCopPed and fixes | eray orçunus | 2020-03-11 | 1 | -1/+1 |
| | |||||
* | Fixed use of boolean type for in CGameLogic | Sergeanur | 2019-10-26 | 1 | -6/+6 |
| | |||||
* | Fixed CGameLogic::PassTime types | Sergeanur | 2019-10-26 | 1 | -1/+1 |
| | |||||
* | Moved CCutsceneMgr::ms_cutsceneProcessing to private | Sergeanur | 2019-10-19 | 1 | -1/+1 |
| | |||||
* | Full CGameLogic | Sergeanur | 2019-10-08 | 1 | -0/+293 |