summaryrefslogtreecommitdiffstats
path: root/src/peds/PedFight.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-07-251-0/+8
|\ | | | | | | | | # Conflicts: # src/renderer/Hud.cpp
| * Fix aiming with minigun and flamethrower with PC controlsSergeanur2021-07-221-0/+8
| |
* | Merge branch 'miami' into lcsSergeanur2021-06-301-4/+4
|\| | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
| * Sanitizer fixeserorcun2021-06-301-1/+1
| |
| * rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-281-3/+3
| |
* | Merge branch 'miami' into lcsSergeanur2021-05-121-2/+2
|\| | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp
| * Complete sfx enum, rename some sounds + fixes of missing ped commentsSergeanur2021-05-121-2/+2
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-214/+214
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Use our synonyms for attack anims againerorcun2021-02-071-25/+25
| |
| * Use original animation names from VCSSergeanur2021-01-271-231/+231
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-36/+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-36/+0
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-131-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | * 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
| * more renamesaap2021-01-131-6/+6
| |
* | anims done. ped fight hacked to compileaap2021-01-081-55/+69
|/
* Ped: PlayerPed: fixeserorcun2021-01-031-26/+22
|
* slightly better variable nameaap2021-01-021-1/+1
|
* Fix wrong sound when bumping pedsSergeanur2021-01-011-4/+4
|
* Ped: Real weapon fixerorcun2020-12-281-28/+20
|
* Weapon flags changed from bit fields to bit mask (R* vision)Sergeanur2020-12-261-41/+42
|
* Fix not being able to hit lying peds with melee weaponSergeanur2020-12-261-2/+2
|
* Fix use of strncmpSergeanur2020-12-251-2/+2
|
* PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-181-1/+1
|
* Fixes and style changeserorcun2020-12-161-10/+11
|
* uint8 enums fixedwithmorten2020-12-071-2/+2
|
* AnimViewer done, comment cleanuperorcun2020-12-031-2/+2
|
* cAudioManager::ProcessPedOneShots + fixesSergeanur2020-12-011-24/+2
|
* Some TODOs done in Peds codeSergeanur2020-11-251-4/+14
|
* Reorganize CPed functions into their original cpp filesSergeanur2020-11-201-0/+4235