Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into miami | Sergeanur | 2020-05-12 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp | ||||
| * | Fix linux warnings | Filip Gawin | 2020-05-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-11 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h | ||||
| * | Merge remote-tracking branch 'upstream/master' | bigbossbro08 | 2020-05-10 | 1 | -1/+1 |
| |\ | |||||
| | * | some fixes and cosmetic changes | aap | 2020-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed typos and made all assert functions optional | bigbossbro08 | 2020-05-10 | 1 | -0/+2 |
| |/ | |||||
* / | peds starting to work | aap | 2020-05-09 | 1 | -2/+2 |
|/ | |||||
* | Make CBaseModelInfo fields protected | Sergeanur | 2020-05-05 | 1 | -3/+2 |
| | |||||
* | SetPosition, part 1 | Sergeanur | 2020-05-02 | 1 | -8/+8 |
| | |||||
* | Adding getters and setters for type and status | Sergeanur | 2020-04-30 | 1 | -4/+4 |
| | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -2/+2 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -1/+1 |
| | |||||
* | fix | Nikolay Korolev | 2020-04-14 | 1 | -1/+1 |
| | |||||
* | scene edit | Nikolay Korolev | 2020-04-14 | 1 | -2/+6 |
| | |||||
* | scene edit | Nikolay Korolev | 2020-04-13 | 1 | -20/+793 |
| | |||||
* | scene init | Nikolay Korolev | 2020-04-12 | 1 | -8/+316 |
| | |||||
* | CCamera fixes | aap | 2020-04-03 | 1 | -0/+1 |
| | |||||
* | implemented some unused PS2 cams | aap | 2020-03-27 | 1 | -1/+1 |
| | |||||
* | Finished CCam; various smaller things | aap | 2020-03-27 | 1 | -0/+5 |
| | |||||
* | CGame::Initialise | Nikolay Korolev | 2020-03-22 | 1 | -0/+1 |
| | |||||
* | CGame::Process() && CGame::ReloadIPLs | nmzik | 2019-10-19 | 1 | -0/+5 |