summaryrefslogtreecommitdiffstats
path: root/src/peds/Population.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-08-111-4/+4
|\ | | | | | | | | | | # Conflicts: # src/core/Radar.cpp # src/core/Radar.h
| * Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2Sergeanur2021-08-111-4/+4
| |
* | mergeNikolay Korolev2021-08-081-2/+3
|\|
| * Add ped and car density slider to menu, remove dumb collision "optimization"erorcun2021-08-011-2/+3
| |
* | Merge branch 'miami' into lcsSergeanur2021-07-311-3/+6
|\| | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/modelinfo/MloModelInfo.cpp # src/modelinfo/MloModelInfo.h # src/renderer/Renderer.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| * Make cars and peds to not despawn when you look awaySergeanur2021-07-311-3/+6
| | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/core/config.h # src/peds/Population.cpp
* | Merge branch 'miami' into lcsSergeanur2021-06-301-1/+1
|\| | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
| * rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-281-1/+1
| |
| * CEntity and C(Vu)Vector fixes and cleanupaap2021-06-241-6/+9
| |
| * Pool fixes + peds not forming circle fixerorcun2021-06-241-14/+15
| |
* | CEntity done; C(Vu)Vector fixes and cleanupaap2021-06-241-6/+9
| |
* | Merge branch 'miami' into lcsSergeanur2021-05-181-14/+15
|\ \ | | | | | | | | | | | | * miami: Pool fixes + peds not forming circle fix
| * | Pool fixes + peds not forming circle fixerorcun2021-03-061-14/+15
| |/
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-04-091-12/+28
|\| | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp
| * Fix FPEserorcun2021-03-021-8/+25
| |
| * Fixeserorcun2021-02-281-4/+3
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| |
| * m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-1/+1
| |
| * small cleanupaap2021-01-081-6/+3
| |
* | first commit for LCSaap2021-01-081-101/+68
|/
* WaterLevel (Beachtoys)erorcun2020-10-241-4/+4
|
* Merge branch 'master' into miamiSergeanur2020-10-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp
| * Setter for bIsStatic (became virtual in SA)Sergeanur2020-10-181-1/+1
| |
* | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-301-182/+842
| |
* | CGame done, Peds, fixeseray orçunus2020-08-301-2/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-08-191-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # gamefiles/TEXT/american.gxt # src/control/Garages.cpp # src/control/Record.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/ModelInfo.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # utils/gxt/american.txt
| * Call CWorld::Remove before the delete, the original game does this and its safer.Jack Powell2020-08-181-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-071-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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/+11
| | | | | | | | Fixes are already in miami
* | Merge branch 'master' into miamiSergeanur2020-07-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-5/+5
| |
| * small fixesaap2020-05-191-18/+2
| |
| * some work on zonesaap2020-05-061-1/+1
| |
* | VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-091-23/+34
| |
* | Some wait stateseray orçunus2020-06-061-0/+6
| |
* | Bike riding anims, SA bike/heli cameray orçunus2020-06-051-1/+1
| |
* | Peds, eSound and PedState enum, fixeseray orçunus2020-06-031-0/+13
| |
* | Merge pull request #569 from aap/miamiaap2020-05-201-18/+4
|\ \ | | | | | | CEntity and friends
| * | CEntity and friendsaap2020-05-191-18/+4
| | |
* | | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-191-8/+6
|/ /
* | Merge pull request #555 from erorcun/miamiaap2020-05-171-22/+4
|\ \ | | | | | | Weapon fixes and thingies
| * | Weapon fixes and thingieseray orçunus2020-05-171-22/+4
| | |
* | | gangs, script and replay fixesNikolay Korolev2020-05-161-13/+1
|/ /
* | more attractor fixesNikolay Korolev2020-05-161-1/+2
| |
* | Weapon layer in Pedseray orçunus2020-05-151-6/+27
| |
* | more car controlNikolay Korolev2020-05-101-5/+10
| |
* | CCarCtrl::GenerateOneRandomCarNikolay Korolev2020-05-081-1/+59
| |
* | sync with upstreamNikolay Korolev2020-05-071-4/+2
|\ \
| * | CZoneInfo mostly done; not its dependenciesaap2020-05-071-4/+2
| | |
* | | sync with upstreamNikolay Korolev2020-05-071-1/+2
|\| |
| * | VC vehicles just barely working nowaap2020-05-071-1/+2
| | |
* | | car control and friendsNikolay Korolev2020-05-071-0/+1
|/ /
* | new zone stuffaap2020-05-061-1/+1
| |
* | getting the vice city map to workaap2020-05-051-41/+6
| |
* | cleaned up MIAMI ifdefsaap2020-05-051-84/+0
| |
* | Revert "Remove Miami stuff"Sergeanur2020-05-051-0/+2
|/ | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* Remove Miami stuffSergeanur2020-05-051-2/+0
|
* merged masteraap2020-05-051-8/+7
|\
| * More use of GetModelIndexSergeanur2020-05-051-8/+7
| |
* | implemented most of streamed collisions and big buildingsaap2020-05-051-0/+2
|/
* SetPosition, final partSergeanur2020-05-051-14/+14
|
* Adding getters and setters for type and statusSergeanur2020-04-301-2/+2
|
* Try to build with mingwFilip Gawin2020-04-201-2/+2
|
* Various fixeseray orçunus2020-04-181-3/+3
|
* Remove patchesSergeanur2020-04-171-14/+1
|
* Fixed bridge despawnsNikolay Korolev2020-04-161-6/+6
|
* Many fixes and cleanuperay orçunus2020-04-151-30/+30
|
* Some cleanup erorcun2020-04-141-33/+48
|
* Merge pull request #399 from saml1er/masterNikolay Korolev2020-04-121-1/+1
|\ | | | | CObject complete
| * CObject completesaml1er2020-04-101-1/+1
| |
* | disabling the code that freezes gang membersSergeanur2020-04-101-0/+3
|/
* CCopPed done and #include cleanuperay orçunus2020-03-281-3/+7
|
* CCopPed 2 and fixeseray orçunus2020-03-261-1/+1
|
* fix and cleanup in AddToPopulationaap2020-03-241-11/+11
|
* Fixes for Serge's reviewFilip Gawin2020-03-221-1/+1
|
* ProcessButtonPresses and fixeseray orçunus2020-03-211-5/+6
|
* CPopulation done, CCopPed and fixeseray orçunus2020-03-111-21/+174
|
* fixed dummyobject bugNikolay Korolev2020-03-041-2/+2
|
* fixeseray orçunus2020-03-011-6/+5
|
* CPopulation 3 and fixeseray orçunus2020-02-271-8/+297
|
* merge + bug fixNikolay Korolev2020-02-221-0/+2
|
* CPopulation 2eray orçunus2020-02-191-6/+342
|
* CPopulation 1eray orçunus2020-02-171-0/+393
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 12:28:52 +0100