summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* merge attemptNikolay Korolev2020-12-191-6/+8
|\
| * Fix some formatting issuesSeemann2020-12-141-6/+6
| |
| * uint8 enums fixedwithmorten2020-12-071-2/+2
| |
| * GTA_VERSION define and some config.h cleanupaap2020-11-291-1/+1
| |
| * Script commands split to original filesSergeanur2020-11-241-8912/+3
| |
| * add mission switcher from miamiwithmorten2020-11-161-0/+41
| |
| * remove autosave at end of mission under MISSION_REPLAYNikolay Korolev2020-11-011-0/+2
| |
| * Use audio enumSergeanur2020-10-231-2/+2
| |
* | fixed garages + minor fixesNikolay Korolev2020-12-121-0/+3
| |
* | uint8 enums fixedwithmorten2020-12-071-2/+2
| |
* | script from other platforms and unused commandsNikolay Korolev2020-12-051-1/+44
| |
* | Update Script.cppZach Charo2020-11-281-1/+1
| | | | | | Case sensitivity fix. Causes compile issue on linux.
* | Script commands split to original filesSergeanur2020-11-241-11484/+12
| |
* | small fixNikolay Korolev2020-11-131-2/+2
| |
* | damnNikolay2020-11-111-1/+1
| |
* | fixesNikolay Korolev2020-11-021-1/+1
| |
* | embarassingNikolay Korolev2020-11-021-2/+2
| |
* | fixNikolay Korolev2020-11-021-0/+4
| |
* | finished script and replayNikolay Korolev2020-11-011-7/+9
| |
* | fixed KYFCNikolay Korolev2020-11-011-5/+25
| |
* | overflow fixNikolay Korolev2020-11-011-2/+2
| |
* | ScriptSoundsSergeanur2020-10-231-19/+13
| |
* | Messages, fix Fonterorcun2020-10-201-0/+2
| |
* | Merge pull request #766 from Fire-Head/miamierorcun2020-10-181-6/+7
|\ \ | | | | | | Glass
| * | Miami GlassFire-Head2020-10-141-6/+7
| | |
* | | Merge branch 'miami' into miamierorcun2020-10-181-28/+39
|\ \ \
| * \ \ Merge branch 'master' into miamiSergeanur2020-10-181-6/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | lil fixSergeanur2020-10-181-2/+2
| | | |
| | * | Setter for bIsStatic (became virtual in SA)Sergeanur2020-10-181-5/+5
| | | |
| | * | Script.cpp missing breaksshfil2020-10-181-0/+2
| | | |
| | * | fixed bad bugNikolay Korolev2020-09-301-13/+13
| | | |
| | * | bug fixedNikolay Korolev2020-09-261-1/+1
| | | |
| | * | Fixes from miamieray orçunus2020-09-101-3/+3
| | | |
| * | | Script.cpp missing breaksshfil2020-10-181-0/+2
| | | |
| * | | Control updatesNikolay Korolev2020-10-111-22/+31
| | |/ | |/|
* / | CSpecialFX and some other classesRoman Masanin2020-10-091-5/+4
|/ /
* | Pad, BulletInfo, ProjectileInfo, fixeseray orçunus2020-10-071-1/+1
| |
* | fixed bad bugNikolay Korolev2020-09-301-13/+13
| |
* | now fixed properlyNikolay Korolev2020-09-261-5/+1
| |
* | VC replaysNikolay Korolev2020-09-261-1/+1
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-09-131-5/+5
|\ \
| * \ Merge pull request #702 from Sergeanur/VC/MusicManagerSergeanur2020-09-131-5/+5
| |\ \ | | | | | | | | cMusicManager, cDMAudio, radio position save/load, a few commands imp…
| | * | cMusicManager, cDMAudio, radio position save/load, a few commands implementedSergeanur2020-09-091-5/+5
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-09-111-1/+1
|\| | |
| * | | Peds objectives and wait states done, fixeseray orçunus2020-09-051-1/+1
| |/ /
* / / fixesNikolay Korolev2020-09-021-2/+1
|/ /
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-08-301-7/+7
|\ \
| * | CGame done, Peds, fixeseray orçunus2020-08-301-7/+7
| | |
* | | script inaccuracyNikolay Korolev2020-08-301-0/+1
|/ /
* | CutsceneMgr doneSergeanur2020-08-241-3/+9
| |
* | call streaming funcsaap2020-08-211-2/+1
| |
* | Merge pull request #693 from majesticCoding/miamiaap2020-08-201-8/+15
|\ \ | | | | | | stable CScriptPaths
| * | stable CScriptPathsmajestic2020-08-201-8/+15
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-191-24/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Collision.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/main.cpp # src/core/re3.cpp # src/extras/custompipes.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/shaders/Makefile # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_fs_gl3.inc # src/modelinfo/ModelInfo.cpp # src/modelinfo/PedModelInfo.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp # src/save/GenericGameStorage.cpp
| * | Island loading cleanup and fixSergeanur2020-08-191-24/+13
| | |
* | | Merge remote-tracking branch 'origin/miami' into miamiSergeanur2020-08-191-100/+122
|\ \ \ | | |/ | |/| | | | | | | # Conflicts: # src/core/config.h
| * | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-08-161-4/+7
| |\ \
| * | | CarCtrl finished, minor Script thingsNikolay Korolev2020-08-161-100/+122
| | | |
* | | | Merge branch 'master' into miamiSergeanur2020-08-191-22/+44
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLEJack Powell2020-08-181-1/+1
| | |
| * | Island loading and PS2 alpha test added to optionsSergeanur2020-08-161-19/+41
| | |
| * | Fixes from miamieray orçunus2020-07-201-30/+20
| | |
* | | 2 new opcodeseray orçunus2020-08-161-4/+7
| |/ |/|
* | Continue to Frontend, fix savegame list bugeray orçunus2020-08-141-6/+6
| |
* | Wheelie opcodeeray orçunus2020-08-141-7/+13
| |
* | Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-141-18/+22
| |
* | timecycle doneaap2020-08-091-2/+2
| |
* | new opcodes, buyable properties, minor fixeseray orçunus2020-07-301-16/+37
| |
* | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-221-24/+16
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-181-2/+2
|\|
| * fixNikolay Korolev2020-07-181-2/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-07-131-4/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-131-4/+4
| |
| * Remove island loadingSergeanur2020-07-091-0/+10
| |
| * Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-07-031-2/+2
| |\
| | * fixed typoNikolay Korolev2020-07-031-2/+2
| | |
| * | Bettah car enter canceling, fix CFO crash, ped objs. renamingeray orçunus2020-07-031-7/+7
| |/
| * copypaste bugNikolay Korolev2020-07-011-1/+0
| |
| * Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)erorcun2020-07-011-0/+5
| |
| * little fixNikolay Korolev2020-07-011-1/+2
| |
* | VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-091-24/+18
| |
* | Merge pull request #648 from Nick007J/miamiaap2020-07-041-7/+58
|\ \ | | | | | | ice cream attractor + bike respray
| * | ice cream attractor + bike resprayNikolay Korolev2020-07-031-7/+58
| | |
* | | fixed typoNikolay Korolev2020-07-031-1/+1
| | |
* | | fixed typoNikolay Korolev2020-07-031-3/+3
|/ /
* | fixNikolay Korolev2020-07-011-332/+332
| |
* | script logging for miamiNikolay Korolev2020-07-011-888/+1164
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-397/+1786
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
| * fixNikolay Korolev2020-06-281-1/+1
| |
| * script logging fixesNikolay Korolev2020-06-281-394/+409
| |
| * fixesNikolay Korolev2020-06-221-13/+14
| |
| * updated player control namesNikolay Korolev2020-06-211-2/+2
| |
| * copypasteNikolay Korolev2020-06-211-1/+1
| |
| * script loggingNikolay Korolev2020-06-211-26/+1402
| |
| * minor fixNikolay Korolev2020-06-121-1/+1
| |
| * fixesNikolay Korolev2020-06-081-2/+2
| |
| * fixed some arithmeticNikolay Korolev2020-06-071-16/+32
| |
* | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-221-14/+14
| |
* | fixNikolay Korolev2020-06-201-1/+0
| |
* | fixNikolay Korolev2020-06-201-0/+1
| |
* | bikes in garages + bugfixNikolay Korolev2020-06-171-1/+1
| |
* | Ped, Weapon and fixeseray orçunus2020-06-171-1/+0
| |
* | some cutscene opcodes and heli gunseray orçunus2020-06-161-10/+14
| |
* | much better mission switchereray orçunus2020-06-141-22/+55
| |
* | Peds, mission switcher & fixeseray orçunus2020-06-141-7/+36
| |
* | script fixNikolay Korolev2020-06-131-5/+13
| |
* | fixesSergeanur2020-06-081-1/+0
| |
* | Mission audio slotsSergeanur2020-06-081-29/+7
| |
* | fixesNikolay Korolev2020-06-081-1/+1
| |
* | CarCtrl fixeseray orçunus2020-06-071-1/+1
| |
* | 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-071-0/+4
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-06-071-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
| | * 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-051-10/+37
| |
* | Peds, eSound and PedState enum, fixeseray orçunus2020-06-031-9/+22
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-2/+149
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Detect R and start game on menueray orçunus2020-05-281-11/+3
| |
| * Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-05-281-0/+147
| |\
| | * Merge pull request #599 from Nick007J/masteraap2020-05-281-0/+147
| | |\ | | | | | | | | Mission replay
| | | * mission replayNikolay Korolev2020-05-261-0/+147
| | | |
| * | | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-1/+12
| |/ /
| * / crash fixNikolay Korolev2020-05-281-2/+2
| |/
* | game logicNikolay Korolev2020-05-311-24/+18
| |
* | roadblocksNikolay Korolev2020-05-301-3/+3
| |
* | 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-291-5/+6
|/ /
* | Support of original mp3/wav/adfSergeanur2020-05-271-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * 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-251-2/+2
|/ /
* | script fixNikolay Korolev2020-05-241-2/+2
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-231-11/+50
|\ \
| * | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-231-11/+50
| | |
* | | set piecesNikolay Korolev2020-05-231-1/+5
|/ /
* | fixed scriptNikolay Korolev2020-05-231-4/+4
| |
* | removed debugNikolay Korolev2020-05-231-1/+0
| |
* | fixesNikolay Korolev2020-05-231-2/+3
| |
* | some fixesNikolay Korolev2020-05-231-4/+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-221-83/+1110
|/ /
* | script revisionNikolay Korolev2020-05-211-53/+137
| |
* | script revisionNikolay Korolev2020-05-201-52/+205
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-201-8/+17
|\ \
| * | 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-201-8/+9
| |\ \ | | | | | | | | CEntity and friends
| | * | CEntity and friendsaap2020-05-191-8/+9
| | | |
* | | | script revisionNikolay Korolev2020-05-201-157/+289
|/ / /
* | | sync with upstreamNikolay Korolev2020-05-191-0/+12
|\ \ \
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-05-191-171/+748
| |\| |
| * | | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-191-0/+12
| | | |
| * | | just in caseeray orçunus2020-05-171-0/+1
| | | |
* | | | script revisionNikolay Korolev2020-05-191-119/+98
| |/ / |/| |
* | | script revisionNikolay Korolev2020-05-191-110/+105
| | |
* | | 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-171-24/+9
|\| |
| * | Merge pull request #555 from erorcun/miamiaap2020-05-171-14/+17
| |\ \ | | | | | | | | Weapon fixes and thingies
| | * | Weapon fixes and thingieseray orçunus2020-05-171-14/+17
| | | |
* | | | full script basic supportNikolay Korolev2020-05-171-62/+564
| | | |
* | | | more script stuffNikolay Korolev2020-05-161-2/+42
|/ / /
* / / gangs, script and replay fixesNikolay Korolev2020-05-161-4/+15
|/ /
* | minimal weather stuff + multiple bugfixesNikolay Korolev2020-05-161-6/+2
| |
* | Weapon layer in Pedseray orçunus2020-05-151-2/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-2/+1
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * fixed script errorNikolay Korolev2020-05-141-2/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-0/+2
|\| | | | | | | | | | | | | | | | | | | | | # 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-121-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-79/+124
|\| | | | | | | | | | | | | | | | | # 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-111-79/+124
| |
* | more scriptNikolay Korolev2020-05-121-0/+36
| |
* | sync with upstreamNikolay Korolev2020-05-111-0/+10
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-05-111-0/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * Fixed typos and made all assert functions optionalbigbossbro082020-05-101-0/+10
| | |
| | * some work on zonesaap2020-05-061-15/+15
| | |
* | | garages + scriptNikolay Korolev2020-05-111-0/+30
|/ /
* | some updates for scriptNikolay Korolev2020-05-101-39/+23
| |
* | script changesNikolay Korolev2020-05-101-8/+17
| |
* | more car controlNikolay Korolev2020-05-101-0/+8
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-091-19/+6
|\ \
| * | peds starting to workaap2020-05-091-4/+4
| | |
| * | removed cutscene headsaap2020-05-091-15/+2
| | |
* | | ccarctrl big fixNikolay Korolev2020-05-091-0/+8
|/ /
* | CCarCtrl::GenerateOneRandomCarNikolay Korolev2020-05-081-3/+3
| |
* | zone info commands + fixNikolay Korolev2020-05-081-5/+40
| |
* | little script changeaap2020-05-071-2/+2
| |
* | CZoneInfo mostly done; not its dependenciesaap2020-05-071-5/+7
| |
* | VC vehicles just barely working nowaap2020-05-071-20/+19
| |
* | changed default ID ranges. old default.ide incompatible nowaap2020-05-061-3/+3
| |
* | script stubs + REQUEST_COLLISIONNikolay Korolev2020-05-061-42/+345
| |
* | sync with masterNikolay Korolev2020-05-061-57/+36
|\ \
| * | new zone stuffaap2020-05-061-57/+36
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-061-4/+4
|\| |
| * | getting the vice city map to workaap2020-05-051-4/+4
| |/
* | script colstore stuffNikolay Korolev2020-05-061-0/+15
| |
* | colstore support in scriptNikolay Korolev2020-05-051-15/+15
| |
* | script stuffNikolay Korolev2020-05-051-0/+77
|/
* Make CBaseModelInfo fields protectedSergeanur2020-05-051-1/+1
|
* SetPosition, final partSergeanur2020-05-051-9/+9
|
* Merge pull request #508 from Nick007J/masterNikolay Korolev2020-05-041-3/+77
|\ | | | | Scripts compatible saving + CCarCtrl bug + crusher coach bug
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-031-0/+4
| |\
| * | script compatibilityNikolay Korolev2020-05-031-3/+77
| | |
* | | implemented most of vice city path systemaap2020-05-031-5/+5
| |/ |/|
* | Add CURMODE macroSergeanur2020-05-021-1/+1
| |
* | Fix COMMAND_GET_CONTROLLER_MODESergeanur2020-05-021-0/+4
|/
* SetPosition, part 1Sergeanur2020-05-021-2/+2
|
* Adding getters and setters for type and statusSergeanur2020-04-301-20/+20
|
* 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
| |
* | more 1.1 patchNikolay Korolev2020-04-241-0/+10
| |
* | 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-211-41/+41
|\|
| * Try to build with mingwFilip Gawin2020-04-201-41/+41
| |
* | fixesNikolay Korolev2020-04-201-6/+0
|/
* Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-2/+2
|
* Various fixeseray orçunus2020-04-181-1/+1
|
* Remove patchesSergeanur2020-04-171-15/+1
|
* rem refsFire-Head2020-04-171-41/+41
|
* fix Bait crashNikolay Korolev2020-04-161-1/+1
|
* fix script crashNikolay Korolev2020-04-151-2/+2
|
* Merge pull request #446 from erorcun/erorcunerorcun2020-04-151-1/+1
|\ | | | | Many fixes and cleanup
| * Many fixes and cleanuperay orçunus2020-04-151-1/+1
| |
* | fixed crashNikolay Korolev2020-04-141-0/+1
|/
* fixed intro crashNikolay Korolev2020-04-101-6/+6
|
* Fixing mixed IsCutsceneProcessing and IsRunningSergeanur2020-04-101-1/+1
|
* Merge remote-tracking branch 'Fire-Head/master'Sergeanur2020-04-091-4/+4
|\ | | | | | | | | # Conflicts: # src/core/Radar.cpp
| * PS2 Cheats, restored R*namesFire-Head2020-04-091-4/+4
| |
* | fix bugNikolay Korolev2020-04-081-0/+1
|/
* fix bugNikolay Korolev2020-04-081-1/+1
|
* fix bugNikolay Korolev2020-04-081-1/+1
|
* Merge branch 'master' into garages_devNikolay Korolev2020-04-061-4/+4
|\
| * CCamera fixesaap2020-04-031-4/+4
| |
* | Cranes doneNikolay Korolev2020-04-061-2/+5
|/
* bug fixes, reorganisationNikolay Korolev2020-03-301-4/+4
|
* merge with upstreamNikolay Korolev2020-03-291-31/+2
|\
| * Merge branch 'master' into masterFire_Head2020-03-291-29/+0
| |\
| | * Wrappers cleanupSergeanur2020-03-291-29/+0
| | |
| * | CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-281-2/+2
| |/
* | merge with masterNikolay Korolev2020-03-281-0/+3
|\|
| * CCopPed done and #include cleanuperay orçunus2020-03-281-0/+3
| |
* | Merge branch 'master' into garages_devNikolay Korolev2020-03-281-0/+1
|\|
| * removed windows.h for most .cppsaap2020-03-271-0/+1
| |
* | garages part 1Nikolay Korolev2020-03-281-4/+4
|/
* change default script to storyaap2020-03-241-1/+1
|
* Fixes for Serge's reviewFilip Gawin2020-03-221-1/+1
|
* replay bug fixes, script bug fixNikolay Korolev2020-03-151-0/+2
|
* 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-011-132/+145
|\
| * review fixesNikolay Korolev2020-03-011-131/+136
| |
| * 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
| | |
* | | save/loadNikolay Korolev2020-03-011-3/+165
|/ /
* | removed debug leftoversNikolay Korolev2020-02-241-3/+0
| |
* | more stuff + intro fixNikolay Korolev2020-02-241-20/+620
| |
* | 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-231-0/+2
| |
* | some changesNikolay Korolev2020-02-231-154/+134
| |
* | some cosmetic stuffNikolay Korolev2020-02-231-117/+216
|/
* ARRAY_SIZENikolay Korolev2020-02-221-2/+2
|
* mergeNikolay Korolev2020-02-221-4/+4
|\
| * Merge pull request #328 from erorcun/erorcunerorcun2020-02-171-4/+4
| |\ | | | | | | CPopulation 1
| | * CPopulation 1eray orçunus2020-02-171-4/+4
| | |
| | * Some fixes and some cosmetic thingseray orçunus2020-02-021-1/+1
| | |
* | | fixesNikolay Korolev2020-02-221-3/+3
| | |
* | | script 1000-1154Nikolay Korolev2020-02-161-27/+976
|/ /
* | review fixesNikolay Korolev2020-02-161-62/+62
| |
* | bug fixesNikolay Korolev2020-02-151-11/+24
| |
* | script 900-999Nikolay Korolev2020-02-151-12/+547
| |
* | 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-021-2/+491
|/
* fixed ai bugNikolay Korolev2020-02-021-1/+1
|
* fixed bullion runNikolay Korolev2020-02-021-2/+3
|
* Fix HAS_OBJECT_BEEN_DAMAGEDSergeanur2020-02-011-1/+1
|
* Fix CTheScripts::AddToInvisibilitySwapArraySergeanur2020-02-011-2/+2
|
* Fix SET_BOAT_CRUISE_SPEEDSergeanur2020-01-311-4/+5
|
* More fixesSergeanur2020-01-311-36/+36
|
* Fixing IS_AREA_OCCUPIED commandSergeanur2020-01-311-1/+1
|
* CRemoteSergeanur2020-01-311-4/+4
|
* RC toyz crashfixSergeanur2020-01-311-1/+1
|
* PowerPointsSergeanur2020-01-201-1/+36
|
* fixesNikolay Korolev2020-01-031-3/+3
|
* script 800-899Nikolay Korolev2020-01-031-125/+1121
|
* 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-011-24/+40
|\
| * CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-051-3/+3
| |
| * 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-011-8/+780
| |
* | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-11-091-7/+6
|\|
| * Script fixeray orçunus2019-11-011-7/+6
| |
* | script stubsNikolay Korolev2019-11-091-6/+519
| |
* | script 600-699Nikolay Korolev2019-10-271-1/+361
|/
* fix pager buildNikolay Korolev2019-10-261-1/+1
|
* mergeNikolay Korolev2019-10-261-6/+6
|\
| * Full MessagesSergeanur2019-10-211-6/+6
| |
* | script 500-599Nikolay Korolev2019-10-261-0/+1
| |
* | script 500-599 plus bugfixNikolay Korolev2019-10-211-22/+830
|/
* 400-499Nikolay Korolev2019-10-131-11/+411
|
* Merge branch 'master' into script_devNikolay Korolev2019-10-121-3/+3
|\
| * fixesNikolay Korolev2019-10-121-3/+3
| |
* | script 400-499 startNikolay Korolev2019-10-121-6/+398
|/
* Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFileSergeanur2019-10-061-1/+1
|
* Fixes & pedseray orçunus2019-10-031-3/+3
|
* CCarCtrl stuffNikolay Korolev2019-09-011-2/+5
|
* fixFire-Head2019-08-151-7/+7
|
* more CCarCtrlNikolay Korolev2019-08-111-3/+3
|
* 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-031-9/+474
|
* 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-271-1/+277
|/
* fixed remoteNikolay Korolev2019-07-261-1/+1
|
* Running script part 3Nikolay Korolev2019-07-251-9/+658
|
* fixed script issuesNikolay Korolev2019-07-201-8/+10
|
* fixed car AI bugNikolay Korolev2019-07-181-0/+1
|
* renamed some variables and added files; more CAutomobile::ProcessControlaap2019-07-171-1/+1
|
* script fix, bomb fix, flying components fixNikolay Korolev2019-07-171-1/+1
|
* more fixes; started CAutomobile::ProcessControlaap2019-07-161-24/+24
|
* fixNikolay Korolev2019-07-151-1/+2
|
* testNikolay Korolev2019-07-151-4/+4
|
* 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-141-7/+306
|
* Partial RunningScript part2Nikolay Korolev2019-07-141-1/+469
|
* more CWanted; added CEventListaap2019-07-121-2/+2
|
* fixed COMMAND_IS_PLAYER_IN_AREA_3Daap2019-07-101-2/+2
|
* fixNikolay Korolev2019-07-091-0/+1
|
* RunningScript: 1/12Nikolay Korolev2019-07-091-2/+697
|
* Added script commandsNikolay Korolev2019-07-071-0/+1
|
* More scriptNikolay Korolev2019-07-071-4/+76
|
* More scriptsNikolay Korolev2019-07-071-22/+94
|
* IntoTheScripts!Nikolay Korolev2019-07-071-10/+295
|
* finished CPhysicalaap2019-07-071-1/+1
|
* made code use TimeStepIn(Milli)Seconds; purged unnecessary inlinesaap2019-07-071-1/+1
|
* Added CUpsideDownCarCheck and CStuckCarCheckNikolay Korolev2019-07-061-6/+145
|
* Script stuff + bug fixesNikolay Korolev2019-07-041-6/+155
|
* Update Radar.cpp_AG2019-06-201-0/+1
|
* Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG2019-06-201-0/+4
|
* New updates for Hud.cpp and more._AG2019-06-151-0/+3
|
* little cleanupaap2019-06-121-0/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 05:11:37 +0100