summaryrefslogtreecommitdiffstats
path: root/src/control (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-142-0/+4
|\
| * Merge pull request #631 from erorcun/miamierorcun2020-06-142-7/+40
| |\ | | | | | | Peds, mission switcher & fixes
| * | some camera codeaap2020-06-142-0/+4
| | |
* | | much better mission switchereray orçunus2020-06-142-26/+62
| |/ |/|
* | Peds, mission switcher & fixeseray orçunus2020-06-142-7/+40
|/
* script fixNikolay Korolev2020-06-131-5/+13
|
* debug fixNikolay Korolev2020-06-121-1/+0
|
* heli AI fixNikolay Korolev2020-06-121-17/+18
|
* Merge pull request #624 from erorcun/miamiaap2020-06-091-5/+5
|\ | | | | Peds, bike center of mass and reversing fixes
| * Peds, bike center of mass and reversing fixeseray orçunus2020-06-091-5/+5
| |
* | fixesSergeanur2020-06-082-5/+4
| |
* | Mission audio slotsSergeanur2020-06-082-33/+11
|/
* some fixes to heli AI (not all yet)Nikolay Korolev2020-06-081-1/+8
|
* Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-06-081-2/+9
|\
| * more fixeseray orçunus2020-06-081-2/+9
| |
* | fixed attached pedNikolay Korolev2020-06-081-1/+1
|/
* fixesNikolay Korolev2020-06-081-1/+1
|
* CarCtrl fixeseray orçunus2020-06-072-7/+9
|
* fixNikolay Korolev2020-06-071-0/+1
|
* fixNikolay Korolev2020-06-071-0/+1
|
* more script commandsNikolay Korolev2020-06-071-18/+34
|
* some stats tweaks; saves dead againNikolay Korolev2020-06-071-1/+1
|
* fixed some arithmeticNikolay Korolev2020-06-071-16/+32
|
* Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-076-8/+12
|\
| * Merge branch 'master' into miamiSergeanur2020-06-076-8/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
| | * FONT_BANK renamed to FONT_STANDARDSergeanur2020-06-075-8/+8
| | |
| | * fixing some uninitialized stuffNikolay Korolev2020-06-061-0/+4
| | |
* | | New ped objectiveseray orçunus2020-06-071-6/+4
|/ /
* | Bike riding anims, SA bike/heli cameray orçunus2020-06-051-1/+1
| |
* | fixNikolay Korolev2020-06-051-1/+1
| |
* | basic bike support in traffic, script and car gen; some heli AINikolay Korolev2020-06-052-18/+91
| |
* | Peds, eSound and PedState enum, fixeseray orçunus2020-06-033-11/+35
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-033-4/+198
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h
| * fixed roadblocksNikolay Korolev2020-06-012-54/+53
| |
| * fixNikolay Korolev2020-05-301-1/+1
| |
| * Detect R and start game on menueray orçunus2020-05-282-11/+7
| |
| * Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-05-283-1/+191
| |\
| | * Merge pull request #599 from Nick007J/masteraap2020-05-283-1/+191
| | |\ | | | | | | | | Mission replay
| | | * mission replayNikolay Korolev2020-05-263-1/+191
| | | |
| * | | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-1/+12
| |/ /
| * / crash fixNikolay Korolev2020-05-281-2/+2
| |/
* | game logicNikolay Korolev2020-05-314-37/+370
| |
* | better nameNikolay Korolev2020-05-302-5/+5
| |
* | roadblocksNikolay Korolev2020-05-305-91/+183
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-05-291-0/+2
|\ \
| * | fixNikolay Korolev2020-05-291-0/+2
| | |
* | | R to freeroam, idle anims, weapon and cam enum fixeray orçunus2020-05-292-5/+10
|/ /
* | crash fixNikolay Korolev2020-05-271-0/+3
| |
* | Merge pull request #600 from Fire-Head/miamiaap2020-05-271-0/+3
|\ \ | | | | | | Miami Particle
| * | fix linux buildFire-Head2020-05-271-1/+1
| | |
| * | VC CParticle doneFire-Head2020-05-271-0/+3
| | |
* | | Support of original mp3/wav/adfSergeanur2020-05-271-1/+1
|/ /
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-263-10/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/core/SurfaceTable.cpp # src/core/SurfaceTable.h # src/core/World.cpp # src/core/main.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/Ped.cpp # src/render/Timecycle.cpp # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/Heli.cpp # src/vehicles/Vehicle.cpp # src/weapons/Weapon.cpp # src/weapons/WeaponInfo.h
| * fixed NE bugNikolay Korolev2020-05-251-1/+8
| |
| * fixed FIX_BUGSNikolay Korolev2020-05-251-8/+10
| |
| * script fixNikolay Korolev2020-05-241-1/+1
| |
| * script fixNikolay Korolev2020-05-221-1/+1
| |
| * script fixNikolay Korolev2020-05-201-0/+1
| |
| * script fixNikolay Korolev2020-05-201-1/+1
| |
* | Merge pull request #588 from blingu/miamiaap2020-05-261-2/+2
|\ \ | | | | | | fixed compiler errors
| * | Ped.h include not neededblingu2020-05-241-1/+0
| | |
| * | fixed compiler errorsnrb2020-05-241-2/+3
| | |
* | | CVehicleaap2020-05-255-6/+8
|/ /
* | how did saving even work in original III?Nikolay Korolev2020-05-241-18/+6
| |
* | script fixNikolay Korolev2020-05-241-2/+2
| |
* | commentsNikolay Korolev2020-05-244-22/+7
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-233-49/+65
|\ \
| * | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-233-49/+65
| | |
* | | set piecesNikolay Korolev2020-05-235-3/+415
|/ /
* | fixed scriptNikolay Korolev2020-05-231-4/+4
| |
* | removed debugNikolay Korolev2020-05-231-1/+0
| |
* | fixesNikolay Korolev2020-05-231-2/+3
| |
* | some fixesNikolay Korolev2020-05-232-5/+6
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-221-2/+2
|\ \
| * | VC CMenuManager struct, ctor etc.eray orçunus2020-05-221-2/+2
| | |
* | | new script commands - mostly stubsNikolay Korolev2020-05-222-83/+1112
|/ /
* | script revisionNikolay Korolev2020-05-212-53/+143
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-204-5/+23
|\ \
| * | Pickup and audio fixeray orçunus2020-05-201-0/+1
| | |
| * | Merge pull request #572 from erorcun/miamiaap2020-05-204-5/+22
| |\ \ | | | | | | | | Fixes for melees and various things
| | * | Fixes for melees and various thingseray orçunus2020-05-204-5/+22
| | | |
* | | | script revisionNikolay Korolev2020-05-202-53/+208
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-203-82/+21
|\| | |
| * | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-201-1/+9
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Radar.h # src/core/World.cpp # src/core/config.h # src/entities/Entity.cpp # src/modelinfo/ModelIndices.h # src/modelinfo/PedModelInfo.cpp # src/peds/Population.cpp # src/render/Clouds.cpp # src/render/Hud.cpp # src/vehicles/HandlingMgr.h
| | * fixed script bugNikolay Korolev2020-05-191-1/+1
| | |
| | * script fixNikolay Korolev2020-05-181-0/+1
| | |
| | * script FPS fixNikolay Korolev2020-05-181-0/+8
| | |
| | * revert accidental commit; also update librwaap2020-05-171-1/+1
| | |
| | * fixes for 64 bit buildaap2020-05-161-1/+1
| | |
| * | Merge pull request #569 from aap/miamiaap2020-05-203-82/+13
| |\ \ | | | | | | | | CEntity and friends
| | * | CEntity and friendsaap2020-05-193-82/+13
| | | |
* | | | script revisionNikolay Korolev2020-05-204-187/+326
|/ / /
* | | sync with upstreamNikolay Korolev2020-05-192-4/+30
|\ \ \
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-05-197-201/+777
| |\| |
| * | | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-192-4/+30
| | | |
| * | | just in caseeray orçunus2020-05-171-0/+1
| | | |
* | | | script revisionNikolay Korolev2020-05-192-119/+99
| |/ / |/| |
* | | script revisionNikolay Korolev2020-05-192-120/+112
| | |
* | | some debug changesNikolay Korolev2020-05-171-8/+45
| | |
* | | a few more stubsNikolay Korolev2020-05-171-1/+17
| | |
* | | some more script stubsNikolay Korolev2020-05-171-0/+6
| | |
* | | sync with upstreamNikolay Korolev2020-05-172-12/+0
| | |
* | | sync with upstreamNikolay Korolev2020-05-174-75/+84
|\| |
| * | Merge pull request #555 from erorcun/miamiaap2020-05-174-65/+92
| |\ \ | | | | | | | | Weapon fixes and thingies
| | * | Weapon fixes and thingieseray orçunus2020-05-174-65/+92
| | | |
* | | | full script basic supportNikolay Korolev2020-05-177-75/+591
| | | |
* | | | more script stuffNikolay Korolev2020-05-163-9/+49
|/ / /
* / / gangs, script and replay fixesNikolay Korolev2020-05-165-18/+42
|/ /
* | minimal weather stuff + multiple bugfixesNikolay Korolev2020-05-162-6/+11
| |
* | Merge branch 'master' into miamiSergeanur2020-05-161-2/+3
|\|
| * Remove unused audio enumSergeanur2020-05-161-2/+3
| |
* | Weapon layer in Pedseray orçunus2020-05-151-2/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-05-143-7/+5
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * fixed script errorNikolay Korolev2020-05-141-2/+1
| |
| * fixed traffic lightsNikolay Korolev2020-05-131-3/+4
| |
| * car control and cranes fixesNikolay Korolev2020-05-131-2/+0
| |
* | Merge branch 'master' into miamiSergeanur2020-05-126-2/+11
|\| | | | | | | | | | | | | | | | | | | | | # 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-126-2/+15
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-124-90/+135
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * garages fixNikolay Korolev2020-05-121-2/+2
| |
| * fix garagesNikolay Korolev2020-05-121-1/+1
| |
| * Linux build supporteray orçunus2020-05-114-90/+135
| |
* | fix garagesNikolay Korolev2020-05-121-15/+17
| |
* | fix garagesNikolay Korolev2020-05-121-1/+1
| |
* | more scriptNikolay Korolev2020-05-123-2/+38
| |
* | sync with upstreamNikolay Korolev2020-05-1110-17/+33
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-05-1110-18/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-1/+1
| | |\
| | | * some fixes and cosmetic changesaap2020-05-101-1/+1
| | | |
| | * | Fixed typos and made all assert functions optionalbigbossbro082020-05-1010-35/+32
| | | |
| | * | defined out asserts.bigbossbro082020-05-106-1/+20
| | |/
* | | garages + scriptNikolay Korolev2020-05-114-487/+420
| | |
* | | some changesNikolay Korolev2020-05-113-30/+102
|/ /
* | some updates for scriptNikolay Korolev2020-05-105-58/+48
| |
* | script changesNikolay Korolev2020-05-101-8/+17
| |
* | 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
| | * Small unificationSergeanur2020-05-101-1/+1
| | |
| | * car control fixesNikolay Korolev2020-05-091-102/+174
| | |
| | * got rid of superfluous enum; update librwaap2020-05-071-1/+2
| | |
* | | more car controlNikolay Korolev2020-05-103-136/+246
|/ /
* | new curves + boat fixNikolay Korolev2020-05-091-2/+16
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-095-24/+11
|\ \
| * | peds starting to workaap2020-05-093-7/+7
| | |
| * | removed cutscene headsaap2020-05-093-17/+4
| | |
* | | ccarctrl big fixNikolay Korolev2020-05-095-33/+177
|/ /
* | fixNikolay Korolev2020-05-081-1/+1
| |
* | fixNikolay Korolev2020-05-081-12/+12
| |
* | CCarCtrl::GenerateOneRandomCarNikolay Korolev2020-05-086-37/+163
| |
* | fixNikolay Korolev2020-05-081-6/+6
| |
* | gangNikolay Korolev2020-05-081-3/+7
| |
* | fixNikolay Korolev2020-05-081-0/+3
| |
* | zone info commands + fixNikolay Korolev2020-05-081-5/+40
| |
* | fixNikolay Korolev2020-05-081-0/+1
| |
* | final fixNikolay Korolev2020-05-081-61/+14
| |
* | reasonable spawnsNikolay Korolev2020-05-082-46/+25
| |
* | tmp stuffNikolay Korolev2020-05-082-49/+113
| |
* | sync with upstreamNikolay Korolev2020-05-073-8/+13
|\ \
| * | little script changeaap2020-05-071-2/+2
| | |
| * | CZoneInfo mostly done; not its dependenciesaap2020-05-073-8/+17
| | |
* | | intermediate changesNikolay Korolev2020-05-072-76/+73
| | |
* | | sync with upstreamNikolay Korolev2020-05-076-45/+61
|\| |
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-071-5/+5
| |\| | | | | | | | | | | | | # Conflicts: # src/modelinfo/ModelIndices.h
| | * dont hardcode first vehicle ID; little fix for roadblocksaap2020-05-071-5/+5
| | |
| | * some work on zonesaap2020-05-062-17/+17
| | |
| * | VC vehicles just barely working nowaap2020-05-075-41/+57
| | |
* | | car control and friendsNikolay Korolev2020-05-073-119/+184
|/ /
* | changed default ID ranges. old default.ide incompatible nowaap2020-05-061-3/+3
| |
* | fixed lane offsetNikolay Korolev2020-05-061-1/+2
| |
* | Merge pull request #518 from Nick007J/miamiaap2020-05-063-56/+638
|\ \ | | | | | | script stubs + REQUEST_COLLISION
| * | script stubs + REQUEST_COLLISIONNikolay Korolev2020-05-063-56/+638
| | |
* | | checked some of streaming for VC changesaap2020-05-061-4/+4
|/ /
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-062-2/+2
|\ \
| * | CSphere and CBox for CColModelaap2020-05-062-2/+2
| | |
* | | sync with masterNikolay Korolev2020-05-063-63/+42
|\| |
| * | new zone stuffaap2020-05-063-63/+42
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-066-436/+107
|\| |
| * | getting the vice city map to workaap2020-05-056-436/+107
| | |
* | | script colstore stuffNikolay Korolev2020-05-062-0/+17
| | |
* | | colstore support in scriptNikolay Korolev2020-05-051-15/+15
| | |
* | | script stuffNikolay Korolev2020-05-052-0/+78
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-056-781/+46
|\| |
| * | cleaned up MIAMI ifdefsaap2020-05-057-793/+46
| | |
* | | some more miamiNikolay Korolev2020-05-052-4/+6
| | |
* | | skipped one defNikolay Korolev2020-05-051-12/+0
| | |
* | | Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"Sergeanur2020-05-054-2/+26
| | | | | | | | | | | | | | | | | | | | | This reverts commit 1eb817de7713ea95bbbcbd7543ffce61ced8ffec. # Conflicts: # src/core/Game.cpp
* | | Merge branch 'master' into miamiSergeanur2020-05-054-26/+2
|\ \ \ | |/ / |/| / | |/ | | # Conflicts: # src/core/Game.cpp
| * Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULLSergeanur2020-05-054-26/+2
| |
* | remove ifdefsNikolay Korolev2020-05-055-131/+1
| |
* | Revert "Remove #endif"Sergeanur2020-05-051-0/+1
| | | | | | | | This reverts commit 7200a783eef314ae380a5da64dfa82020c1e6dc2.
* | Merge branch 'master' into miamiSergeanur2020-05-051-1/+0
|\|
| * Remove #endifSergeanur2020-05-051-1/+0
| |
* | Revert "Remove Miami stuff"Sergeanur2020-05-0512-1/+1063
|/ | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* Remove Miami stuffSergeanur2020-05-0512-1063/+1
|
* Merge pull request #512 from Nick007J/masterSergeanur2020-05-056-15/+347
|\ | | | | MIAMI CAutoPilot + CCarAI + multiple fixes
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-052-13/+13
| |\
| * | CAutoPilot + CCarAI + fixesNikolay Korolev2020-05-056-15/+347
| | |
* | | Merge pull request #510 from aap/masterSergeanur2020-05-053-2/+8
|\ \ \ | | | | | | | | implemented most of streamed collisions and big buildings
| * \ \ merged masteraap2020-05-055-12/+10
| |\ \ \
| * | | | implemented most of streamed collisions and big buildingsaap2020-05-053-2/+8
| | |_|/ | |/| |
* | | | fixed traffic lightsNikolay Korolev2020-05-051-1/+1
| |/ / |/| |
* | | Make CBaseModelInfo fields protectedSergeanur2020-05-052-4/+3
| | |
* | | More use of GetModelIndexSergeanur2020-05-053-8/+7
|/ /
* / SetPosition, final partSergeanur2020-05-052-13/+13
|/
* Merge pull request #508 from Nick007J/masterNikolay Korolev2020-05-043-12/+87
|\ | | | | Scripts compatible saving + CCarCtrl bug + crusher coach bug
| * fixed spawn bugNikolay Korolev2020-05-041-1/+4
| |
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-032-2/+11
| |\
| * | script compatibilityNikolay Korolev2020-05-032-11/+83
| | |
* | | GTA_BRIDGE and GTA_TRAIN definesaap2020-05-034-2/+28
| | |
* | | implemented most of vice city path systemaap2020-05-039-333/+1090
| |/ |/|
* | Merge pull request #504 from Sergeanur/PadInputSwitchSergeanur2020-05-022-2/+11
|\ \ | |/ |/| Switching pad modes and cheats when player is switching between controller and kb&m
| * Add CURMODE macroSergeanur2020-05-021-1/+1
| |
| * Fix COMMAND_GET_CONTROLLER_MODESergeanur2020-05-021-0/+4
| |
| * Switching pad modes and cheats when player is switching between controller and kb&mSergeanur2020-05-021-2/+7
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-0211-60/+59
|\|
| * SetPosition, part 2Sergeanur2020-05-022-22/+22
| |
| * SetPosition, part 1Sergeanur2020-05-0211-38/+37
| |
* | changed saving compatibilityNikolay Korolev2020-05-022-1/+85
|/
* Adding getters and setters for type and statusSergeanur2020-04-3011-64/+64
|
* Merge pull request #495 from Sergeanur/MoreLanguagesaap2020-04-291-1/+1
|\ | | | | Japanese support
| * FixesSergeanur2020-04-271-1/+1
| |
| * Merge branch 'master' into MoreLanguagesSergeanur2020-04-2633-924/+2131
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/core/MenuScreens.h # src/render/Font.cpp # src/render/Font.h # src/text/Messages.cpp # src/text/Text.cpp
| * \ Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-151-0/+1
| |\ \
| * \ \ Merge branch 'master' into MoreLanguagesSergeanur2020-04-1429-2561/+3628
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Hud.h # src/text/Messages.cpp # src/text/Text.cpp
| * \ \ \ Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-056-7/+12
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-052-23/+18
| |\ \ \ \ \
| * | | | | | JapaneseSergeanur2020-04-051-1/+1
| | | | | | |
* | | | | | | Fix use of integers instead of enum/bool/nilSergeanur2020-04-271-7/+7
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-251-6/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | implemented skinned peds, no cutscene hands yetaap2020-04-241-6/+2
| | | | | | |
* | | | | | | removed redundant checksNikolay Korolev2020-04-241-32/+18
| | | | | | |
* | | | | | | fix annoying bugNikolay Korolev2020-04-241-0/+8
| | | | | | |
* | | | | | | more 1.1 patchNikolay Korolev2020-04-242-0/+13
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-231-1/+0
|\| | | | | |
| * | | | | | Crossplatform work continueseray orçunus2020-04-221-1/+0
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-2113-179/+187
|\| | | | | |
| * | | | | | Merge pull request #477 from ShFil119/mingwshfil2020-04-2013-179/+187
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Try to make code working on more platforms
| | * | | | | | Try to build with mingwFilip Gawin2020-04-2013-179/+187
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-201-0/+28
|\| | | | | | |
| * | | | | | | Merge pull request #480 from Fire-Head/masterFire_Head2020-04-201-0/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | camerapickup ps2 code
| | * | | | | | | camerapickup ps2 codeFire-Head2020-04-201-0/+28
| | |/ / / / / /
| * / / / / / / Fix CPickups::GenerateNewOne loopSergeanur2020-04-191-1/+1
| |/ / / / / /
* / / / / / / fixesNikolay Korolev2020-04-202-7/+1
|/ / / / / /
* | | | | | Merge pull request #474 from Nick007J/mastererorcun2020-04-193-31/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bug fixes, mostly replay; added RegisterReference for player ped pointer
| * | | | | | replays bug fixNikolay Korolev2020-04-183-31/+56
| | | | | | |
* | | | | | | Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-192-6/+6
|/ / / / / /
* | | | | | Revert "Part one"Filip Gawin2020-04-183-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* | | | | | Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | Various fixeseray orçunus2020-04-181-1/+1
| | | | | | |
* | | | | | | Part oneFilip Gawin2020-04-173-16/+24
|/ / / / / /
* | | | | | Remove patchesSergeanur2020-04-1720-257/+20
| | | | | |
* | | | | | Merge remote-tracking branch 'Fire-Head/master' into StandaloneSergeanur2020-04-1720-351/+346
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/render/Coronas.cpp
| * | | | | | rem refsFire-Head2020-04-1720-351/+346
| | | | | | |
* | | | | | | Merge remote-tracking branch 'samler/world' into StandaloneSergeanur2020-04-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into worldsaml1er2020-04-169-36/+1428
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/World.cpp # src/core/World.h
| * | | | | | | Reverse CWorldsaml1er2020-04-161-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Some refs removed, little fixes and teleporteray orçunus2020-04-166-95/+96
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-161-3/+3
|\ \ \ \ \ \
| * | | | | | fix Bait crashNikolay Korolev2020-04-161-1/+1
| | | | | | |
| * | | | | | fix script crashNikolay Korolev2020-04-151-2/+2
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-158-28/+1420
|\| | | | | |
| * | | | | | Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-153-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | CWeapon done, fixes
| | * | | | | | CWeapon done, ps2 cheats fixFire-Head2020-04-153-3/+3
| | | | | | | |
| * | | | | | | Merge pull request #429 from Nick007J/masterNikolay Korolev2020-04-152-14/+1180
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Scene edit
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-151-0/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | fixNikolay Korolev2020-04-141-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-146-1278/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | scene editNikolay Korolev2020-04-141-2/+6
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-146-55/+646
| | |\ \ \ \ \ \ \
| | * | | | | | | | scene editNikolay Korolev2020-04-132-21/+799
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-122-6/+8
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | scene initNikolay Korolev2020-04-122-14/+398
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #416 from saml1er/PedPatherorcun2020-04-152-7/+229
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CPedPath complete
| | * | | | | | | | | | CPedPath improvementssaml1er2020-04-141-3/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Remove float castssaml1er2020-04-141-4/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Refactor CPedPath::CalcPedRoutesaml1er2020-04-141-36/+20
| | | | | | | | | | | |
| | * | | | | | | | | | CPedPath completesaml1er2020-04-142-7/+244
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #446 from erorcun/erorcunerorcun2020-04-152-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | Many fixes and cleanup
| | * | | | | | | | | | Many fixes and cleanuperay orçunus2020-04-152-4/+8
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | / | | | | | | | | implemented most of librw wrapperaap2020-04-151-5/+5
|/ / / / / / / / / /
* / / / / / / / / / fixed crashNikolay Korolev2020-04-141-0/+1
|/ / / / / / / / /
* | | | / / / / / CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placementSergeanur2020-04-146-1278/+0
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #403 from saml1er/roadblocksFilip Gawin2020-04-142-18/+184
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | CRoadBlocks complete
| * | | | | | | Use NUMROADBLOCKS enum member in CRoadBlockssaml1er2020-04-131-3/+3
| | | | | | | |
| * | | | | | | more CRoadBlocks::GenerateRoadBlocks improvementssaml1er2020-04-131-73/+75
| | | | | | | |
| * | | | | | | Fix CRoadBlocks::GenerateRoadBlocks bugssaml1er2020-04-131-79/+72
| | | | | | | |
| * | | | | | | Improve CRoadBlocks codesaml1er2020-04-111-30/+9
| | | | | | | |
| * | | | | | | CRoadBlocks completesaml1er2020-04-112-18/+210
| | | | | | | |
* | | | | | | | fix garagesNikolay Korolev2020-04-131-1/+1
| | | | | | | |
* | | | | | | | added missing breakSergeanur2020-04-131-0/+1
| | | | | | | |
* | | | | | | | fixed recordNikolay Korolev2020-04-131-4/+3
| | | | | | | |
* | | | | | | | fixed recordNikolay Korolev2020-04-131-3/+3
| | | | | | | |
* | | | | | | | Fix compilation errorSergeanur2020-04-131-7/+7
| | | | | | | |
* | | | | | | | CPacManPickupsSergeanur2020-04-132-29/+454
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #402 from Nick007J/masterNikolay Korolev2020-04-122-20/+597
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Record
| * | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-111-2/+2
| |\ \ \ \ \ \
| * | | | | | | fixed malloc/newNikolay Korolev2020-04-111-1/+1
| | | | | | | |
| * | | | | | | fix constantsNikolay Korolev2020-04-111-14/+14
| | | | | | | |
| * | | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-116-113/+567
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | RecordNikolay Korolev2020-04-112-19/+390
| | | | | | | |
| * | | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-1014-1817/+1826
| |\ \ \ \ \ \ \
| * | | | | | | | record initNikolay Korolev2020-04-102-4/+210
| | | | | | | | |
* | | | | | | | | Merge pull request #399 from saml1er/masterNikolay Korolev2020-04-121-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | CObject complete
| * | | | | | | | | CObject completesaml1er2020-04-101-5/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | fixed cranes bugNikolay Korolev2020-04-121-1/+3
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | fixed traffic light positionaap2020-04-111-2/+2
| |_|_|/ / / / |/| | | | | |
* | | | | | | implemented CTrafficLightsaap2020-04-106-113/+567
| |_|/ / / / |/| | | | |
* | | | | | fixed intro crashNikolay Korolev2020-04-101-6/+6
| | | | | |
* | | | | | Fixing mixed IsCutsceneProcessing and IsRunningSergeanur2020-04-103-3/+3
|/ / / / /
* | | | | normalized line endings to LFaap2020-04-099-1791/+1791
| | | | |
* | | | | Merge remote-tracking branch 'Fire-Head/master'Sergeanur2020-04-093-17/+26
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | # Conflicts: # src/core/Radar.cpp
| * | | | PS2 Cheats, restored R*namesFire-Head2020-04-093-17/+26
| | | | |
* | | | | fix bugNikolay Korolev2020-04-081-0/+1
|/ / / /
* | | | fix bugNikolay Korolev2020-04-081-1/+1
| | | |
* | | | fix bugNikolay Korolev2020-04-081-1/+1
| | | |
* | | | bug fixNikolay Korolev2020-04-081-2/+2
| | | |
* | | | Small camera fixesSergeanur2020-04-081-1/+1
| | | |
* | | | stats fixNikolay Korolev2020-04-061-1/+1
| | | |
* | | | review fixesNikolay Korolev2020-04-061-12/+18
| | | |
* | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-065-5/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #378 from aap/masteraap2020-04-055-5/+9
| |\ \ \ | | | | | | | | | | finished CCamera
| | * | | CCamera fixesaap2020-04-035-5/+9
| | |/ /
* | | | Cranes doneNikolay Korolev2020-04-066-112/+560
| | | |
* | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-051-2/+3
|\| | |
| * | | shoreside garage fixNikolay Korolev2020-04-051-2/+3
| | |/ | |/|
* / | cranes initNikolay Korolev2020-04-052-20/+277
|/ /
* / vehicles missing functions + fixesNikolay Korolev2020-04-012-23/+18
|/
* review fixesNikolay Korolev2020-03-312-117/+68
|
* fixNikolay Korolev2020-03-311-1/+1
|
* added forgotten functionNikolay Korolev2020-03-301-1/+4
|
* bug fixes, reorganisationNikolay Korolev2020-03-303-48/+55
|
* finished garagesNikolay Korolev2020-03-302-49/+550
|
* Merge branch 'master' into garages_devNikolay Korolev2020-03-2910-194/+12
|\
| * merge with upstreamNikolay Korolev2020-03-2910-194/+12
| |\
| | * Merge branch 'master' into masterFire_Head2020-03-296-186/+4
| | |\
| | | * Wrappers cleanupSergeanur2020-03-296-186/+4
| | | |
| | * | CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-287-8/+15
| | |/
| * | fixNikolay Korolev2020-03-291-1/+1
| | |
* | | more garagesNikolay Korolev2020-03-292-118/+607
|/ /
* | fixesNikolay Korolev2020-03-281-40/+36
| |
* | fixesNikolay Korolev2020-03-282-77/+134
| |
* | merge with masterNikolay Korolev2020-03-2813-17/+31
|\|
| * CCopPed done and #include cleanuperay orçunus2020-03-2813-17/+31
| |
* | garage update part 2Nikolay Korolev2020-03-282-120/+653
| |
* | Merge branch 'master' into garages_devNikolay Korolev2020-03-287-15/+60
|\|
| * removed windows.h for most .cppsaap2020-03-271-0/+1
| |
| * Merge pull request #357 from aap/masteraap2020-03-272-0/+10
| |\ | | | | | | Finished CCam; various smaller things
| | * implemented some unused PS2 camsaap2020-03-272-2/+2
| | |
| | * Finished CCam; various smaller thingsaap2020-03-272-0/+10
| | |
| * | CCopPed 2 and fixeseray orçunus2020-03-264-15/+49
| |/
* / garages part 1Nikolay Korolev2020-03-283-41/+751
|/
* change default script to storyaap2020-03-241-1/+1
|
* merge with upstreamNikolay Korolev2020-03-225-28/+71
|\
| * Cleanup audio code + fixes for reviewFilip Gawin2020-03-221-16/+18
| |
| * Remove unneeded double to float castsFilip Gawin2020-03-222-6/+6
| |
| * Fixes for Serge's reviewFilip Gawin2020-03-224-11/+11
| |
| * Implement ProcessCraneFilip Gawin2020-03-221-0/+41
| |
* | CGame::InitialiseNikolay Korolev2020-03-224-0/+6
|/
* bullet traces fixesNikolay Korolev2020-03-221-2/+2
|
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-224-17/+15
|\
| * Merge branch 'master' into erorcunerorcun2020-03-223-7/+4
| |\
| * | ProcessButtonPresses and fixeseray orçunus2020-03-214-16/+15
| | |
* | | bullet tracesNikolay Korolev2020-03-211-6/+6
| |/ |/|
* | fixed erroneous assumptionNikolay Korolev2020-03-211-4/+0
| |
* | purple nines glitch fixNikolay Korolev2020-03-212-3/+5
|/
* Merge pull request #347 from Nick007J/mastererorcun2020-03-173-80/+209
|\ | | | | replay fixes + script crash fix
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-151-1/+1
| |\
| * | replay bug fixes, script bug fixNikolay Korolev2020-03-153-80/+209
| | |
* | | Merge pull request #345 from whampson/save-stufferorcun2020-03-174-1/+10
|\ \ \ | |_|/ |/| | GenericSave() done
| * | Fix merge conflictWes Hampson2020-03-112-34/+455
| |\|
| * | Add Load/Save functionsWes Hampson2020-03-115-3/+12
| | |
* | | Merge branch 'master' into erorcunerorcun2020-03-112-34/+455
|\ \ \ | | |/ | |/|
| * | more utilsNikolay Korolev2020-03-041-23/+72
| | |
| * | more utilsNikolay Korolev2020-03-041-20/+131
| | |
| * | script utilsNikolay Korolev2020-03-021-28/+119
| | |
| * | Merge branch 'master' into script_devNikolay Korolev2020-03-012-166/+178
| |\|
| * | save/loadNikolay Korolev2020-03-012-3/+173
| | |
* | | CPopulation done, CCopPed and fixeseray orçunus2020-03-111-1/+1
| |/ |/|
* | review fixesNikolay Korolev2020-03-012-165/+169
| |
* | merge with upstreamNikolay Korolev2020-03-011-1/+9
|\ \ | |/ |/|
| * fixeseray orçunus2020-03-011-0/+8
| |
| * CPopulation 3 and fixeseray orçunus2020-02-271-1/+1
| |
* | removed debug leftoversNikolay Korolev2020-02-241-3/+0
| |
* | more stuff + intro fixNikolay Korolev2020-02-242-23/+633
| |
* | Merge branch 'master' into script_devNikolay Korolev2020-02-241-3/+3
|\|
| * script fixeseray orçunus2020-02-231-3/+3
| |
* | more stuffNikolay Korolev2020-02-241-12/+646
| |
* | more cosmetic stuffNikolay Korolev2020-02-231-0/+5
| |
* | stuffNikolay Korolev2020-02-232-4/+10
| |
* | some changesNikolay Korolev2020-02-233-301/+307
| |
* | some cosmetic stuffNikolay Korolev2020-02-232-118/+244
|/
* ARRAY_SIZENikolay Korolev2020-02-221-2/+2
|
* mergeNikolay Korolev2020-02-225-152/+10
|\
| * CPopulation 2eray orçunus2020-02-191-1/+4
| |
| * Merge pull request #328 from erorcun/erorcunerorcun2020-02-174-148/+6
| |\ | | | | | | CPopulation 1
| | * CPopulation 1eray orçunus2020-02-174-148/+6
| | |
* | | fixesNikolay Korolev2020-02-221-3/+3
| | |
* | | script 1000-1154Nikolay Korolev2020-02-1613-32/+998
|/ /
* | review fixesNikolay Korolev2020-02-162-64/+66
| |
* | bug fixesNikolay Korolev2020-02-152-14/+34
| |
* | sync with upstreamNikolay Korolev2020-02-151-1/+1
|\|
| * Some fixes and some cosmetic thingseray orçunus2020-02-023-4/+4
| |
* | script 900-999Nikolay Korolev2020-02-154-17/+602
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-02-021-2/+2
|\|
| * fixed SET_BOAT_CRUISE_SPEEDNikolay Korolev2020-02-021-1/+1
| |
| * fixed police ignore bugNikolay Korolev2020-02-021-1/+1
| |
* | script 900-999 initNikolay Korolev2020-02-023-2/+493
|/
* fix ai bug (2)Nikolay Korolev2020-02-021-2/+2
|
* fixed ai bugNikolay Korolev2020-02-021-1/+1
|
* fixed bullion runNikolay Korolev2020-02-021-2/+3
|
* Replay crash fixSergeanur2020-02-011-2/+6
|
* Fix HAS_OBJECT_BEEN_DAMAGEDSergeanur2020-02-011-1/+1
|
* Added enum to OnscreenTimer, fixed mistakes in CCarCtrl::SteerAIBoatWithPhysicsHeadingForTargetSergeanur2020-02-013-4/+10
|
* Fix damage bar assert crashSergeanur2020-02-011-3/+0
|
* Fix CTheScripts::AddToInvisibilitySwapArraySergeanur2020-02-011-2/+2
|
* Fix SET_BOAT_CRUISE_SPEEDSergeanur2020-01-311-4/+5
|
* More fixesSergeanur2020-01-313-57/+55
|
* Fixing IS_AREA_OCCUPIED commandSergeanur2020-01-311-1/+1
|
* CRemoteSergeanur2020-01-313-8/+58
|
* RC toyz crashfixSergeanur2020-01-311-1/+1
|
* PowerPointsSergeanur2020-01-203-1/+84
|
* AccidentManagerSergeanur2020-01-112-2/+2
|
* moveSergeanur2020-01-112-88/+0
|
* CUserDisplay, CPlaceName, CCurrentVehicleSergeanur2020-01-072-0/+216
|
* Finishing CDarkelSergeanur2020-01-071-10/+42
|
* fixesNikolay Korolev2020-01-031-3/+3
|
* script 800-899Nikolay Korolev2020-01-0310-129/+1273
|
* bug fixesNikolay Korolev2020-01-011-4/+4
|
* bug fixNikolay Korolev2020-01-011-1/+1
|
* fix merge with upstreamNikolay Korolev2020-01-011-3/+3
|
* merge with upstreamNikolay Korolev2020-01-018-82/+255
|\
| * CPlayerPed & fixeseray orçunus2019-12-282-2/+2
| |
| * CEmergencyPed doneeray orçunus2019-12-222-2/+15
| |
| * CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-054-51/+191
| |
| * CCivilianPed done & restore peds running to phoneeray orçunus2019-11-262-6/+10
| |
| * CPed completed!eray orçunus2019-11-201-18/+30
| | | | | | | | And a few fixes
| * Frontend, Peds & logic and overflow fixeseray orçunus2019-11-121-3/+7
| |
* | some not fully tested stuffNikolay Korolev2020-01-016-10/+833
| |
* | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-11-092-8/+7
|\|
| * Script fixeray orçunus2019-11-011-7/+6
| |
| * Merge pull request #255 from Nick007J/mastererorcun2019-10-303-22/+839
| |\ | | | | | | script 500-599
| * | Audio fixesSergeanur2019-10-271-1/+1
| | |
* | | script stubsNikolay Korolev2019-11-091-6/+519
| | |
* | | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-10-271-6/+6
|\| |
| * | Fixed use of boolean type for in CGameLogicSergeanur2019-10-261-6/+6
| | |
* | | script 600-699Nikolay Korolev2019-10-274-2/+378
| |/ |/|
* | fix pager buildNikolay Korolev2019-10-261-1/+1
| |
* | mergeNikolay Korolev2019-10-2626-33/+152
|\|
| * Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-261-3/+3
| |
| * Fixed CGameLogic::PassTime typesSergeanur2019-10-261-1/+1
| |
| * Fixes for aap review (audio8)Filip Gawin2019-10-261-1/+1
| |
| * Fixes for nitpicksFilip Gawin2019-10-261-29/+22
| |
| * Fix rebasingFilip Gawin2019-10-261-1/+1
| |
| * audio7Filip Gawin2019-10-261-22/+29
| |
| * Merge pull request #252 from Sergeanur/MessagesPagerTexterorcun2019-10-231-6/+6
| |\ | | | | | | Full CMessages, full CPager, CText fixes
| | * Full MessagesSergeanur2019-10-211-6/+6
| | |
| * | Merge pull request #246 from Sergeanur/PoolsSergeanur2019-10-216-21/+18
| |\ \ | | |/ | |/| 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-166-21/+18
| | |
| * | Merge pull request #248 from Nmzik/masteraap2019-10-2020-2/+124
| |\ \ | | | | | | | | CPopulation::Initialise() && CGame::Process() && CGame::ReloadIPLs()
| | * | CGame::Process() && CGame::ReloadIPLsnmzik2019-10-1920-2/+45
| | | |
| | * | CPopulation::Initialise()nmzik2019-10-182-0/+79
| | | |
* | | | script 500-599Nikolay Korolev2019-10-261-0/+1
| | | |
* | | | script 500-599 plus bugfixNikolay Korolev2019-10-213-22/+838
|/ / /
* / / Moved CCutsceneMgr::ms_cutsceneProcessing to privateSergeanur2019-10-191-1/+1
|/ /
* / Gangs save and missed sound enumsSergeanur2019-10-172-44/+28
|/
* Merge branch 'master' into mastererorcun2019-10-162-19/+28
|\
| * More PathFind fixesSergeanur2019-10-141-5/+6
| |
| * Some PathFind fixes (not all)Sergeanur2019-10-142-14/+22
| |
* | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-10-134-8/+15
|\|
| * PathFind fix and some Pedseray orçunus2019-10-132-6/+13
| |
| * Fixed unsigned time check in CDarkelSergeanur2019-10-131-1/+1
| |
| * quick fixNikolay Korolev2019-10-131-2/+2
| |
* | copypaste errorNikolay Korolev2019-10-131-1/+1
| |
* | 400-499Nikolay Korolev2019-10-133-12/+416
| |
* | Merge branch 'master' into script_devNikolay Korolev2019-10-125-13/+282
|\|
| * Merge pull request #237 from Nick007J/masterNikolay Korolev2019-10-122-4/+5
| |\ | | | | | | fixes
| | * fixesNikolay Korolev2019-10-122-4/+5
| | |
| * | Fixed floating package pickupsSergeanur2019-10-121-0/+1
| | |
| * | Merge pull request #231 from Sergeanur/RestartSergeanur2019-10-122-9/+276
| |\ \ | | |/ | |/| Full CRestart
| | * Fixed iteration typoSergeanur2019-10-121-2/+2
| | |
| | * Full CRestartSergeanur2019-10-112-9/+276
| | |
* | | script 400-499 startNikolay Korolev2019-10-122-10/+403
|/ /
* | blunderNikolay Korolev2019-10-121-1/+1
| |
* | Fix typo in CCarAI::GetCarToGoToCoorsSergeanur2019-10-121-1/+1
| |
* | Typo fixSergeanur2019-10-121-1/+1
| |
* | Merge pull request #230 from Nick007J/mastererorcun2019-10-117-34/+721
|\ \ | |/ |/| CCarAI, CCurves, CAutoPilot
| * CCarAI + bugfixesNikolay Korolev2019-10-103-25/+213
| |
| * fixed stupid bugNikolay Korolev2019-10-091-9/+7
| |
| * Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-10-0810-18/+344
| |\
| * | fixed bugsNikolay Korolev2019-10-081-53/+48
| | |
| * | mergeNikolay Korolev2019-10-068-226/+1331
| |\ \
| * | | car AINikolay Korolev2019-10-064-15/+445
| | | |
| * | | CAutoPilot and CCurvesNikolay Korolev2019-09-153-2/+80
| | | |
* | | | Merge pull request #229 from Sergeanur/SaveLoadTemplatesSergeanur2019-10-118-138/+123
|\ \ \ \ | | | | | | | | | | Added read/write template functions for save data
| * | | | Fix CCarGenerator Load/SaveSergeanur2019-10-102-4/+4
| | | | |
| * | | | Added read/write template functions for save data, small Load/Save arguments unificationSergeanur2019-10-087-136/+121
| | |_|/ | |/| |
* / | | CMoneyMessages moved to SpecialFX.cppSergeanur2019-10-101-1/+1
|/ / /
* | | Full CGameLogicSergeanur2019-10-086-1/+324
| | |
* | | Pedseray orçunus2019-10-064-6/+9
| | |
* | | CGarages::PrintMessages drawing fixesSergeanur2019-10-061-11/+11
| |/ |/|
* | Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFileSergeanur2019-10-061-1/+1
| |
* | CDarkel, walkaround fixeray orçunus2019-10-052-137/+171
| |
* | Fix warningsSergeanur2019-10-041-4/+4
| |
* | Fix formatting mistakesSergeanur2019-10-031-2/+1
| |
* | Fixed some formattingSergeanur2019-10-031-6/+2
| |
* | Checks rewrittenSergeanur2019-10-032-88/+96
| |
* | Drop w'sSergeanur2019-10-032-15/+15
| |
* | CPickupsSergeanur2019-10-032-81/+1143
| |
* | Merge pull request #218 from erorcun/erorcunaap2019-10-031-3/+3
|\ \ | | | | | | Fixes & peds
| * | Fixes & pedseray orçunus2019-10-031-3/+3
| | |
* | | Fix typo in CCarCtrl::WeaveThroughPedsSectorListSergeanur2019-10-031-1/+1
|/ /
* | Fix CPickupSergeanur2019-10-011-2/+5
| |
* | Peds, ProcessObjective and fixeseray orçunus2019-09-262-0/+2
| |
* | Peds, a fix and a tad of VCeray orçunus2019-09-173-5/+8
|/
* CCarCtrlNikolay Korolev2019-09-156-48/+390
|
* fix debugNikolay Korolev2019-09-141-4/+1
|
* fix typoNikolay Korolev2019-09-141-2/+2
|
* Merge branch 'carctrl_dev'Nikolay Korolev2019-09-146-47/+659
|\
| * more CCarCtrlNikolay Korolev2019-09-146-39/+533
| |
| * Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-09-124-4/+22
| |\
| * | DragCarToPointNikolay Korolev2019-09-122-15/+133
| | |
* | | P.e.d.s.eray orçunus2019-09-142-0/+30
| |/ |/|
* | Merge pull request #204 from erorcun/erorcunaap2019-09-124-4/+22
|\ \ | |/ |/| World and Peds
| * World and Pedseray orçunus2019-09-124-4/+22
| |
* | make ATTEMPTS_TO_FIND_NEXT_NODE a defineNikolay Korolev2019-09-111-4/+6
| |
* | ccarctrlNikolay Korolev2019-09-114-9/+95
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-09-111-1/+1
|\|
| * Pedseray orçunus2019-09-071-1/+1
| |
* | ccarctrlNikolay Korolev2019-09-112-3/+145
| |
* | More CCarCtrlNikolay Korolev2019-09-024-9/+246
|/
* CCarCtrl Weave stuff doneNikolay Korolev2019-09-012-31/+130
|
* CCarCtrl stuffNikolay Korolev2019-09-013-2/+169
|
* Audio fixesFilip Gawin2019-08-271-32/+25
|
* CleanupFilip Gawin2019-08-275-39/+39
|
* More more more audioFilip Gawin2019-08-277-79/+86
|
* CleanupFilip Gawin2019-08-274-42/+39
|
* More audio pedFilip Gawin2019-08-274-28/+29
|
* more CCarCtrlNikolay Korolev2019-08-253-5/+195
|
* mergeNikolay Korolev2019-08-174-10/+11
|\
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-08-153-11/+11
| |\
| | * fixFire-Head2019-08-151-7/+7
| | |
| | * Merge branch 'master' into masterFire_Head2019-08-1527-145/+2552
| | |\
| | * | CParticleObject done, cDMAudio doneFire-Head2019-08-151-2/+2
| | | |
| * | | AnimViewer!eray orçunus2019-08-152-2/+2
| | | |
* | | | more CCarCtrlNikolay Korolev2019-08-171-6/+120
| |_|/ |/| |
* | | pathetic errorsNikolay Korolev2019-08-141-2/+2
|/ /
* | appveyor fixNikolay Korolev2019-08-111-2/+2
| |
* | more CCarCtrlNikolay Korolev2019-08-1118-43/+424
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-104-113/+1025
|\ \
| * | finished CPathFindaap2019-08-092-113/+1004
| | |
| * | Pedseray orçunus2019-08-082-0/+21
| | |
* | | More CCarCtrlNikolay Korolev2019-08-102-2/+82
|/ /
* | Minor fixesNikolay Korolev2019-08-061-19/+21
| |
* | CCarCtrl::GenerateOneRandomVehicle!Nikolay Korolev2019-08-0612-7/+557
| |
* | fixed COMMAND_ADD_BLIP_FOR_COORD_OLDNikolay Korolev2019-08-051-0/+1
| |
* | fixed heading calculationNikolay Korolev2019-08-031-8/+4
| |
* | RunningScript, part 4, plus some fixesNikolay Korolev2019-08-035-11/+496
|/
* The Pedseray orçunus2019-08-023-6/+15
|
* fixed phonesNikolay Korolev2019-07-282-2/+4
|
* fix debug messageNikolay Korolev2019-07-281-1/+0
|
* fixed cargen loadNikolay Korolev2019-07-281-2/+2
|
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-271-2/+2
|\
| * fixed intro skipNikolay Korolev2019-07-271-2/+2
| |
* | cargen + some scriptNikolay Korolev2019-07-276-2/+655
|/
* fixed remoteNikolay Korolev2019-07-263-3/+3
|
* Merge branch 'master' into masteraap2019-07-261-3/+3
|\
| * Ped & fixes, including peds dive into danger fixeray orçunus2019-07-251-3/+3
| |
* | Running script part 3Nikolay Korolev2019-07-2510-16/+714
|/
* bit more CAutomobileaap2019-07-231-0/+1
|
* CPed continues, including some fixeseray orçunus2019-07-202-1/+2
|
* fixed script issuesNikolay Korolev2019-07-202-9/+11
|
* fixed replayNikolay Korolev2019-07-202-26/+26
|
* ComputeDopplerEffectedFrequencyFilip Gawin2019-07-191-2/+2
|
* CAutomobile::ProcessControl doneaap2019-07-184-0/+4
|
* Merge pull request #147 from erorcun/erorcunaap2019-07-182-2/+2
|\ | | | | The Peds, mainly dying/injuring
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-184-25/+35
| |\
| * | The Peds, mainly dying/injuringeray orçunus2019-07-182-2/+2
| | | | | | | | | | | | There is also some reorganization
* | | fixed car AI bugNikolay Korolev2019-07-181-0/+1
| |/ |/|
* | more CAutomobile::ProcessControlaap2019-07-173-1/+10
| |
* | Fixed Bridgeguard32019-07-171-24/+25
|/
* renamed some variables and added files; more CAutomobile::ProcessControlaap2019-07-1711-1/+36
|
* script fix, bomb fix, flying components fixNikolay Korolev2019-07-171-1/+1
|
* more fixes; started CAutomobile::ProcessControlaap2019-07-161-24/+24
|
* Merge branch 'master' into erorcunaap2019-07-166-5/+826
|\
| * fixNikolay Korolev2019-07-151-1/+2
| |
| * testNikolay Korolev2019-07-151-4/+4
| |
| * fixNikolay Korolev2019-07-151-2/+1
| |
| * fixed arithmeticsNikolay Korolev2019-07-141-16/+64
| |
| * fixed copsNikolay Korolev2019-07-141-2/+2
| |
| * RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes)Nikolay Korolev2019-07-144-11/+314
| |
| * Partial RunningScript part2Nikolay Korolev2019-07-143-1/+471
| |
* | Phone, World, Pederay orçunus2019-07-152-17/+165
|/
* more CWanted; added CEventListaap2019-07-122-3/+3
|
* Merge pull request #129 from erorcun/erorcunaap2019-07-102-4/+112
|\ | | | | Fix CPhone crash, more functions
| * Fix CPhone crash, more functionseray orçunus2019-07-102-4/+112
| |
* | added wrappers around math functionsaap2019-07-102-10/+10
|/
* Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-107-43/+2112
|\
| * fixed COMMAND_IS_PLAYER_IN_AREA_3Daap2019-07-101-2/+2
| |
| * Merge pull request #126 from Nick007J/masteraap2019-07-102-3/+705
| |\ | | | | | | RunningScript part 1
| | * fixNikolay Korolev2019-07-091-0/+1
| | |
| | * sync with upstreamNikolay Korolev2019-07-094-14/+17
| | |\
| | * | RunningScript: 1/12Nikolay Korolev2019-07-092-3/+704
| | | |
| * | | more CVehicleaap2019-07-091-4/+35
| | |/ | |/|
| * | yet more CAutomobileaap2019-07-092-6/+9
| | |
| * | more CAutomobileaap2019-07-092-7/+7
| | |
| * | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-083-26/+1359
| |\|
| | * Merge pull request #122 from Nick007J/masteraap2019-07-083-26/+1359
| | |\ | | | | | | | | More script stuff
| | | * Added script commandsNikolay Korolev2019-07-072-0/+1159
| | | |
| | | * More scriptNikolay Korolev2019-07-072-6/+92
| | | |
| | | * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-072-4/+367
| | | |\
| | | * | More scriptsNikolay Korolev2019-07-072-25/+113
| | | | |
| * | | | more CAutomobileaap2019-07-081-1/+1
| |/ / /
* / / / Phone start, ped spinning and cop car fix, and some love to CPederay orçunus2019-07-102-0/+65
|/ / / | | | | | | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* | | little changes; one more function of CAutomobileaap2019-07-081-28/+28
| | |
* | | cleaned up patching of virtual functions; started CAutomobileaap2019-07-081-4/+6
| |/ |/|
* | Merge pull request #111 from gennariarmando/masteraap2019-07-072-4/+367
|\ \ | |/ |/| Darkel/Wanted update.
| * Darkel is bored._AG2019-07-071-1/+2
| |
| * Merge branch 'master' of https://github.com/gtamodding/re3_AG2019-07-0718-1179/+166
| |\
| * \ Merge branch 'master' into master_AG2019-07-078-68/+335
| |\ \
| * | | Lil update._AG2019-07-072-97/+114
| | | |
| * | | Darkel/Wanted update._AG2019-07-042-4/+349
| | | |
* | | | Merge pull request #121 from Nick007J/masteraap2019-07-072-28/+459
|\ \ \ \ | | | | | | | | | | IntoTheScripts!
| * | | | IntoTheScripts!Nikolay Korolev2019-07-072-28/+459
| | |_|/ | |/| |
* / | | implemented CDooraap2019-07-071-2/+2
|/ / /
* | | the great reorganizationaap2019-07-0715-1169/+5
| | |
* | | finished CPhysicalaap2019-07-071-1/+1
| | |
* | | made code use TimeStepIn(Milli)Seconds; purged unnecessary inlinesaap2019-07-072-3/+3
| | |
* | | Merge pull request #114 from Nick007J/masteraap2019-07-072-8/+159
|\ \ \ | |_|/ |/| | Added CUpsideDownCarCheck and CStuckCarCheck
| * | Added CUpsideDownCarCheck and CStuckCarCheckNikolay Korolev2019-07-062-8/+159
| | |
* | | some work on vehiclesaap2019-07-062-67/+64
|/ /
* | Merge pull request #113 from erorcun/erorcunaap2019-07-061-0/+92
|\ \ | | | | | | CPed
| * \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-063-48/+50
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/entities/Ped.h src/entities/Vehicle.h
| * | | CPed...eray orçunus2019-07-061-0/+92
| | |/ | |/| | | | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* | | CBridgeguard32019-07-064-2/+178
| |/ |/|
* | finished CDamageManageraap2019-07-051-46/+45
| |
* | implemented some CVehicle functionsaap2019-07-053-2/+5
|/
* Script stuff + bug fixesNikolay Korolev2019-07-047-13/+265
|
* Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-012-30/+393
|\
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-308-9/+72
| |\
| | * little cleanupaap2019-06-301-5/+5
| | |
| * | Completed CReplayNikolay Korolev2019-06-301-0/+35
| | |
| * | Changed CReplay::Display slightlyNikolay Korolev2019-06-301-8/+13
| | |
| * | Added camera funcs to ReplayNikolay Korolev2019-06-302-11/+239
| | |
| * | More replay functions, also removed pool iteration errorNikolay Korolev2019-06-302-14/+109
| | |
* | | More CPederay orçunus2019-07-011-2/+2
| |/ |/| | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* | finished CEntityaap2019-06-307-4/+67
|/
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-301-2/+2
|\
| * Merge pull request #78 from ShFil119/cleanupaap2019-06-301-2/+2
| |\ | | | | | | Cleanup project a bit
| | * Cleanup project a bitFilip Gawin2019-06-301-2/+2
| | |
* | | Reactivated Store(Restore)StuffIn(From)Mem, fixed bugsNikolay Korolev2019-06-302-36/+36
|/ /
* | PlayBackThisFrameInterpolation and all it required...Nikolay Korolev2019-06-304-0/+257
| |
* | ProcessCarUpdateNikolay Korolev2019-06-292-34/+106
| |
* | CReplay::PlaybackThisFrame + fixesNikolay Korolev2019-06-292-6/+37
|/
* Merged with upstreamNikolay Korolev2019-06-293-5/+7
|\
| * miscellaneous, mostly world relatedaap2019-06-293-5/+7
| |
* | more replay stuff, bug fixNikolay Korolev2019-06-292-12/+62
| |
* | RetrievePedAnimationNikolay Korolev2019-06-291-0/+41
| |
* | ProcessPedUpdateNikolay Korolev2019-06-292-6/+42
|/
* misc stuff, mostly collisionaap2019-06-284-0/+6
|
* CStreaming DONEaap2019-06-287-26/+43
|
* Merge pull request #59 from Nick007J/masteraap2019-06-282-0/+144
|\ | | | | Added Gangs
| * Changed save/load in CGangNikolay Korolev2019-06-272-24/+35
| |
| * fixed newlineNikolay Korolev2019-06-271-1/+1
| |
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-271-1/+1
| |\
| * | Added GangsNikolay Korolev2019-06-272-0/+133
| | |
* | | started filling debug menuaap2019-06-272-0/+3
| |/ |/|
* | yet more CStreamingaap2019-06-271-1/+1
|/
* fixed autobuildNikolay Korolev2019-06-261-1/+1
|
* Fixed merge errorsNikolay Korolev2019-06-261-2/+2
|
* Merge with upstreamNikolay Korolev2019-06-267-10/+80
|\
| * fixed PedTypeaap2019-06-261-2/+2
| |
| * Initial commit for Frontend._AG2019-06-252-8/+26
| | | | | | | | | | | | Bug fixes: fix #40, fix #39, fix #38, fix #37, fix #21. Code organization and cleanup...
| * CPed, CVehicle, mostly entering/exiting careray orçunus2019-06-244-0/+52
| | | | | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* | More replay stuffNikolay Korolev2019-06-2510-16/+529
| |
* | CReplay::StorePedAnimationNikolay Korolev2019-06-232-24/+68
| |
* | StorePedUpdateNikolay Korolev2019-06-232-4/+37
|/
* attempt to fix build errorNikolay Korolev2019-06-221-10/+2
|
* fixed typesNikolay Korolev2019-06-221-22/+22
|
* tabifyNikolay Korolev2019-06-221-68/+68
|
* Added newlines at end of fileNikolay Korolev2019-06-221-1/+1
|
* First commit of replay systemNikolay Korolev2019-06-222-2/+452
|
* Code clean up._AG2019-06-202-4/+6
|
* Update Radar.cpp_AG2019-06-202-0/+2
|
* Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG2019-06-203-8/+17
|
* finally finished CVehicleModelInfoaap2019-06-202-1/+2
|\
| * implemented cHandlingDataMgraap2019-06-195-2/+435
| |
* | implemented cHandlingDataMgraap2019-06-205-2/+435
|/
* implemented CObjectDataaap2019-06-194-11/+126
|
* implemented CPedStatsaap2019-06-193-10/+189
|
* finished CPedTypeaap2019-06-192-20/+229
|
* cleanup on CPed and CPedTypeaap2019-06-192-55/+85
|
* CPed merge fixeseray orçunus2019-06-182-4/+86
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* finished CFileLoader, except a crash!aap2019-06-184-0/+23
|
* first part of CFileLoaderaap2019-06-1711-4/+95
|
* Update HUD stuff, bug and format fixes._AG2019-06-173-2/+83
| | | | | Added environment variables to premake5.lua. Update README.md
* got rid of upper case typesaap2019-06-177-22/+22
|
* New updates for Hud.cpp and more._AG2019-06-155-1/+50
|
* Fix value of CReplay modeFilip Gawin2019-06-131-1/+1
|
* Update Replay.hFire_Head2019-06-131-0/+1
|
* Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-06-133-1/+16
|\ | | | | | | | | # Conflicts: # src/control/Replay.h
| * little cleanupaap2019-06-123-1/+18
| |
* | CPad doneFire-Head2019-06-134-0/+13
|/
* RE more stuff from COnscreenTimerFilip Gawin2019-06-122-1/+5
|
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-3010-0/+819
|
* clean upaap2019-05-302-0/+19
|
* more work on CPhysicalaap2019-05-182-0/+14
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:31:45 +0100