summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Cranes.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-07-121-2/+82
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioManager.h # src/control/Garages.cpp # src/control/Garages.h # src/control/Script5.cpp # src/core/config.h # utils/gxt/american.txt # utils/gxt/spanish.txt
| * finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-101-2/+82
| |
* | Merge branch 'miami' into lcsSergeanur2021-06-281-3/+4
|\| | | | | | | | | | | # Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
| * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-3/+4
| |
* | LCS model indicesSergeanur2021-01-231-2/+12
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| |
* | syncNikolay Korolev2021-01-181-16/+6
| |
* | Fix linux buildshfil2021-01-101-2/+2
| |
* | first commit for LCSaap2021-01-081-0/+2
|/
* Pool fixes from masterSergeanur2020-12-081-3/+3
|
* cranes doneNikolay Korolev2020-10-171-8/+2
|
* Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-301-18/+9
|
* VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-091-3/+3
|
* miamification of some audio structsSergeanur2020-06-081-5/+2
|
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-261-3/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/core/SurfaceTable.cpp # src/core/SurfaceTable.h # src/core/World.cpp # src/core/main.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/Ped.cpp # src/render/Timecycle.cpp # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/Heli.cpp # src/vehicles/Vehicle.cpp # src/weapons/Weapon.cpp # src/weapons/WeaponInfo.h
| * cranes fixNikolay Korolev2020-05-251-3/+6
| |
* | Merge branch 'master' into miamiSergeanur2020-05-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/control/Script.cpp # src/core/SurfaceTable.cpp # src/core/config.h # src/entities/Physical.cpp # src/entities/Physical.h # src/objects/Object.h # src/skel/skeleton.h # src/vehicles/Vehicle.h
| * cranes fixNikolay Korolev2020-05-231-1/+1
| |
* | CEntity and friendsaap2020-05-191-0/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-1/+1
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * car control and cranes fixesNikolay Korolev2020-05-131-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-4/+4
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * Linux build supporteray orçunus2020-05-111-4/+4
| |
* | getting the vice city map to workaap2020-05-051-1/+2
|/
* deny coach in crusherNikolay Korolev2020-05-041-1/+3
|
* SetPosition, part 2Sergeanur2020-05-021-2/+2
|
* Adding getters and setters for type and statusSergeanur2020-04-301-1/+1
|
* Try to build with mingwFilip Gawin2020-04-201-4/+4
|
* Remove patchesSergeanur2020-04-171-1/+1
|
* CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placementSergeanur2020-04-141-0/+671
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 11:31:13 +0100