summaryrefslogtreecommitdiff
path: root/src/peds/Ped.cpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'miami' into lcs•••# 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/AudioLogic.cpp # src/core/config.h # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt Sergeanur2021-08-161-1/+5
|\
| * Fix impossible bulletserorcun2021-08-151-1/+5
* | Merge remote-tracking branch 'aap/lcs' into lcs•••# Conflicts: # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h Sergeanur2021-08-121-0/+4
|\ \
| * | CVehicle doneaap2021-08-041-1/+5
* | | Merge branch 'miami' into lcs•••# Conflicts: # src/core/Radar.cpp # src/core/Radar.h Sergeanur2021-08-111-6/+6
|\ \ \ | | |/ | |/|
| * | Fix a bunch of CModelInfo::GetModelInfo->GetColModel callsSergeanur2021-08-111-6/+6
* | | mergeNikolay Korolev2021-08-081-1/+1
|\| | | |/ |/|
| * CVehicle fixes and cleanupaap2021-08-041-1/+1
* | Merge branch 'miami' into lcs•••# 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 Sergeanur2021-07-311-0/+12
|\|
| * Allow sector ped count to exceed gap-list size•••This solves the gnNumTempPedList assertion. To prove this works, change gapTempPedList's length to 12, and visit the Triad's basketball court. # Conflicts: # src/peds/Ped.cpp Magnus Larsen2021-07-311-0/+12
* | Merge branch 'miami' into lcsSergeanur2021-07-271-0/+6
|\|
| * Fix stuck looking flag when answering phone and idle weapon animationSergeanur2021-07-261-0/+6
* | Merge branch 'miami' into lcsSergeanur2021-07-221-6/+6
|\|
| * Possible fix of RemoveAndAdd crashSergeanur2021-07-221-5/+5
| * Fix falling damageSergeanur2021-07-221-1/+1
* | Merge branch 'miami' into lcsSergeanur2021-07-151-0/+1
|\|
| * Fix NearPed count going negativeMagnus Larsen2021-07-131-0/+1
* | Merge branch 'miami' into lcs•••# 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 Sergeanur2021-07-121-5/+5
|\|
| * finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-101-5/+5
* | Merge branch 'miami' into lcs•••# Conflicts: # premake5.lua Sergeanur2021-07-031-13/+40
|\|
| * Sanitizer fixes 2erorcun2021-07-031-12/+13
| * Peds: Efforts to find the reason of crashes on GCC 7.5.0•••* Prevent deleted peds to be in nearPeds list (was always needed, might be unrelated to crashes) * Add asserts to nearPeds and PedIK ctor (crash reasons) * Shouldn't fix reported crashes since they were caused by null peds. erorcun2021-07-021-1/+27
* | Merge branch 'miami' into lcs•••# Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp Sergeanur2021-06-281-0/+1
|\|
| * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-0/+1
| * Fix some timer callsSergeanur2021-06-241-1/+1
| * Use bool8 in audio codeSergeanur2021-06-241-1/+1
| * Pool fixes + peds not forming circle fixerorcun2021-06-241-4/+4
* | Fix some timer callsSergeanur2021-06-241-1/+1
* | Use bool8 in audio codeSergeanur2021-06-241-1/+1
* | Wait states ported (scripted animations)Sergeanur2021-06-241-4/+482
* | Merge branch 'miami' into lcs•••* miami: Pool fixes + peds not forming circle fix Sergeanur2021-05-181-4/+4
|\ \
| * \ Merge pull request 'Pool fixes + peds not forming circle fix' (#4) from erorc...•••Reviewed-on: https://git.jacksmininetwork.co.uk/re/re3/pulls/4 Sergeanur2021-05-181-4/+4
| |\ \ | | |/ | |/|
| | * Pool fixes + peds not forming circle fixerorcun2021-03-061-4/+4
* | | Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp Sergeanur2021-05-121-5/+19
|\| |
| * | Complete sfx enum, rename some sounds + fixes of missing ped commentsSergeanur2021-05-121-5/+19
* | | Merge branch 'miami' into lcs•••# Conflicts: # src/core/World.cpp Sergeanur2021-05-101-1/+1
|\| |
| * | Use some GetMatrix/SetMatrix logic based on SA•••# Conflicts: # src/control/Pickups.cpp # src/control/RoadBlocks.cpp # src/core/World.cpp # src/entities/Entity.cpp # src/objects/CutsceneHead.cpp # src/objects/Object.cpp Sergeanur2021-05-101-1/+1
| |/
* | Merge remote-tracking branch 'origin/miami' into lcs•••# Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt Sergeanur2021-02-161-205/+214
|\|
| * Ped jump teleport/kill fixerorcun2021-02-101-5/+14
| * Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanimerorcun2021-02-081-1/+1
| |\
| | * Even more fixes & shorten quit screenerorcun2021-01-291-1/+1
| * | Use our synonyms for attack anims againerorcun2021-02-071-2/+2
| * | Use original animation names from VCSSergeanur2021-01-271-201/+201
| |/
* | Merge remote-tracking branch 'origin/miami' into lcs•••# Conflicts: # src/modelinfo/BaseModelInfo.cpp Sergeanur2021-01-231-0/+1
|\|
| * Includes overhaul, fix some compiler warningserorcun2021-01-231-0/+1
* | Merge remote-tracking branch 'origin/miami' into lcs•••# 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 Sergeanur2021-01-221-180/+1
|\|
| * get rid of most --MIAMI commentswithmorten2021-01-221-180/+1
* | syncNikolay Korolev2021-01-171-1/+74
* | Merge branch 'miami' into lcs•••* miami: Fix backface culling of cutscene objects more renames anim velocity union rename m_vehEnterType -> m_vehDoor Port cmake improvements to miami some loose ends move TODO to Readme Fix build without FIX_BUGS, divide to 0 fixes Sergeanur2021-01-131-75/+75
|\|
| * more renamesaap2021-01-131-24/+25