summaryrefslogtreecommitdiffstats
path: root/src/control/SceneEdit.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into miamiSergeanur2020-05-121-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 warningsFilip Gawin2020-05-121-2/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-05-111-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'bigbossbro082020-05-101-1/+1
| |\
| | * some fixes and cosmetic changesaap2020-05-101-1/+1
| | |
| * | Fixed typos and made all assert functions optionalbigbossbro082020-05-101-0/+2
| |/
* / peds starting to workaap2020-05-091-2/+2
|/
* Make CBaseModelInfo fields protectedSergeanur2020-05-051-3/+2
|
* SetPosition, part 1Sergeanur2020-05-021-8/+8
|
* Adding getters and setters for type and statusSergeanur2020-04-301-4/+4
|
* Try to build with mingwFilip Gawin2020-04-201-2/+2
|
* Remove patchesSergeanur2020-04-171-1/+1
|
* fixNikolay Korolev2020-04-141-1/+1
|
* scene editNikolay Korolev2020-04-141-2/+6
|
* scene editNikolay Korolev2020-04-131-20/+793
|
* scene initNikolay Korolev2020-04-121-8/+316
|
* CCamera fixesaap2020-04-031-0/+1
|
* implemented some unused PS2 camsaap2020-03-271-1/+1
|
* Finished CCam; various smaller thingsaap2020-03-271-0/+5
|
* CGame::InitialiseNikolay Korolev2020-03-221-0/+1
|
* CGame::Process() && CGame::ReloadIPLsnmzik2019-10-191-0/+5