summaryrefslogtreecommitdiffstats
path: root/src/peds (follow)
Commit message (Collapse)AuthorAgeFilesLines
* car AI revisionNikolay Korolev2020-11-141-1/+1
|
* some fixesNikolay Korolev2020-11-132-2/+2
|
* Peds: Remove redundant lineserorcun2020-11-121-2/+0
|
* Pickups fixSergeanur2020-11-081-0/+1
|
* Ped comments fixesSergeanur2020-11-072-2/+2
|
* fixesNikolay Korolev2020-11-021-2/+2
|
* finished script and replayNikolay Korolev2020-11-012-0/+15
|
* the driver fixNikolay Korolev2020-11-011-1/+1
|
* couple of fixes and cleanupaap2020-10-311-9/+9
|
* Model indices editsSergeanur2020-10-241-1/+5
|
* WaterLevel (Beachtoys)erorcun2020-10-241-4/+4
|
* EmergencyPed, PedDebug, message fixerorcun2020-10-212-35/+70
|
* fixNikolay Korolev2020-10-181-1/+1
|
* fixed ped attractor crashNikolay Korolev2020-10-181-12/+20
|
* Merge pull request #766 from Fire-Head/miamierorcun2020-10-181-1/+2
|\ | | | | Glass
| * Miami GlassFire-Head2020-10-141-1/+2
| |
* | Merge pull request #772 from Nick007J/miamierorcun2020-10-183-19/+16
|\ \ | | | | | | Original save/load support + bugfixes
| * | fix in ped attractorNikolay Korolev2020-10-181-2/+4
| | |
| * | finished save/loadNikolay Korolev2020-10-171-1/+1
| | |
| * | saves part 1Nikolay Korolev2020-10-172-16/+11
| |/
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamierorcun2020-10-183-5/+5
|\ \
| * \ Merge branch 'master' into miamiSergeanur2020-10-183-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-5/+5
| | | |
| | * | Fixes from miamieray orçunus2020-09-102-66/+64
| | | |
| | * | changed a sound enumaap2020-08-201-1/+1
| | | |
* | | | Fix attractor even moreerorcun2020-10-181-2/+2
|/ / /
* | | Attractor obj. fixeserorcun2020-10-181-6/+12
| | |
* | | Fix ped buoyancyeray orçunus2020-10-181-58/+55
| |/ |/|
* | Hud, Fire, OnscreenBlaBlaeray orçunus2020-10-121-8/+0
| |
* | Fix sniper and water creatures bug, mark some fileseray orçunus2020-10-092-0/+4
| |
* | Pad, BulletInfo, ProjectileInfo, fixeseray orçunus2020-10-072-4/+2
| |
* | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-308-215/+868
| |
* | Credits & fixeseray orçunus2020-09-275-31/+23
| |
* | CPed and CCivilianPed funcs doneeray orçunus2020-09-245-419/+686
| |
* | Merge pull request #701 from erorcun/miamierorcun2020-09-102-282/+561
|\ \ | | | | | | Peds objectives and wait states done, fixes
| * | Peds objectives and wait states done, fixeseray orçunus2020-09-052-282/+561
| | |
* | | Merge pull request #698 from majesticCoding/miamierorcun2020-09-062-1/+76
|\ \ \ | |/ / |/| | cheats, fixes, cosmetic changes
| * | cheats, fixes, cosmetic changesmajestic2020-09-012-1/+76
| | |
* | | Enable Stingereray orçunus2020-09-012-6/+37
| | |
* | | Stinger doneSergeanur2020-08-312-0/+5
|/ /
* | CGame done, Peds, fixeseray orçunus2020-08-305-450/+359
| |
* | CStreaming done, hopefullyaap2020-08-202-0/+17
| |
* | fixed sound enumaap2020-08-201-3/+3
| |
* | Merge branch 'master' into miamiSergeanur2020-08-192-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * little fixNikolay Korolev2020-08-181-3/+3
| |
| * Call CWorld::Remove before the delete, the original game does this and its safer.Jack Powell2020-08-181-2/+1
| |
* | 2 new opcodeseray orçunus2020-08-164-8/+8
| |
* | Merge branch 'master' into miamiSergeanur2020-08-151-1/+5
|\| | | | | | | | | | | # Conflicts: # src/control/Darkel.cpp # src/core/main.cpp
| * Don't react if player's targeting with meleeSergeanur2020-08-141-1/+5
| |
* | Guardian Angels fixeray orçunus2020-08-141-0/+2
| |
* | Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-141-2/+4
| |
* | implemented extended postfxaap2020-08-111-0/+1
| |
* | CWindModifiersmajestic2020-08-103-7/+25
|\ \
| * | Update Ped.cppFire-Head2020-08-081-4/+1
| | |
| * | static shadows fix, cutscene shadows switchesFire-Head2020-08-082-5/+5
| | |
| * | 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-032-2/+13
| | | | | | | | | | | | Fixes are already in miami
| | * New math wrapperseray orçunus2020-07-221-1/+1
| | | | | | | | | | | | from miami
| | * 64-bit on Windowseray orçunus2020-07-223-3/+3
| | |
| | * cosmetic changeseray orçunus2020-07-211-3/+3
| | |
| | * a cute mistakeeray orçunus2020-07-211-1/+1
| | |
| | * Fixes from miamieray orçunus2020-07-202-141/+87
| | |
| * | Merge pull request #1 from GTAmodding/miamiFire_Head2020-07-2916-1278/+2186
| |\ \ | | | | | | | | Miami
| * | | miami shadowsFire-Head2020-07-292-0/+17
| | | |
* | | | CWindModifiersmajestic2020-08-091-0/+72
| |/ / |/| |
* | | CCopPed, except spike trapseray orçunus2020-07-284-122/+234
| | |
* | | CHeli and CRopes doneaap2020-07-272-0/+3
| | |
* | | 90% fixes, 10% skel refactoringeray orçunus2020-07-241-5/+5
| | |
* | | 64-bit on Windowseray orçunus2020-07-245-10/+10
| | |
* | | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-225-474/+923
| | |
* | | 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-135-9/+9
| | |
| * | Remove console and fix stheray orçunus2020-07-041-1/+1
| | |
| * | Bettah car enter canceling, fix CFO crash, ped objs. renamingeray orçunus2020-07-035-102/+123
| | |
| * | Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixeseray orçunus2020-07-021-26/+26
| | |
| * | Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)erorcun2020-07-013-124/+285
| | |
| * | rename attractor flag to typeaap2020-06-251-3/+3
| | |
* | | VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-096-443/+741
| | |
* | | fixes from master, menu helper texteray orçunus2020-07-041-5/+29
| | |
* | | Merge pull request #648 from Nick007J/miamiaap2020-07-042-10/+47
|\ \ \ | | | | | | | | ice cream attractor + bike respray
| * | | ice cream attractor + bike resprayNikolay Korolev2020-07-032-10/+47
| | |/ | |/|
* / | Peds & fixeseray orçunus2020-07-047-232/+217
|/ /
* | Merge pull request #638 from erorcun/miamiaap2020-06-256-283/+213
|\ \ | | | | | | CWanted, anim fix, ped objs renaming, remove III beta features
| * | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-226-283/+213
| | |
* | | rename attractor flag to typeaap2020-06-251-3/+3
|/ /
* | killing peds increase chaos leveleray orçunus2020-06-201-6/+7
| |
* | ducking & anim fixeray orçunus2020-06-202-23/+42
| |
* | more weapon fixeseray orçunus2020-06-201-7/+17
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-202-0/+8
|\ \
| * | CCamera doneaap2020-06-202-0/+8
| | |
* | | Ducking, shooting vehicle occupants and weapon fixeseray orçunus2020-06-203-55/+90
|/ /
* | Ped, Weapon and fixeseray orçunus2020-06-172-115/+133
| |
* | Merge branch 'miami' into miamierorcun2020-06-166-430/+1222
|\ \
| * \ CCam doneaap2020-06-161-1/+4
| |\ \
| | * | Bike anim. fixeray orçunus2020-06-151-1/+4
| | | |
| * | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-06-154-254/+463
| |\| |
| | * | Peds & fixes continueseray orçunus2020-06-154-254/+463
| | | |
| * | | more CCamaap2020-06-151-0/+1
| |/ /
| * | Merge pull request #631 from erorcun/miamierorcun2020-06-143-175/+754
| |\ \ | | | | | | | | Peds, mission switcher & fixes
| | * | Peds, mission switcher & fixeseray orçunus2020-06-143-175/+754
| | | |
* | | | fixed condition in CBoat::ProcessControl and changed enummajestic2020-06-142-0/+7
|/ / /
* / / some camera codeaap2020-06-141-3/+3
|/ /
* | script fixNikolay Korolev2020-06-131-2/+3
| |
* | removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigunmajestic2020-06-111-7/+1
| |
* | original multiplying rotational cords for minigunmajestic2020-06-111-1/+6
| |
* | minigun rotation fixmajestic2020-06-111-0/+1
| |
* | Peds, bike center of mass and reversing fixeseray orçunus2020-06-094-299/+617
| |
* | Message box, letterbox and ped attachingeray orçunus2020-06-072-4/+53
| |
* | fixNikolay Korolev2020-06-071-3/+4
| |
* | more script commandsNikolay Korolev2020-06-072-7/+8
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-072-5/+15
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-06-072-2/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
| | * minor fixesNikolay Korolev2020-06-061-0/+3
| | |
| | * fixing some uninitialized stuffNikolay Korolev2020-06-062-2/+9
| | |
| * | CBike doneaap2020-06-071-3/+3
| | |
* | | New ped objectiveseray orçunus2020-06-072-109/+153
|/ /
* | fixeray orçunus2020-06-061-3/+0
| |
* | Some wait stateseray orçunus2020-06-064-37/+182
| |
* | CFont crash workarounderay orçunus2020-06-061-1/+0
| |
* | Use KnockOffRidereray orçunus2020-06-061-48/+72
| |
* | Merge branch 'master' into miamiSergeanur2020-06-061-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/soundlist.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/peds/Ped.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Vehicle.h
| * Merge pull request #619 from ShFil119/headsaap2020-06-051-0/+4
| |\ | | | | | | Fix collision with peds heads
| | * Fix collision with peds headsFilip Gawin2020-06-011-0/+4
| | |
| * | fixes, mostly from miamieray orçunus2020-06-043-27/+43
| | |
* | | Bike riding anims, SA bike/heli cameray orçunus2020-06-053-70/+460
| | |
* | | basic bike support in traffic, script and car gen; some heli AINikolay Korolev2020-06-051-24/+33
| | |
* | | Merge branch 'master' into miamiSergeanur2020-06-044-352/+464
|\| | | | | | | | | | | | | | # Conflicts: # src/peds/Ped.cpp
| * | PedChat & PedDebugSergeanur2020-06-044-366/+477
| | |
* | | Merge branch 'master' into miamiSergeanur2020-06-042-12/+5
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/peds/Ped.cpp # src/peds/Ped.h
| * | Restore original logic of CPed::WanderRangeSergeanur2020-06-042-12/+5
| | |
| * | some vehicle cleanupaap2020-06-021-32/+7
| |/
| * eSurfaceTypeaap2020-05-261-7/+7
| |
| * small fixesaap2020-05-251-1/+1
| |
| * all my fixes live in exeseray orçunus2020-05-241-1/+1
| |
| * small fixesaap2020-05-191-18/+2
| |
| * changed CPedIK namesaap2020-05-163-101/+101
| |
* | fixed CPed::AddInCarAnimsaap2020-06-031-11/+6
| |
* | Peds, eSound and PedState enum, fixeseray orçunus2020-06-037-442/+807
| |
* | some CBike code; vehicle cleanupaap2020-06-021-32/+7
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-011-0/+3
|\ \
| * \ Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-06-012-0/+38
| |\ \
| * | | CAutomobile doneaap2020-05-311-0/+3
| | | |
* | | | DrawStandardMenus, VC menu array and minor fixeseray orçunus2020-06-012-38/+12
| |/ / |/| |
* | | game logicNikolay Korolev2020-05-312-0/+38
|/ /
* | R to freeroam, idle anims, weapon and cam enum fixeray orçunus2020-05-293-31/+103
| |
* | Merge pull request #2 from GTAmodding/miamiFire_Head2020-05-271-10/+11
|\ \ | | | | | | Miami
| * | Support of original mp3/wav/adfSergeanur2020-05-271-10/+11
| | |
* | | VC WaterFire-Head2020-05-271-3/+6
|/ /
* | Merge pull request #588 from blingu/miamiaap2020-05-265-17/+17
|\ \ | | | | | | fixed compiler errors
| * | Update CopPed.cppblingu2020-05-241-1/+1
| | |
| * | fixed compiler errorsnrb2020-05-245-17/+17
| | |
* | | eSurfaceTypeaap2020-05-261-9/+9
| | |
* | | Merge pull request #586 from aap/miamiaap2020-05-262-7/+11
|\ \ \ | | | | | | | | CVehicle
| * | | CVehicleaap2020-05-252-7/+11
| |/ /
* / / fixed filenameNikolay Korolev2020-05-241-0/+0
|/ /
* | Merge pull request #583 from erorcun/miamiaap2020-05-241-15/+14
|\ \ | | | | | | Menu borders and weapon fixes
| * | Menu borders and weapon fixeseray orçunus2020-05-241-15/+14
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-237-98/+91
|\| |
| * | Cleanup and one needed functioneray orçunus2020-05-233-43/+31
| | |
| * | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-236-55/+60
| | |
* | | set piecesNikolay Korolev2020-05-232-0/+2
|/ /
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-232-1/+2
|\ \
| * \ Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-05-222-13/+24
| |\ \
| * | | CPhysicalaap2020-05-222-1/+2
| | | |
* | | | some fixesNikolay Korolev2020-05-231-3/+4
| |/ / |/| |
* | | new script commands - mostly stubsNikolay Korolev2020-05-222-13/+24
|/ /
* | script revisionNikolay Korolev2020-05-212-1/+2
| |
* | Fixes for melees and various thingseray orçunus2020-05-204-165/+221
| |
* | Merge pull request #569 from aap/miamiaap2020-05-201-18/+4
|\ \ | | | | | | CEntity and friends
| * | CEntity and friendsaap2020-05-191-18/+4
| | |
* | | sync with upstreamNikolay Korolev2020-05-197-183/+201
|\ \ \
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-05-193-4/+34
| |\| |
| * | | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-197-182/+200
| | | |
* | | | slightly restructured ped flags for convenienceNikolay Korolev2020-05-191-11/+41
| | | |
* | | | script revisionNikolay Korolev2020-05-192-23/+33
| |/ / |/| |
* | | script revisionNikolay Korolev2020-05-192-1/+29
| | |
* | | Merge pull request #557 from Nick007J/miamiaap2020-05-183-4/+6
|\ \ \ | |/ / |/| | script and script stubs
| * | sync with upstreamNikolay Korolev2020-05-171-1/+0
| | |
| * | sync with upstreamNikolay Korolev2020-05-178-162/+272
| |\ \
| * | | full script basic supportNikolay Korolev2020-05-173-34/+43
| | | |
| * | | more script stuffNikolay Korolev2020-05-161-2/+2
| | | |
* | | | TransformToNode crash fix?eray orçunus2020-05-171-0/+13
| |/ / |/| |
* | | Merge pull request #555 from erorcun/miamiaap2020-05-178-161/+277
|\ \ \ | |/ / |/| | Weapon fixes and thingies
| * | Weapon fixes and thingieseray orçunus2020-05-178-161/+277
| | |
* | | gangs, script and replay fixesNikolay Korolev2020-05-163-33/+81
|/ /
* | Weapon fixeseray orçunus2020-05-164-21/+47
| |
* | more attractor fixesNikolay Korolev2020-05-163-23/+36
| |
* | a few fixesNikolay Korolev2020-05-162-4/+5
| |
* | removed duplicate codeNikolay Korolev2020-05-162-46/+31
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-161-5/+5
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-05-161-5/+5
| |\|
| | * Remove unused audio enumSergeanur2020-05-161-5/+5
| | |
* | | remove debugNikolay Korolev2020-05-161-2/+0
| | |
* | | fixed spaces/tabsNikolay Korolev2020-05-161-130/+130
| | |
* | | ped attractorsNikolay Korolev2020-05-162-11/+11
| | |
* | | sync with upstreamNikolay Korolev2020-05-169-939/+1291
|\| |
| * | Merge pull request #550 from erorcun/miamierorcun2020-05-157-502/+1094
| |\ \ | | | | | | | | Weapon layer in Peds
| | * | Weapon layer in Pedseray orçunus2020-05-157-502/+1094
| | | |
| * | | CPedIKaap2020-05-154-441/+201
| |/ /
* | | ped attractors doneNikolay Korolev2020-05-163-28/+28
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-143-25/+37
|\| |
| * | Fix compilationSergeanur2020-05-141-2/+2
| | |
| * | Merge branch 'master' into miamiSergeanur2020-05-143-26/+38
| |\| | | | | | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| | * Merge pull request #547 from Nick007J/masteraap2020-05-141-0/+4
| | |\ | | | | | | | | a few bugfixes
| | | * some fixesNikolay Korolev2020-05-141-0/+4
| | | |
| | * | fixed RotateTorsoaap2020-05-141-2/+2
| | |/
| | * More save/load alignment fixesSergeanur2020-05-132-24/+32
| | |
* | | more pedattractorNikolay Korolev2020-05-146-109/+864
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-133-13/+19
|\| |
| * | Merge branch 'master' into miamiSergeanur2020-05-122-7/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-122-7/+13
| | |
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-122-6/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| | * Linux build supporteray orçunus2020-05-112-6/+6
| | |
* | | ped attractor: startNikolay Korolev2020-05-134-11/+790
|/ /
* | Merge branch 'master' into miamiSergeanur2020-05-119-21/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h
| * Merge remote-tracking branch 'upstream/master'bigbossbro082020-05-101-3/+8
| |\
| | * some fixes and cosmetic changesaap2020-05-101-3/+8
| | |
| * | fixed few more typosbigbossbro082020-05-101-13/+0
| | |
| * | Fixed typos and made all assert functions optionalbigbossbro082020-05-1010-15/+14
| | |
| * | defined out asserts.bigbossbro082020-05-102-0/+6
| |/
* | CPedModelInfoaap2020-05-102-58/+4
| |
* | sync with upstreamNikolay Korolev2020-05-101-1/+1
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-05-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
| | * Fix compilation errorSergeanur2020-05-091-1/+1
| | |
| | * named anim assoc flagsaap2020-05-092-11/+11
| | |
* | | more car controlNikolay Korolev2020-05-104-10/+32
|/ /
* | peds starting to workaap2020-05-093-77/+15
| |
* | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-05-096-4/+86
|\ \
| * | CCarCtrl::GenerateOneRandomCarNikolay Korolev2020-05-086-4/+86
| | |
* | | named anim assoc flagsaap2020-05-092-11/+11
|/ /
* | sync with upstreamNikolay Korolev2020-05-071-4/+2
|\ \
| * | CZoneInfo mostly done; not its dependenciesaap2020-05-071-4/+2
| | |
* | | sync with upstreamNikolay Korolev2020-05-073-10/+11
|\| |
| * | VC vehicles just barely working nowaap2020-05-073-10/+11
| | |
* | | car control and friendsNikolay Korolev2020-05-072-1/+1
|/ /
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-061-2/+2
|\| | | | | | | | | # Conflicts: # src/render/Renderer.cpp
| * IsStaticNikolay Korolev2020-05-061-2/+2
| |
| * sorted out object collision enumsaap2020-05-061-2/+2
| |
| * some work on zonesaap2020-05-061-1/+1
| |
| * Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULLSergeanur2020-05-051-1/+1
| |
* | sorted out object collision enumsaap2020-05-061-2/+2
| |
* | new zone stuffaap2020-05-061-1/+1
| |
* | getting the vice city map to workaap2020-05-051-41/+6
| |
* | cleaned up MIAMI ifdefsaap2020-05-055-111/+2
| |
* | Revert "Remove Miami stuff"Sergeanur2020-05-055-0/+16
|/ | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* Remove Miami stuffSergeanur2020-05-055-16/+0
|
* merged masteraap2020-05-052-65/+64
|\
| * Make CBaseModelInfo fields protectedSergeanur2020-05-051-8/+8
| |
| * More use of GetModelIndexSergeanur2020-05-052-57/+56
| |
* | implemented most of streamed collisions and big buildingsaap2020-05-055-1/+11
|/
* SetPosition, final partSergeanur2020-05-054-49/+49
|
* implemented most of vice city path systemaap2020-05-033-28/+34
|
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-021-2/+2
|\
| * SetPosition, part 1Sergeanur2020-05-021-2/+2
| |
* | changed saving compatibilityNikolay Korolev2020-05-024-0/+91
|/
* Rename m_phy_flagA80 to bSkipLineColSergeanur2020-04-301-1/+1
|
* Rename m_ped_flagA2 into bWasStandingSergeanur2020-04-302-14/+14
|
* Adding getters and setters for type and statusSergeanur2020-04-304-42/+42
|
* Audio structs moved to their AudioManager.hSergeanur2020-04-271-9/+0
|
* Workaround for a crash on releaseSergeanur2020-04-271-0/+3
|
* implemented skinned peds, no cutscene hands yetaap2020-04-2410-197/+552
|
* ps2 particles, sampman oal startedFire-Head2020-04-231-7/+106
|
* Try to build with mingwFilip Gawin2020-04-207-52/+52
|
* Merge pull request #474 from Nick007J/mastererorcun2020-04-191-0/+3
|\ | | | | Bug fixes, mostly replay; added RegisterReference for player ped pointer
| * missing ifdedNikolay Korolev2020-04-191-0/+2
| |
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-181-5/+19
| |\
| * | replays bug fixNikolay Korolev2020-04-181-0/+1
| | |
* | | Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-195-13/+28
| |/ |/|
* | Vc ped ports and Frontend fixeseray orçunus2020-04-181-5/+19
|/
* Revert "Part one"Filip Gawin2020-04-181-5/+5
| | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-184-111/+88
|\
| * Remove padding fieldsSergeanur2020-04-183-108/+85
| |
| * Various fixeseray orçunus2020-04-181-3/+3
| |
* | Part oneFilip Gawin2020-04-171-5/+5
|/
* Remove patchesSergeanur2020-04-1712-404/+12
|
* Ped fixes and ref removaleray orçunus2020-04-175-33/+68
|
* Merge branch 'master' of github.com:gtamodding/re3aap2020-04-161-6/+6
|\
| * Fixed bridge despawnsNikolay Korolev2020-04-161-6/+6
| |
* | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-155-52/+54
|\|
| * Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-154-7/+12
| |\ | | | | | | CWeapon done, fixes
| | * rem commentFire-Head2020-04-151-1/+1
| | |
| | * CWeapon done, ps2 cheats fixFire-Head2020-04-154-7/+12
| | |
| * | Many fixes and cleanuperay orçunus2020-04-153-45/+42
| | |
* | | implemented most of librw wrapperaap2020-04-151-1/+1
|/ /
* | CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placementSergeanur2020-04-142-0/+131
| |
* | Some cleanup erorcun2020-04-142-60/+75
| |
* | Merge pull request #408 from erorcun/erorcunerorcun2020-04-121-4/+1
|\ \ | | | | | | Revert "fix"
| * | Revert "fix"eray orçunus2020-04-121-4/+1
| | |
* | | Merge pull request #407 from erorcun/erorcunerorcun2020-04-121-2/+4
|\| | | | | | | | Ped fix
| * | Ped fixeray orçunus2020-04-121-2/+4
| | |
* | | Merge pull request #399 from saml1er/masterNikolay Korolev2020-04-122-3/+3
|\ \ \ | |/ / |/| | CObject complete
| * | CObject completesaml1er2020-04-102-3/+3
| |/
* | CMenuManager done and CHud fixeseray orçunus2020-04-111-7/+5
| |
* | disabling the code that freezes gang membersSergeanur2020-04-101-0/+3
|/
* normalized line endings to LFaap2020-04-091-1535/+1535
|
* fixed questionable RW usage; changed radar mask to PS2 techinqueaap2020-04-093-6/+6
|
* CheatsSergeanur2020-04-081-0/+1
|
* CCamera fixesaap2020-04-032-16/+8
|
* Mouse free cam for peds&cars (under FREE_CAM)eray orçunus2020-03-312-4/+97
|
* CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-281-13/+13
|
* CCopPed done and #include cleanuperay orçunus2020-03-2814-31/+238
|
* remove include <new> from common.haap2020-03-285-0/+10
|
* Merge pull request #357 from aap/masteraap2020-03-271-2/+2
|\ | | | | Finished CCam; various smaller things
| * Finished CCam; various smaller thingsaap2020-03-271-2/+2
| |
* | CCopPed 2 and fixeseray orçunus2020-03-264-8/+294
|/
* fix and cleanup in AddToPopulationaap2020-03-241-11/+11
|
* added an assert to CPed::BuildPedLists, but too many peds still crash the gameaap2020-03-241-7/+11
|
* merge with upstreamNikolay Korolev2020-03-222-8/+8
|\
| * Remove unneeded double to float castsFilip Gawin2020-03-221-2/+2
| |
| * Fixes for Serge's reviewFilip Gawin2020-03-222-6/+6
| |
* | missing endlinesNikolay Korolev2020-03-221-1/+1
| |
* | CGame::InitialiseNikolay Korolev2020-03-222-0/+10
|/
* ProcessButtonPresses and fixeseray orçunus2020-03-217-30/+30
|
* CPopulation done, CCopPed and fixeseray orçunus2020-03-119-99/+526
|
* fixed dummyobject bugNikolay Korolev2020-03-041-2/+2
|
* Fixes and cleanuperay orçunus2020-03-027-86/+111
|
* fixeseray orçunus2020-03-013-9/+31
|
* CPopulation 3 and fixeseray orçunus2020-02-273-14/+318
|
* merge + bug fixNikolay Korolev2020-02-222-0/+4
|
* mergeNikolay Korolev2020-02-2210-9/+830
|\
| * CPopulation 2eray orçunus2020-02-194-8/+360
| |
| * Merge pull request #328 from erorcun/erorcunerorcun2020-02-178-9/+478
| |\ | | | | | | CPopulation 1
| | * CPopulation 1eray orçunus2020-02-178-9/+478
| | |
* | | script 1000-1154Nikolay Korolev2020-02-161-0/+3
|/ /
* | bug fixesNikolay Korolev2020-02-151-1/+1
| |
* | sync with upstreamNikolay Korolev2020-02-154-47/+427
|\|
| * a fixeray orçunus2020-02-133-13/+13
| |
| * CPlayerPed doneeray orçunus2020-02-133-12/+359
| |
| * few little thingseray orçunus2020-02-031-10/+7
| |
| * A bug fix and VC ports for veh. enter/exiteray orçunus2020-02-031-12/+53
| |
| * Some fixes and some cosmetic thingseray orçunus2020-02-022-9/+4
| |
* | script 900-999Nikolay Korolev2020-02-152-0/+26
|/
* suggested fixesSergeanur2020-01-301-10/+9
|
* acosSergeanur2020-01-291-4/+4
|
* CPedIK finishedSergeanur2020-01-293-11/+159
|
* Fixed autoaiming cameraSergeanur2020-01-291-1/+1
|
* CPlayerPed continues (#294)erorcun2020-01-235-71/+454
|
* Merge pull request #291 from Sergeanur/AccidentManagererorcun2020-01-121-1/+1
|\ | | | | AccidentManager
| * AccidentManagerSergeanur2020-01-111-1/+1
| |
* | Fixes 2eray orçunus2020-01-112-5/+5
|/
* CPlayerPed & CMenuManager (#286)erorcun2020-01-072-157/+387
| | | Make Frontend great again!
* Merge pull request #285 from Nick007J/script_deverorcun2020-01-074-21/+34
|\ | | | | 600-799 script commands; bug fixes
| * script 800-899Nikolay Korolev2020-01-033-1/+14
| |
| * merge with upstreamNikolay Korolev2020-01-019-198/+2139
| |\
| * | some not fully tested stuffNikolay Korolev2020-01-012-28/+28
| | |
* | | Use CGeneral::faststricmp in CPed::ServiceTalkingSergeanur2020-01-071-1/+1
| |/ |/|
* | CPlayerPed & fixeseray orçunus2019-12-285-13/+356
| |
* | CEmergencyPed doneeray orçunus2019-12-222-29/+441
| |
* | CPlayerInfo doneeray orçunus2019-12-162-19/+110
| |
* | CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-053-55/+43
| |
* | Audio fixes for erorcun reviewFilip Gawin2019-12-011-1/+1
| |
* | Shadow/blood fade and scale fixeray orçunus2019-11-271-3/+3
| |
* | CCivilianPed done & restore peds running to phoneeray orçunus2019-11-264-64/+568
| |
* | CPed completed!eray orçunus2019-11-202-62/+366
| | | | | | | | And a few fixes
* | Frontend, Peds & logic and overflow fixeseray orçunus2019-11-122-16/+314
| |
* | Merge pull request #263 from Sergeanur/strcmperorcun2019-11-091-1/+2
|\ \ | |/ |/| Implemented faststrcmp, faststricmp, strcasecmp
| * Implemented faststrcmp, faststricmp, strcasecmpSergeanur2019-10-301-1/+2
| |
* | Peds & a few fixeseray orçunus2019-11-052-22/+373
| |
* | The Pedseray orçunus2019-10-302-18/+503
|/
* Fall damage fixeray orçunus2019-10-271-40/+40
|
* Merge branch 'master' into masterFire_Head2019-10-271-9/+9
|\
| * ControllerConfig doneFire-Head2019-10-271-9/+9
| | | | | | | | Fix Cam enum
* | Gang attack fix & SeekCareray orçunus2019-10-262-11/+178
| |
* | Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-261-1/+0
| |
* | CPedIK limb movement info reversedSergeanur2019-10-262-9/+10
| |
* | Fixes for aap review (audio8)Filip Gawin2019-10-261-4/+4
| |
* | More audio (to hook and test)Filip Gawin2019-10-261-4/+4
| |
* | Fixes&Pedseray orçunus2019-10-252-4/+346
|/
* fixed adrenalineNikolay Korolev2019-10-191-1/+1
|
* Merge branch 'master' into mastererorcun2019-10-161-5/+331
|\
| * Pedseray orçunus2019-10-161-5/+331
| |
* | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-10-132-18/+296
|\|
| * PathFind fix and some Pedseray orçunus2019-10-132-2/+33
| |
| * Peds&fixeseray orçunus2019-10-132-14/+261
| |
| * Fix uninitialized orderInCatSergeanur2019-10-121-2/+2
| |
* | 400-499Nikolay Korolev2019-10-132-1/+18
| |
* | Merge branch 'master' into script_devNikolay Korolev2019-10-122-7/+14
|\|
| * Removed !this check in CVehicle::IsWrecked, added CPed::IsNotInWreckedVehicle insteadSergeanur2019-10-122-7/+14
| |
* | script 400-499 startNikolay Korolev2019-10-122-0/+4
|/
* Merge pull request #230 from Nick007J/mastererorcun2019-10-111-7/+7
|\ | | | | CCarAI, CCurves, CAutoPilot
| * CCarAI + bugfixesNikolay Korolev2019-10-101-7/+7
| |
* | Added read/write template functions for save data, small Load/Save arguments unificationSergeanur2019-10-082-46/+15
|/
* Full CGameLogicSergeanur2019-10-082-0/+12
|
* Fixed crash when aboarding trainSergeanur2019-10-081-3/+2
|
* Little fixeray orçunus2019-10-072-2/+6
|
* Pedseray orçunus2019-10-064-41/+332
|
* Fixeseray orçunus2019-10-052-29/+116
|
* CDarkel, walkaround fixeray orçunus2019-10-051-28/+35
|
* Fixes & pedseray orçunus2019-10-032-34/+285
|
* Mostly fixeray orçunus2019-10-012-23/+70
|
* Moar pedseray orçunus2019-10-014-86/+739
|
* Peds, ProcessObjective and fixeseray orçunus2019-09-264-69/+1589
|
* Pedseray orçunus2019-09-202-32/+298
|
* Peds, a fix and a tad of VCeray orçunus2019-09-174-109/+816
|
* P.e.d.s.eray orçunus2019-09-144-244/+633
|
* Little cleanuperay orçunus2019-09-122-9/+10
|
* World and Pedseray orçunus2019-09-124-7/+218
|
* Pedseray orçunus2019-09-074-14/+476
|
* Fix and cancellable car entereray orçunus2019-09-052-32/+41
|
* CPed::ProcessControl and some cleanuperay orçunus2019-09-034-105/+1191
|
* CleanupFilip Gawin2019-08-272-8/+8
|
* More more more audioFilip Gawin2019-08-273-10/+10
|
* CleanupFilip Gawin2019-08-274-124/+6
|
* More audio pedFilip Gawin2019-08-275-8/+135
|
* Pedseray orçunus2019-08-235-123/+754
|
* Merge pull request #195 from erorcun/erorcunaap2019-08-172-4/+497
|\ | | | | AnimViewer messages, Particle fix, Peds
| * AnimViewer messages, Particle fix, Pedseray orçunus2019-08-172-4/+497
| |
* | mergeNikolay Korolev2019-08-172-108/+171
|\|
| * Little CPed fixes & Peddebugeray orçunus2019-08-162-107/+170
| |
| * Merge branch 'master' into masterFire_Head2019-08-154-160/+2207
| |\
| * | CParticleObject done, cDMAudio doneFire-Head2019-08-151-1/+1
| | |
* | | more CCarCtrlNikolay Korolev2019-08-172-16/+16
| |/ |/|
* | More pedseray orçunus2019-08-134-16/+454
| |
* | Ped variables fixeray orçunus2019-08-112-17/+10
| |
* | P.e.d.s. and fixeseray orçunus2019-08-112-97/+583
| |
* | finished CPathFindaap2019-08-091-2/+2
| |
* | Pedseray orçunus2019-08-082-9/+520
| |
* | CPed part 218eray orçunus2019-08-052-68/+652
| |
* | A fix and a function made me notice iteray orçunus2019-08-032-1/+36
| |
* | RunningScript, part 4, plus some fixesNikolay Korolev2019-08-031-3/+3
|/
* some CPed cleanupaap2019-08-022-102/+73
|
* The Pedseray orçunus2019-08-024-20/+527
|
* implemented CTrainaap2019-07-312-4/+4
|
* Peds and fixeseray orçunus2019-07-294-25/+252
|
* Address fixeray orçunus2019-07-281-1/+1
|
* Peds, mainly audioeray orçunus2019-07-282-15/+347
|
* ped chat fixNikolay Korolev2019-07-281-1/+1
|
* CAutomobile::PreRender; whole class finishedaap2019-07-281-2/+2
|
* CAutomobile effect stuffaap2019-07-262-32/+29
|
* fight fixNikolay Korolev2019-07-261-2/+2
|
* Merge branch 'master' into masteraap2019-07-264-133/+821
|\
| * Ped & fixes, including peds dive into danger fixeray orçunus2019-07-254-133/+821
| |
* | Running script part 3Nikolay Korolev2019-07-252-2/+18
|/
* CPed continues, including some fixeseray orçunus2019-07-204-27/+505
|
* fix door issueNikolay Korolev2019-07-201-1/+1
|
* one more fixaap2019-07-201-1/+1
|
* CAutomobile ctor, car spawner, fixesaap2019-07-191-2/+2
|
* Wanted changes in PlayerPed/PedModelInfoeray orçunus2019-07-183-20/+18
| | | | And some typos
* The Peds, mainly dying/injuringeray orçunus2019-07-186-185/+836
| | | | There is also some reorganization
* renamed some variables and added files; more CAutomobile::ProcessControlaap2019-07-171-1/+1
|
* more fixes; started CAutomobile::ProcessControlaap2019-07-161-2/+2
|
* fixed mergeaap2019-07-161-2/+1
|
* Merge branch 'master' into erorcunaap2019-07-167-5/+108
|\
| * fixed copsNikolay Korolev2019-07-144-0/+6
| |
| * RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes)Nikolay Korolev2019-07-141-1/+1
| |
| * Partial RunningScript part2Nikolay Korolev2019-07-147-4/+100
| |
* | Phone, World, Pederay orçunus2019-07-154-20/+290
|/
* more CWanted; added CEventListaap2019-07-121-33/+0
|
* CAutomobile::ProcessControlInputsaap2019-07-112-0/+3
|
* and of course the last commit didnt fix everythingaap2019-07-102-5/+5
|
* added wrappers around math functionsaap2019-07-102-11/+11
|
* Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-104-12/+37
|\
| * sync with upstreamNikolay Korolev2019-07-094-12/+30
| |\
| | * yet more CAutomobileaap2019-07-094-0/+17
| | |
| | * more CAutomobileaap2019-07-092-8/+9
| | |
| | * more CAutomobileaap2019-07-081-4/+4
| | |
| * | RunningScript: 1/12Nikolay Korolev2019-07-092-0/+7
| |/
* / Phone start, ped spinning and cop car fix, and some love to CPederay orçunus2019-07-102-7/+44
|/ | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* little changes; one more function of CAutomobileaap2019-07-082-36/+15
|
* cleaned up patching of virtual functions; started CAutomobileaap2019-07-0810-49/+71
|
* blah_AG2019-07-071-2/+2
|
* Merge branch 'master' of https://github.com/gtamodding/re3_AG2019-07-074-6/+24
|
* the great reorganizationaap2019-07-0719-0/+4475
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:55:20 +0100