summaryrefslogtreecommitdiffstats
path: root/src/weapons (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-04-091-0/+4
|\ | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp
| * Fix muzzleflash rotationSergeanur2021-02-261-0/+4
| |
* | Merge branch 'miami' into lcsSergeanur2021-02-261-0/+5
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp
| * add debug render groupsaap2021-02-181-0/+5
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-162-15/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 original animation names from VCSSergeanur2021-01-272-15/+15
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-252-48/+47
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| * make building with Codewarrior 7 possiblewithmorten2021-01-242-48/+47
| |
* | CPedModelInfo and CTempColModelsaap2021-01-241-1/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-224-7/+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-224-7/+0
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-201-0/+15
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp
| * add the bad crack "features" behind SECUROM definewithmorten2021-01-141-0/+15
| |
* | Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-151-9/+9
|\|
| * fixed weapon LOS checkaap2021-01-131-9/+9
| |
* | lcs particleFire-Head2021-01-121-4/+4
|/
* Fix UB in ProjectileInfo.cppshfil2020-12-311-1/+5
|
* fix UBaap2020-12-311-0/+5
|
* Ped: WeaponInfo: little fixes and renamingserorcun2020-12-281-3/+2
|
* Weapon flags changed from bit fields to bit mask (R* vision)Sergeanur2020-12-264-61/+35
|
* signed/unsigned fixes, and some other fixeserorcun2020-12-251-2/+0
|
* PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-182-8/+8
|
* sync with upstreamNikolay Korolev2020-12-081-1/+2
|\
| * FixesSergeanur2020-12-081-3/+4
| |
* | garages revision + some fixesNikolay Korolev2020-12-061-5/+5
|/
* Merge pull request #853 from erorcun/miamierorcun2020-12-021-3/+1
|\ | | | | PlayerPed and "Redefine controls" menu done, fixes
| * PlayerPed and "Redefine controls" menu done, fixeserorcun2020-12-021-3/+1
| |
* | cAudioManager::ProcessPedOneShots + fixesSergeanur2020-12-011-15/+1
|/
* Some TODOs done in Peds codeSergeanur2020-11-251-0/+1
|
* Reorganize CPed functions into their original cpp filesSergeanur2020-11-201-0/+15
|
* Merge pull request #812 from Nick007J/miamiaap2020-11-121-3/+1
|\ | | | | CWorld done + top gear fix
| * CWorld doneNikolay Korolev2020-11-101-3/+1
| |
* | fix wrong blend mode (original bug)aap2020-11-111-0/+4
|/
* Fluff done, FireInstantHit fixmajestic2020-10-231-5/+4
|
* Merge branch 'master' into miamiSergeanur2020-10-182-10/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-182-11/+11
| |
| * Fix some sanitizer errors, improve POSIX streamereray orçunus2020-10-041-11/+11
| |
| * silentpatch fixesNikolay Korolev2020-09-261-0/+3
| |
* | Control updatesNikolay Korolev2020-10-111-1/+11
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into neweray orçunus2020-10-082-145/+250
|\ \
| * \ Merge pull request #750 from erorcun/miamierorcun2020-10-082-145/+250
| |\ \ | | | | | | | | Pad, BulletInfo, ProjectileInfo, fixes
| | * | Pad, BulletInfo, ProjectileInfo, fixeseray orçunus2020-10-072-145/+250
| | | |
* | | | Fix some sanitizer errors, improve POSIX streamereray orçunus2020-10-081-22/+22
|/ / /
* | | rename varRoman Masanin2020-10-052-4/+4
| | |
* | | fix mistakesRoman Masanin2020-10-052-10/+11
| | |
* | | CExplosion doneRoman Masanin2020-10-052-22/+25
| | |
* | | some audio and part of CExplosionRoman Masanin2020-10-052-59/+89
|/ /
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-09-302-4/+11
|\ \
| * | VC replaysNikolay Korolev2020-09-262-4/+11
| | |
* | | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-301-0/+2
|/ /
* | fix melee car damageFire-Head2020-08-301-1/+1
| |
* | bike shooting fix + trace temp fixFire-Head2020-08-271-1/+1
| |
* | weaponsFire-Head2020-08-276-301/+570
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-073-3/+102
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-033-3/+102
| | | | | | | | Fixes are already in miami
| * 64-bit on Windowseray orçunus2020-07-221-1/+1
| |
| * Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)erorcun2020-07-011-1/+1
| |
* | 64-bit on Windowseray orçunus2020-07-241-1/+1
| |
* | CPlane doneaap2020-07-192-0/+4
| |
* | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-221-4/+4
| |
* | more weapon fixeseray orçunus2020-06-201-10/+22
| |
* | Ducking, shooting vehicle occupants and weapon fixeseray orçunus2020-06-203-37/+124
| |
* | Ped, Weapon and fixeseray orçunus2020-06-171-90/+156
| |
* | some cutscene opcodes and heli gunseray orçunus2020-06-162-48/+150
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-151-1/+2
|\ \
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-151-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/render/Fluff.cpp # src/render/Hud.cpp
| | * small fixesSergeanur2020-06-131-1/+2
| | |
| | * some vehicle cleanupaap2020-06-021-11/+10
| | |
| | * all my fixes live in exeseray orçunus2020-05-243-27/+27
| | |
* | | Peds & fixes continueseray orçunus2020-06-151-14/+6
|/ /
* | CBike doneaap2020-06-072-5/+6
| |
* | Use KnockOffRidereray orçunus2020-06-061-1/+17
| |
* | Peds, eSound and PedState enum, fixeseray orçunus2020-06-032-59/+79
| |
* | some CBike code; vehicle cleanupaap2020-06-021-11/+10
| |
* | CAutomobile doneaap2020-05-314-2/+16
| |
* | R to freeroam, idle anims, weapon and cam enum fixeray orçunus2020-05-291-0/+1
| |
* | VC CParticle doneFire-Head2020-05-271-1/+1
| |
* | Merge pull request #588 from blingu/miamiaap2020-05-264-4/+6
|\ \ | | | | | | fixed compiler errors
| * | fixed compiler errorsnrb2020-05-244-4/+6
| | |
* | | eSurfaceTypeaap2020-05-261-1/+1
| | |
* | | CVehicleaap2020-05-251-2/+2
|/ /
* | Cleanup and one needed functioneray orçunus2020-05-231-1/+1
| |
* | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-234-64/+239
| |
* | script revisionNikolay Korolev2020-05-201-0/+2
| |
* | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-193-64/+303
| |
* | Weapon fixes and thingieseray orçunus2020-05-174-74/+116
| |
* | Weapon fixeseray orçunus2020-05-163-10/+12
| |
* | Weapon layer in Pedseray orçunus2020-05-157-93/+269
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-12/+17
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * More save/load alignment fixesSergeanur2020-05-131-12/+17
| |
* | Merge branch 'master' into miamiSergeanur2020-05-124-5/+17
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp
| * Fix linux warningsFilip Gawin2020-05-124-5/+17
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-6/+22
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * fix shotgunNikolay Korolev2020-05-121-1/+1
| |
| * Remove odd calculations for bullet hit smokeSergeanur2020-05-121-5/+21
| |
* | CClouds; disabled object clipping for SA camaap2020-05-121-1/+1
|/
* Fixed typos and made all assert functions optionalbigbossbro082020-05-101-1/+1
|
* named anim assoc flagsaap2020-05-092-2/+2
|
* IsStaticNikolay Korolev2020-05-062-7/+7
|
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-021-1/+1
|\
| * SetPosition, part 1Sergeanur2020-05-021-1/+1
| |
* | changed saving compatibilityNikolay Korolev2020-05-022-1/+32
|/
* Adding getters and setters for type and statusSergeanur2020-04-303-16/+16
|
* Changing prefixes for some audio fieldsSergeanur2020-04-281-1/+1
|
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-251-2/+2
|\
| * fixed shooting targetaap2020-04-251-2/+2
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-251-2/+1
|\|
| * implemented skinned peds, no cutscene hands yetaap2020-04-241-2/+1
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-219-82/+90
|\|
| * Try to build with mingwFilip Gawin2020-04-209-82/+90
| |
* | sync with masterNikolay Korolev2020-04-191-1/+0
|\|
| * Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-1/+0
| |
* | 1.1 patch stuffNikolay Korolev2020-04-191-0/+3
|/
* Revert "Part one"Filip Gawin2020-04-181-1/+47
| | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-181-1/+0
|\
| * Remove padding fieldsSergeanur2020-04-181-1/+0
| |
* | Part oneFilip Gawin2020-04-171-47/+1
|/
* Remove patchesSergeanur2020-04-177-98/+12
|
* rem refsFire-Head2020-04-172-3/+0
|
* Merge pull request #448 from Nick007J/masterSergeanur2020-04-162-6/+276
|\ | | | | CBulletInfo
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-166-8/+141
| |\
| * | vs botchNikolay Korolev2020-04-151-11/+11
| | |
| * | definition fixNikolay Korolev2020-04-151-1/+1
| | |
| * | anim fixNikolay Korolev2020-04-151-2/+2
| | |
| * | sync with masterNikolay Korolev2020-04-154-49/+2257
| |\ \
| * | | fixNikolay Korolev2020-04-151-1/+9
| | | |
| * | | bullet infoNikolay Korolev2020-04-154-1/+283
| | | |
* | | | Various fixeseray orçunus2020-04-161-1/+1
| |_|/ |/| |
* | | Removed refs from weapons/, WeaponEffects movedSergeanur2020-04-166-8/+141
| |/ |/|
* | fixed crashFire-Head2020-04-151-1/+1
| |
* | fixed uzi/ak47/m16 traceFire-Head2020-04-151-1/+1
| |
* | 'fix' fixFire-Head2020-04-151-16/+15
| |
* | weapon cosmetic fixFire-Head2020-04-151-483/+484
| |
* | Update Weapon.cppFire_Head2020-04-151-1/+1
| |
* | CWeapon done, ps2 cheats fixFire-Head2020-04-154-39/+2267
|/
* normalized line endings to LFaap2020-04-091-31/+31
|
* AddExplosion shadow fixSergeanur2020-04-091-0/+5
|
* Finished CExplosionSergeanur2020-04-092-45/+403
|
* vehicles missing functions + fixesNikolay Korolev2020-04-012-0/+3
|
* Merge pull request #369 from erorcun/erorcunerorcun2020-03-292-0/+163
|\ | | | | CShotInfo, CWanted done, Frontend fix
| * CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-292-0/+163
| |
* | Merge branch 'master' into masterFire_Head2020-03-291-2/+0
|\ \
| * | Wrappers cleanupSergeanur2020-03-291-2/+0
| |/
* / CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-282-5/+9
|/
* CCopPed done and #include cleanuperay orçunus2020-03-282-3/+6
|
* Finished CRadar, a bit of CExplosionSergeanur2020-03-162-0/+161
|
* Fix molotovSergeanur2020-01-131-1/+1
|
* Fix projectile crashSergeanur2020-01-131-15/+0
|
* FixesSergeanur2020-01-122-12/+27
|
* ProjectileInfoSergeanur2020-01-112-10/+298
|
* Fixing Projectile codeSergeanur2020-01-074-31/+28
|
* CPlayerPed & CMenuManager (#286)erorcun2020-01-072-3/+17
| | | Make Frontend great again!
* script 800-899Nikolay Korolev2020-01-032-0/+12
|
* merge with upstreamNikolay Korolev2020-01-012-1/+2
|\
| * CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-052-1/+2
| |
* | some not fully tested stuffNikolay Korolev2020-01-012-1/+3
|/
* More audio (to hook and test)Filip Gawin2019-10-262-0/+30
|
* Merge pull request #246 from Sergeanur/PoolsSergeanur2019-10-212-0/+16
|\ | | | | Some CPool and CPools funcs, restoring original logic of pool lookup loops
| * Some CPool and CPools funcs, restoring original logic of pool lookup loopsSergeanur2019-10-162-0/+16
| |
* | CGame::Process() && CGame::ReloadIPLsnmzik2019-10-192-0/+2
|/
* AnimViewer!eray orçunus2019-08-152-0/+2
|
* Ped & fixes, including peds dive into danger fixeray orçunus2019-07-252-1/+38
|
* implemented CAutomobile::TankControlaap2019-07-252-0/+3
|
* bit more CAutomobileaap2019-07-232-1/+7
|
* Phone, World, Pederay orçunus2019-07-152-0/+7
|
* Merge branch 'master' into master_AG2019-07-072-0/+7
|\
| * CPed...eray orçunus2019-07-062-0/+7
| | | | | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* | Darkel/Wanted update._AG2019-07-042-9/+15
|/
* Even more CPederay orçunus2019-07-041-5/+5
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* Kangaroo cheat and bug fixeseray orçunus2019-07-022-6/+4
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* CPed fixeseray orçunus2019-07-011-1/+1
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* More CPederay orçunus2019-07-012-3/+44
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* CPed, CVehicle, mostly entering/exiting careray orçunus2019-06-241-1/+2
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* Shotgun fix, CPed, CWeaponInfoeray orçunus2019-06-223-5/+212
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* Big CPed updateeray orçunus2019-06-204-1/+84
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* implemented some of CCam and dependenciesaap2019-05-292-0/+35