summaryrefslogtreecommitdiffstats
path: root/src/core/Zones.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-06-281-32/+43
|\ | | | | | | | | | | # Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
| * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-32/+43
| |
| * Pool fixes + peds not forming circle fixerorcun2021-06-241-0/+17
| |
* | Merge branch 'miami' into lcsSergeanur2021-05-181-0/+17
|\ \ | | | | | | | | | | | | * miami: Pool fixes + peds not forming circle fix
| * | Pool fixes + peds not forming circle fixerorcun2021-03-061-0/+17
| |/
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-4/+2
| |
* | first commit for LCSaap2021-01-081-6/+6
|/
* signed/unsigned fixes, and some other fixeserorcun2020-12-251-2/+4
|
* fixed zone bugNikolay Korolev2020-11-121-8/+8
|
* Fix zone saving on 64 bitSergeanur2020-10-121-2/+5
|
* Zones saving and loadingSergeanur2020-10-101-93/+98
|
* stupid zone load fixaap2020-08-301-3/+3
|
* fixes to zones and vehicle comp rulesaap2020-08-241-36/+24
|
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-071-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/RoadBlocks.cpp # src/core/Collision.h # src/core/Pad.cpp # src/core/SurfaceTable.h # src/core/main.cpp # src/core/re3.cpp # src/peds/Population.cpp # src/render/Fluff.cpp # src/render/Shadows.cpp # src/render/Shadows.h # src/render/Sprite2d.cpp # src/weapons/BulletInfo.cpp
| * Squeeze performance option, minor fixeseray orçunus2020-08-031-0/+5
| | | | | | | | Fixes are already in miami
* | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-221-1/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-07-131-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-4/+4
| |
| * Fix linux warningsFilip Gawin2020-05-121-1/+1
| |
* | fixed compiler errorsnrb2020-05-241-6/+6
| |
* | fixed annoying bugNikolay Korolev2020-05-191-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-3/+3
|\| | | | | | | | | | | | | | | | | # 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-6/+6
| |
* | zone info commands + fixNikolay Korolev2020-05-081-0/+16
| |
* | CBaseModelInfo doneaap2020-05-071-1/+0
| |
* | CZoneInfo mostly done; not its dependenciesaap2020-05-071-140/+78
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-061-1/+1
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/User.cpp # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/core/Zones.h # src/entities/Entity.cpp
| * some work on zonesaap2020-05-061-47/+50
| |
* | new zone stuffaap2020-05-061-132/+250
| |
* | getting the vice city map to workaap2020-05-051-43/+5
|/
* Zones save/loadSergeanur2020-04-181-192/+87
|
* Remove patchesSergeanur2020-04-171-34/+1
|
* rem refsFire-Head2020-04-171-12/+12
|
* removed windows.h for most .cppsaap2020-03-271-0/+1
|
* the great reorganizationaap2019-07-071-0/+874