summaryrefslogtreecommitdiffstats
path: root/src/core/PlayerInfo.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-1/+1
| |
| * Bettah car enter canceling, fix CFO crash, ped objs. renamingeray orçunus2020-07-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
| * updated player control namesNikolay Korolev2020-06-211-2/+2
| |
| * fixes, mostly from miamieray orçunus2020-06-041-1/+1
| |
* | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-221-1/+1
| |
* | killing peds increase chaos leveleray orçunus2020-06-201-0/+2
| |
* | Peds, eSound and PedState enum, fixeseray orçunus2020-06-031-1/+1
| |
* | game logicNikolay Korolev2020-05-311-0/+2
| |
* | new script commands - mostly stubsNikolay Korolev2020-05-221-2/+3
| |
* | script revisionNikolay Korolev2020-05-191-2/+2
| |
* | sync with upstreamNikolay Korolev2020-05-171-0/+1
|\ \
| * | Weapon fixes and thingieseray orçunus2020-05-171-0/+1
| | |
* | | more script stuffNikolay Korolev2020-05-161-0/+1
|/ /
* | Merge branch 'master' into miamiSergeanur2020-05-141-36/+30
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * Changing save/load for CPlayerInfo because of alignment crapSergeanur2020-05-131-36/+30
| |
* | VC vehicles just barely working nowaap2020-05-071-1/+1
|/
* More use of GetModelIndexSergeanur2020-05-051-2/+2
|
* SetPosition, final partSergeanur2020-05-051-3/+3
|
* Adding getters and setters for type and statusSergeanur2020-04-301-5/+5
|
* Try to build with mingwFilip Gawin2020-04-201-22/+22
|
* Merge pull request #474 from Nick007J/mastererorcun2020-04-191-0/+8
|\ | | | | Bug fixes, mostly replay; added RegisterReference for player ped pointer
| * replays bug fixNikolay Korolev2020-04-181-0/+8
| |
* | Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-2/+2
|/
* Revert "Part one"Filip Gawin2020-04-181-1/+1
| | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* Part oneFilip Gawin2020-04-171-1/+1
|
* Remove patchesSergeanur2020-04-171-18/+1
|
* normalized line endings to LFaap2020-04-091-450/+450
|
* CCopPed done and #include cleanuperay orçunus2020-03-281-0/+3
|
* CPopulation done, CCopPed and fixeseray orçunus2020-03-111-1/+1
|
* Fixes and cleanuperay orçunus2020-03-021-1/+1
|
* some changesNikolay Korolev2020-02-231-2/+2
|
* CPlayerPed continues (#294)erorcun2020-01-231-10/+10
|
* fixed vehicle enter crashNikolay Korolev2020-01-011-1/+1
|
* CPlayerInfo doneeray orçunus2019-12-161-6/+257
|
* CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-051-9/+236
|
* script 500-599 plus bugfixNikolay Korolev2019-10-211-0/+16
|
* Full CGameLogicSergeanur2019-10-081-4/+38
|
* PlayerSkinSergeanur2019-09-281-1/+23
|
* World and Pedseray orçunus2019-09-121-0/+1
|
* Running script part 3Nikolay Korolev2019-07-251-0/+9
|
* More frontend inputs._AG2019-07-101-0/+8
|
* more CVehicleaap2019-07-091-1/+2
|
* the great reorganizationaap2019-07-071-0/+5