summaryrefslogtreecommitdiffstats
path: root/src/control (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-08-291-1/+1
|\ | | | | | | | | | | # Conflicts: # src/audio/AudioManager.cpp # src/core/Radar.cpp
| * fixNikolay2021-08-281-1/+1
| |
| * fixNikolay Korolev2021-08-201-2/+2
| |
| * small refactoringNikolay Korolev2021-08-201-8/+11
| |
| * fixNikolay Korolev2021-08-151-3/+1
| |
| * merged correct switchNikolay Korolev2021-08-151-1/+11
| |
| * bruhNikolay Korolev2021-08-151-1/+1
| |
| * actual fixNikolay Korolev2021-08-151-0/+7
| |
| * lil fixNikolay Korolev2021-08-151-1/+4
| |
* | fixNikolay2021-08-271-1/+1
| |
* | cleanupNikolay Korolev2021-08-252-2/+2
| |
* | Onscreen timerNikolay Korolev2021-08-257-26/+116
| |
* | revisionNikolay Korolev2021-08-234-6/+8
| |
* | activate commandNikolay Korolev2021-08-221-1/+1
| |
* | car ctrl fixesNikolay Korolev2021-08-202-34/+166
| |
* | fixNikolay Korolev2021-08-201-2/+2
| |
* | small refactoringNikolay Korolev2021-08-201-8/+11
| |
* | small revisionNikolay Korolev2021-08-161-38/+91
| |
* | fixNikolay Korolev2021-08-151-3/+1
| |
* | merged correct switchNikolay Korolev2021-08-151-1/+11
| |
* | bruhNikolay Korolev2021-08-151-1/+1
| |
* | actual fixNikolay Korolev2021-08-151-0/+7
| |
* | lil fixNikolay Korolev2021-08-151-1/+4
| |
* | merge miamiNikolay Korolev2021-08-143-0/+14
|\|
| * ginput scriptNikolay Korolev2021-08-143-0/+14
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-08-121-0/+1
|\|
| * mission retry fixNikolay Korolev2021-08-121-0/+1
| |
* | lil fixNikolay Korolev2021-08-121-0/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-08-114-6/+6
|\| | | | | | | | | | | # Conflicts: # src/core/Radar.cpp # src/core/Radar.h
| * Merge branch 'master' into miamiSergeanur2021-08-111-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/RoadBlocks.cpp # src/core/Radar.cpp # src/core/Radar.h # src/peds/Ped.cpp # src/peds/Population.cpp # src/renderer/Renderer.cpp # src/vehicles/CarGen.cpp
| | * Fix a bunch of CModelInfo::GetModelInfo->GetColModel callsSergeanur2021-08-094-6/+6
| | |
| | * Revert "small fix"Nikolay Korolev2021-08-081-5/+6
| | | | | | | | | | | | This reverts commit bd9658443381d91dd0bb1ded544617f2f0e3f1e0.
| * | Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2Sergeanur2021-08-111-1/+1
| | |
| * | Fix a bunch of CModelInfo::GetModelInfo->GetColModel callsSergeanur2021-08-113-5/+5
| | |
* | | debug func fixNikolay Korolev2021-08-081-2/+4
| | |
* | | Merge branch 'miami' into lcsNikolay Korolev2021-08-081-5/+15
|\| |
| * | fix bug in CCurvesNikolay Korolev2021-08-081-5/+15
| | |
* | | debug funcNikolay Korolev2021-08-081-2/+29
| | |
* | | mergeNikolay Korolev2021-08-081-5/+5
|\| |
| * | Revert "small fix"Nikolay Korolev2021-08-081-5/+6
| | | | | | | | | | | | This reverts commit bd9658443381d91dd0bb1ded544617f2f0e3f1e0.
* | | mergeNikolay Korolev2021-08-081-0/+5
|\| |
| * | Merge branch 'master' into miamiNikolay Korolev2021-08-081-6/+5
| |\|
| | * small fixNikolay Korolev2021-08-081-6/+5
| | |
* | | mergeNikolay Korolev2021-08-085-57/+60
|\| |
| * | mergeNikolay Korolev2021-08-082-2/+2
| |\|
| | * small fixNikolay Korolev2021-08-082-2/+2
| | |
| * | mergeNikolay Korolev2021-08-085-61/+66
| |\|
| | * small refactoringNikolay Korolev2021-08-085-38/+59
| | |
* | | mergeNikolay Korolev2021-08-083-0/+3
|\| |
| * | mergeNikolay Korolev2021-08-083-0/+3
| |\|
| | * syncNikolay Korolev2021-08-011-1/+4
| | |\
| | | * Make cars and peds to not despawn when you look awaySergeanur2021-07-261-1/+4
| | | |
| | | * fix garbage data written in garage save blockwithmorten2021-07-191-0/+3
| | | |
| | | * Merge pull request #1217 from Nopey/masterwithmorten2021-07-153-13/+20
| | | |\ | | | | | | | | | | Fix debug script loader crashing missions
| | | | * Fix Cheat menu debug script loaderMagnus Larsen2021-07-101-0/+4
| | | | |
| | | | * Fix debug script loader crashing missionsMagnus Larsen2021-07-103-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * open_script is now exposed in Script.h, perhaps it should be namespaced as a static method on CTheScripts? I'm unsure what is preferred. * I've moved the joypad code out of open_script to prevent buttons held down at mission load time from changing the scriptToLoad.
| | * | | move debug script stuff to a separate fileNikolay Korolev2021-08-013-1405/+1462
| | | | |
| | * | | syncNikolay Korolev2021-07-234-13/+23
| | |/ /
| | * | Merge pull request #1149 from withmorten/saveserorcun2021-07-126-79/+230
| | |\ \ | | | | | | | | | | finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
| | | * | finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-106-79/+230
| | | |/
| | * / Add ped and car density slider to menu, remove dumb collision "optimization"erorcun2021-07-111-1/+1
| | |/
| | * Use CPad functions to check key states in script loaderSergeanur2021-07-081-9/+4
| | |
| | * fix macro redefinition warnings on win-glfw buildwithmorten2021-07-081-1/+2
| | |
| | * Refactor OnscreenTimerSergeanur2021-07-021-59/+63
| | |
| | * rename clamp macro to Clamp to fix compilation with g++11withmorten2021-06-282-18/+18
| | |
| | * Revert "Revert "Redo ReadSaveBuf + common.h cleanup""withmorten2021-06-266-99/+120
| | | | | | | | | | | | This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
| | * Revert "Redo ReadSaveBuf + common.h cleanup"erorcun2021-06-256-120/+99
| | | | | | | | | | | | This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
| | * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-256-99/+120
| | |
| | * Fix some timer callsSergeanur2021-06-241-1/+1
| | |
| | * Fix sin & cos callsSergeanur2021-06-243-8/+8
| | |
| | * Use bool8 in audio codeSergeanur2021-06-243-4/+4
| | |
| | * small RoadBlock fixSergeanur2021-06-241-3/+1
| | |
| | * Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fixSergeanur2021-06-243-13/+25
| | |
| | * nil -> falsewithmorten2021-02-191-1/+1
| | |
| | * add debug render groupsaap2021-02-181-0/+4
| | |
| | * fixNikolay Korolev2021-02-032-6/+6
| | |
| | * Fix compilationSergeanur2021-02-031-1/+1
| | |
| | * Merge pull request #1001 from Sergeanur/animNamesSergeanur2021-02-037-21/+21
| | |\ | | | | | | | | Use original animation names from VCS
| | | * Use original animation names from VCSSergeanur2021-01-267-21/+21
| | | |
| | * | Revert "First batch of fixes (CallAndMessage)"Filip Gawin2021-01-314-26/+7
| | | | | | | | | | | | | | | | This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe.
| | * | First batch of fixes (CallAndMessage)Filip Gawin2021-01-314-7/+26
| | | |
| | * | Some regular fixes and UB fixeserorcun2021-01-291-0/+8
| | | |
| | * | fixNikolay Korolev2021-01-281-0/+1
| | |/
| | * another backportNikolay Korolev2021-01-231-0/+2
| | |
| | * added some missing functionsNikolay Korolev2021-01-232-0/+45
| | |
| | * Peds reporting to phone changes for GTA3Derorcun2021-01-221-1/+0
| | |
| | * m_nWantedLevel -> GetWantedLevel()withmorten2021-01-227-29/+29
| | |
| | * codewarrior: finishing toucheswithmorten2021-01-213-7/+7
| | |
| | * Merge remote-tracking branch 'upstream/master' into cwwithmorten2021-01-212-5/+5
| | |\
| | | * Merge pull request #971 from Sergeanur/PoolFlagsSergeanur2021-01-201-4/+4
| | | |\ | | | | | | | | | | Get rid of bitfields in CPool
| | | | * Get rid of bitfields in CPoolSergeanur2021-01-191-4/+4
| | | | |
| | | * | Merge pull request #966 from Sergeanur/matrixSergeanur2021-01-201-1/+1
| | | |\ \ | | | | |/ | | | |/| Get rid of RwMatrix in CMatrix
| | | | * Get rid of RwMatrix in CMatrixSergeanur2021-01-181-1/+1
| | | | |
| | * | | make building with Codewarrior 7 possiblewithmorten2021-01-216-164/+164
| | |/ /
| | * | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2021-01-185-5/+6
| | |\|
| | | * Includes overhaul, fix some compiler warningserorcun2021-01-175-5/+6
| | | |
| | * | fixNikolay Korolev2021-01-181-1/+1
| | |/
| | * fixNikolay Korolev2021-01-131-1/+1
| | |
| | * more securom fixeswithmorten2021-01-132-15/+11
| | |
| | * Fix collective commandsSergeanur2021-01-121-5/+5
| | |
| | * fuckNikolay Korolev2021-01-111-1/+1
| | |
| | * fixesNikolay Korolev2021-01-111-4/+4
| | |
| | * Use original namesSergeanur2021-01-081-1/+1
| | |
| | * missing changesNikolay Korolev2021-01-076-36/+36
| | |
| | * minor refactoringNikolay Korolev2021-01-077-135/+138
| | |
| | * fixed intro text line defaultsNikolay Korolev2021-01-031-1/+2
| | |
| | * slightly better variable nameaap2021-01-021-2/+2
| | |
* | | mergeNikolay Korolev2021-08-083-27/+96
|\| |
| * | more cherry-pick fixNikolay Korolev2021-08-032-3/+7
| | |
| * | cherrypick fixesNikolay Korolev2021-08-032-14/+17
| | |
| * | move debugNikolay Korolev2021-08-032-1596/+364
| | |
| * | move debug script stuff to a separate fileNikolay Korolev2021-08-033-170/+1466
| | |
| * | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2021-08-031-1/+1
| |\ \
| | * | Add ped and car density slider to menu, remove dumb collision "optimization"erorcun2021-08-011-1/+1
| | | |
| * | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2021-08-011-1/+6
| |\| |
| * | | mission replayNikolay Korolev2021-08-017-63/+214
| | | |
* | | | lcs bridgeNikolay Korolev2021-08-086-19/+34
| | | |
* | | | disable mission replay for lcsNikolay Korolev2021-08-084-130/+76
| | | |
* | | | more cherry-pick fixNikolay Korolev2021-08-072-3/+7
| | | |
* | | | cherrypick fixesNikolay Korolev2021-08-072-14/+18
| | | |
* | | | move debugNikolay Korolev2021-08-072-1931/+674
| | | |
* | | | move debug script stuff to a separate fileNikolay Korolev2021-08-073-138/+1462
| | | |
* | | | mission replayNikolay Korolev2021-08-074-36/+165
| | | |
* | | | Merge branch 'miami' into lcsSergeanur2021-07-311-1/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/modelinfo/MloModelInfo.cpp # src/modelinfo/MloModelInfo.h # src/renderer/Renderer.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| * | | Make cars and peds to not despawn when you look awaySergeanur2021-07-311-1/+6
| |/ / | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/core/config.h # src/peds/Population.cpp
* | | Merge pull request #1255 from Nick007J/lcsSergeanur2021-07-274-24/+46
|\ \ \ | | | | | | | | low effort save support
| * | | fixNikolay Korolev2021-07-261-2/+0
| | | |
| * | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-251-1/+1
| |\ \ \
| * | | | low effort save supportNikolay Korolev2021-07-254-22/+46
| | | | |
* | | | | Merge branch 'miami' into lcsSergeanur2021-07-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Fix traffic light corona facing wrong sideSergeanur2021-07-261-1/+1
| | | |
* | | | Merge branch 'miami' into lcsSergeanur2021-07-251-1/+1
|\| | | | |/ / |/| | | | | | | | # Conflicts: # src/renderer/Hud.cpp
| * | Fix aiming with minigun and flamethrower with PC controlsSergeanur2021-07-221-1/+1
| | |
* | | friggin the rigginNikolay Korolev2021-07-251-0/+1
| | |
* | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-241-0/+3
|\ \ \
| * | | Merge branch 'miami' into lcsSergeanur2021-07-221-0/+3
| |\| |
| | * | fix garbage data written in garage save blockwithmorten2021-07-191-0/+3
| | | |
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-126-64/+231
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-07-126-64/+231
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioManager.h # src/control/Garages.cpp # src/control/Garages.h # src/control/Script5.cpp # src/core/config.h # utils/gxt/american.txt # utils/gxt/spanish.txt
| | * | finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-106-84/+251
| | | |
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-111-9/+5
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-07-081-9/+5
| |\| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua
| | * | Use CPad functions to check key states in script loaderSergeanur2021-07-081-10/+5
| | | |
| | * | fix macro redefinition warnings on win-glfw buildwithmorten2021-07-081-1/+2
| | | |
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-042-54/+60
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-07-032-54/+60
| |\| | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua
| | * | Fix use of integer in RemoveBuildingsNotInArea callSergeanur2021-07-021-1/+1
| | | |
| | * | GameLogic - type fixesSergeanur2021-07-021-7/+7
| | | |
| | * | Refactor OnscreenTimerSergeanur2021-07-021-46/+52
| | | |
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-0211-133/+160
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-06-303-23/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
| | * | rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-283-23/+23
| | | |
| * | | Fix script loadSergeanur2021-06-281-41/+57
| | | |
| * | | Merge branch 'miami' into lcsSergeanur2021-06-288-69/+80
| |\| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
| | * | Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-288-104/+127
| | | |
| | * | Fix sin & cos callsSergeanur2021-06-243-8/+8
| | | |
| | * | Use bool8 in audio codeSergeanur2021-06-244-5/+5
| | | |
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-06-263-3/+3
|\| | |
| * | | FixesSergeanur2021-06-263-3/+3
| | | |
* | | | syncNikolay Korolev2021-06-2517-72/+91
|\| | |
| * | | FixesSergeanur2021-06-242-2/+2
| | | |
| * | | Fix sin & cos callsSergeanur2021-06-243-8/+8
| | | |
| * | | Use bool8 in audio codeSergeanur2021-06-242-3/+3
| | | |
| * | | Wait states ported (scripted animations)Sergeanur2021-06-242-3/+3
| | | |
| * | | LCS sfx + mission audioSergeanur2021-06-241-4/+2
| | | |
| * | | Merge branch 'miami' into lcsSergeanur2021-05-103-10/+22
| |\| | | | | | | | | | | | | | | | | | # Conflicts: # src/core/World.cpp
| | * | Use some GetMatrix/SetMatrix logic based on SASergeanur2021-05-103-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Pickups.cpp # src/control/RoadBlocks.cpp # src/core/World.cpp # src/entities/Entity.cpp # src/objects/CutsceneHead.cpp # src/objects/Object.cpp
| * | | Merge branch 'miami' into lcsSergeanur2021-02-262-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp
| | * | nil -> falsewithmorten2021-02-191-1/+1
| | | |
| | * | Add russian supportSergeanur2021-02-181-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-1614-40/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt
| | * | failNikolay Korolev2021-02-141-2/+2
| | | |
| | * | Fix repeating pickup sound on revenue pickupSergeanur2021-02-101-3/+4
| | | |
| | * | Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanimerorcun2021-02-088-15/+28
| | |\ \
| | | * | fixNikolay Korolev2021-02-051-2/+2
| | | | |
| | | * | fixed plane AINikolay Korolev2021-02-051-1/+1
| | | | |
| | | * | fixNikolay Korolev2021-02-032-6/+6
| | | | |
| | | * | fixNikolay Korolev2021-01-301-0/+4
| | | | |
| | | * | fixNikolay Korolev2021-01-301-1/+1
| | | | |
| | | * | Even more fixes & shorten quit screenerorcun2021-01-291-0/+8
| | | | |
| | | * | Fix some UBserorcun2021-01-282-5/+5
| | | | |
| | | * | fixNikolay Korolev2021-01-281-0/+1
| | | | |
| | * | | Use original animation names from VCSSergeanur2021-01-276-24/+24
| | |/ /
* | | | botchNikolay Korolev2021-02-071-2/+0
| | | |
* | | | ferriesNikolay Korolev2021-02-073-38/+40
|/ / /
* | | fixNikolay Korolev2021-02-032-6/+6
| | |
* | | multiplayer stuffNikolay Korolev2021-01-313-33/+144
| | |
* | | garagesNikolay Korolev2021-01-305-85/+159
| | |
* | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-307-9/+11
|\ \ \
| * | | fixNikolay Korolev2021-01-301-1/+1
| | | |
| * | | fixNikolay Korolev2021-01-282-2/+3
| | | |
| * | | fixNikolay Korolev2021-01-281-0/+1
| | | |
| * | | I hate ATanOfXY pt 2Nikolay Korolev2021-01-282-4/+4
| | | |
| * | | fixNikolay Korolev2021-01-271-1/+1
| | | |
| * | | fixNikolay Korolev2021-01-271-1/+1
| | | |
* | | | stuffNikolay Korolev2021-01-302-7/+120
| | | |
* | | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-261-4/+4
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-01-261-4/+4
| |\| | | | | | | | | | | | | | | | | | * miami: Fix anim id in replay
| | * | Fix anim id in replaySergeanur2021-01-261-4/+4
| | | |
* | | | enum changeNikolay Korolev2021-01-262-4/+4
| | | |
* | | | fixNikolay Korolev2021-01-261-1/+1
| | | |
* | | | syncdNikolay Korolev2021-01-261-1/+1
| | | |
* | | | syncNikolay Korolev2021-01-265-176/+176
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-01-254-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| | * | make building with Codewarrior 7 possiblewithmorten2021-01-245-145/+145
| | | |
| | * | mission cleanup fixNikolay Korolev2021-01-231-3/+1
| | | |
| | * | another backportNikolay Korolev2021-01-231-0/+2
| | | |
| * | | Move CRunningScriptSergeanur2021-01-251-167/+167
| | | |
| * | | CVehicleModelInfoaap2021-01-241-1/+1
| | | |
* | | | garage stuffNikolay Korolev2021-01-264-50/+168
|/ / /
* | | fix merge failureNikolay Korolev2021-01-231-38/+0
| | |
* | | mission cleanup fixNikolay Korolev2021-01-231-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-01-237-45/+107
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/lcs' into lcsSergeanur2021-01-233-41/+63
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/lcs: Remove size assert Add TXD mid field Enable GTA_BRIDGE LCS model indices
| | * \ \ Merge pull request #980 from Sergeanur/lcsMIDSergeanur2021-01-233-41/+63
| | |\ \ \ | | | | | | | | | | | | LCS model indices
| | | * | | Enable GTA_BRIDGESergeanur2021-01-232-0/+21
| | | | | |
| | | * | | LCS model indicesSergeanur2021-01-231-41/+42
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-235-5/+50
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | # Conflicts: # src/modelinfo/BaseModelInfo.cpp
| | * | | added some missing functionsNikolay Korolev2021-01-232-1/+44
| | | | |
| | * | | wrong path node arrayaap2021-01-231-9/+9
| | | | |
| | * | | Includes overhaul, fix some compiler warningserorcun2021-01-234-4/+5
| | | | |
* | | | | script fixesNikolay Korolev2021-01-236-13/+18
| | | | |
* | | | | added some missing functionsNikolay Korolev2021-01-232-1/+44
|/ / / /
* | | | wrong path node arrayaap2021-01-231-9/+9
| | | |
* | | | colstore doneaap2021-01-233-2/+5
| | | |
* | | | fixNikolay Korolev2021-01-231-3/+3
| | | |
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-01-231-0/+26
|\ \ \ \
| * | | | Add (Don't) walk lightsSergeanur2021-01-231-0/+26
| | | | |
* | | | | I hate GetATanOfXYNikolay Korolev2021-01-231-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-01-231-2/+3
|\ \ \ \ | | |/ / | |/| |
| * | | cSmallHeapSergeanur2021-01-221-2/+3
| | | |
* | | | script coronasNikolay Korolev2021-01-234-12/+64
|/ / /
* | | fixNikolay Korolev2021-01-221-0/+1
| | |
* | | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-2223-84/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp
| * | get rid of most --MIAMI commentswithmorten2021-01-2221-47/+0
| | |
| * | m_nWantedLevel -> GetWantedLevel()withmorten2021-01-229-38/+38
| | |
* | | a few fixesNikolay Korolev2021-01-211-0/+4
| | |
* | | Merge branch 'lcs-dev' into lcsNikolay Korolev2021-01-203-6/+6
|\ \ \
| * | | some more scriptNikolay Korolev2021-01-203-6/+6
| | | |
* | | | syncNikolay Korolev2021-01-206-7/+43
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-01-208-8/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp
| | * | Get rid of bitfields in CPoolSergeanur2021-01-201-4/+4
| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/templates.h
| | * | Sync matrix with masterSergeanur2021-01-201-1/+1
| | | |
| | * | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2021-01-185-2/+38
| | |\ \
| | | * \ Merge pull request #960 from withmorten/miamiaap2021-01-175-2/+38
| | | |\ \ | | | | | | | | | | | | add the bad crack "features" behind SECUROM define
| | | | * | add the bad crack "features" behind SECUROM definewithmorten2021-01-145-2/+38
| | | | | |
| | * | | | fixNikolay Korolev2021-01-181-1/+1
| | |/ / /
| | * | | fixNikolay Korolev2021-01-161-0/+2
| | | | |
* | | | | script fixesNikolay Korolev2021-01-206-12/+10
| | | | |
* | | | | savesNikolay Korolev2021-01-191-3/+12
| | | | |
* | | | | fixesNikolay Korolev2021-01-194-5/+8
| | | | |
* | | | | fixesNikolay Korolev2021-01-182-13/+9
| | | | |
* | | | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-181-1/+1
|\ \ \ \ \
| * | | | | fix attemptNikolay Korolev2021-01-171-1/+1
| | | | | |
* | | | | | script fullNikolay Korolev2021-01-1817-706/+1460
|/ / / / /
* | | | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-171-1/+1
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-01-171-1/+1
| |\| | | |
| | * | | | Merge pull request #959 from Fire-Head/lcsFire_Head2021-01-161-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | Lcs Particle
| | | * \ \ \ Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-153-7/+7
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-133-23/+19
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-132-397/+395
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-1216-1915/+3197
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-121-1/+4
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/miami: bug of the decade big oof colmodel fix
| | | * | | | | | | | | lcs particleFire-Head2021-01-121-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | script until 1497Nikolay Korolev2021-01-177-789/+1066
| | | | | | | | | | | |
* | | | | | | | | | | | syncNikolay Korolev2021-01-161-0/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | fixNikolay Korolev2021-01-161-0/+2
| |/ / / / / / / / / /
* | | | | | | | | | | script7Nikolay Korolev2021-01-161-233/+275
| | | | | | | | | | |
* | | | | | | | | | | syncNikolay Korolev2021-01-162-5/+5
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'miami' into lcsSergeanur2021-01-162-15/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | | # Conflicts: # src/control/Script.h
| | * | | | | | | | consistency fixNikolay Korolev2021-01-161-2/+1
| | | | | | | | | |
| | * | | | | | | | more fixNikolay Korolev2021-01-162-16/+15
| | | | | | | | | |
| | * | | | | | | | fixNikolay2021-01-161-0/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'miami' into lcsSergeanur2021-01-152-5/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # premake5.lua # src/control/Script2.cpp # src/control/Script8.cpp
| | * | | | | | | incoming "fuck" commitNikolay Korolev2021-01-141-2/+2
| | | | | | | | |
| | * | | | | | | fixNikolay Korolev2021-01-131-4/+6
| | | | | | | | |
| | * | | | | | | fixNikolay Korolev2021-01-131-2/+2
| | | | | | | | |
* | | | | | | | | script6Nikolay Korolev2021-01-162-354/+401
| | | | | | | | |
* | | | | | | | | consistency fixNikolay Korolev2021-01-161-2/+1
| | | | | | | | |
* | | | | | | | | more fixNikolay Korolev2021-01-162-15/+15
| | | | | | | | |
* | | | | | | | | Script5.cppNikolay Korolev2021-01-165-13/+46
| | | | | | | | |
* | | | | | | | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-141-2/+2
|\| | | | | | | |
| * | | | | | | | incoming "fuck" commitNikolay Korolev2021-01-141-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | fixNikolay Korolev2021-01-132-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-133-23/+19
|\| | | | | | |
| * | | | | | | Merge branch 'miami' into lcsSergeanur2021-01-131-8/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * miami: Fix backface culling of cutscene objects more renames anim velocity union rename m_vehEnterType -> m_vehDoor Port cmake improvements to miami some loose ends move TODO to Readme Fix build without FIX_BUGS, divide to 0 fixes
| | * | | | | | rename m_vehEnterType -> m_vehDooraap2021-01-131-8/+8
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-132-15/+11
| |\| | | | | | | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/miami: more securom fixes move stuff back into class; securom comments More font fixes fix fix CreateInstance virtual overload order escalator fix ProcessWheel bug
| | * | | | | more securom fixeswithmorten2021-01-131-9/+9
| | | | | | |
| | * | | | | move stuff back into class; securom commentswithmorten2021-01-132-6/+2
| | | | | | |
| | * | | | | fixNikolay Korolev2021-01-121-2/+2
| | | |_|/ / | | |/| | |
| | * | | | big oofNikolay Korolev2021-01-121-1/+4
| | | | | |
* | | | | | some scriptNikolay Korolev2021-01-133-264/+314
|/ / / / /
* | | | | Script4.cppNikolay Korolev2021-01-122-61/+68
| | | | |
* | | | | big oofNikolay Korolev2021-01-121-1/+4
| | | | |
* | | | | script4Nikolay Korolev2021-01-121-341/+332
| |_|/ / |/| | |
* | | | Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgrSergeanur2021-01-124-22/+8
|\ \ \ \ | | | | | | | | | | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
| * | | | PLAY_ANNOUNCEMENTSergeanur2021-01-111-1/+1
| | | | |
| * | | | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bitSergeanur2021-01-114-22/+8
| | | | |
* | | | | Merge branch 'miami' into lcsSergeanur2021-01-123-5/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/control/Script3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp
| * | | | Fix collective commandsSergeanur2021-01-121-5/+5
| | | | |
| * | | | fixNikolay Korolev2021-01-111-1/+1
| | | | |
| * | | | fuckNikolay Korolev2021-01-111-1/+1
| | | | |
| * | | | fixesNikolay Korolev2021-01-112-5/+5
| | | | |
| * | | | fix pickup coronasFire-Head2021-01-101-2/+4
| | | | |
| * | | | Update command definitionsSeemann2021-01-101-7/+7
| | | | |
| * | | | moved new rendereraap2021-01-091-2/+2
| | | | |
| * | | | failNikolay2021-01-091-1/+1
| | | | |
* | | | | Merge branch 'lcs-dev' into lcsNikolay Korolev2021-01-121-1/+1
|\ \ \ \ \
| * | | | | fixNikolay Korolev2021-01-121-1/+1
| | | | | |
* | | | | | Fix collective commandsSergeanur2021-01-121-5/+5
|/ / / / /
* | | | | script3.cppNikolay Korolev2021-01-112-33/+37
| | | | |
* | | | | 500-599Nikolay Korolev2021-01-113-536/+545
| |/ / / |/| | |
* | | | script2Nikolay Korolev2021-01-112-390/+442
| | | |
* | | | script file 1 done (hopefully)Nikolay Korolev2021-01-103-329/+302
| | | |
* | | | Merge pull request #942 from majesticCoding/lcsNikolay2021-01-101-3/+3
|\ \ \ \ | | | | | | | | | | just original marker's colors
| * | | | just original marker colormajestic2021-01-091-3/+3
| | | | |
* | | | | Update command definitionsSeemann2021-01-101-6/+6
| | | | |
* | | | | can finish first missionNikolay Korolev2021-01-093-11/+27
|/ / / /
* | | | scriptNikolay Korolev2021-01-096-33/+63
| | | |
* | | | fixNikolay Korolev2021-01-091-1/+1
| | | |
* | | | more scriptNikolay Korolev2021-01-098-381/+1233
| | | |
* | | | Merge branch 'lcs' into lcs-devNikolay Korolev2021-01-084-12/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'miami' into lcsSergeanur2021-01-082-2/+2
| |\| | | | | | | | | | | | | | | | | | * miami: Use original names
| | * | Use original namesSergeanur2021-01-082-2/+2
| | | |
| * | | Merge branch 'miami' into lcsSergeanur2021-01-081-9/+9
| |\| | | | | | | | | | | | | | | | | | # Conflicts: # src/render/Timecycle.cpp
| | * | wtfNikolay Korolev2021-01-081-9/+9
| | | |
| | * | little fixesaap2021-01-081-0/+1
| | | |
| * | | Disable water creaturesSergeanur2021-01-081-1/+1
| | | |
* | | | lcs script modeNikolay Korolev2021-01-087-109/+267
| | | |
* | | | Merge branch 'lcs-dev' into lcsNikolay Korolev2021-01-085-235/+432
|\ \ \ \ | |/ / / |/| | |
| * | | more stuffNikolay Korolev2021-01-083-93/+111
| | | |
| * | | sync with upstreamNikolay Korolev2021-01-0713-218/+214
| |\ \ \
| * | | | some lcs stuffNikolay Korolev2021-01-072-28/+153
| | | | |
| * | | | reorderNikolay Korolev2021-01-031-10/+10
| | | | |
| * | | | small thingNikolay Korolev2021-01-011-0/+17
| | | | |
| * | | | Merge branch 'miami' into lcs-devNikolay Korolev2021-01-0111-77/+1114
| |\ \ \ \
| * \ \ \ \ Merge branch 'miami' into lcs-devNikolay Korolev2021-01-0134-11784/+12687
| |\ \ \ \ \
| * | | | | | lcs car ctrl 2Nikolay Korolev2020-11-163-53/+85
| | | | | | |
| * | | | | | Merge branch 'miami' into lcs-devNikolay Korolev2020-11-161-1/+2
| |\ \ \ \ \ \
| * | | | | | | lcs car ctrl 1Nikolay Korolev2020-11-162-100/+131
| | | | | | | |
* | | | | | | | fix phonesaap2021-01-081-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'miami' into lcsSergeanur2021-01-0812-225/+224
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * miami: wtf fix small cleanup Fix gOneShotCol Fix garage messages position Fix font on green screen counter Add MPG123_QUIET to mp3 files Make opus available alongside other formats Fix pickup text Fix char in stats Add missing GXT line fail minor refactoring Fix 16KHz track GET_WHEELIE_STATS fix Cleanup and fixes for new decoders Fixes for CVbFile Small fixes for new wav decoder Remove fastmath from premake's config Implementing our own WAV decoder to replace SndFile
| * | | | | | | wtfNikolay Korolev2021-01-081-1/+1
| | | | | | | |
| * | | | | | | fixNikolay Korolev2021-01-081-1/+1
| | | | | | | |
| * | | | | | | Fix garage messages positionSergeanur2021-01-071-5/+1
| | | | | | | |
| * | | | | | | Fix pickup textSergeanur2021-01-071-6/+2
| | |_|_|_|/ / | |/| | | | |
| * | | | | | failNikolay Korolev2021-01-071-11/+0
| | | | | | |
| * | | | | | minor refactoringNikolay Korolev2021-01-0710-198/+216
| | | | | | |
| * | | | | | GET_WHEELIE_STATS fixmajestic2021-01-061-3/+3
| | | | | | |
* | | | | | | first commit for LCSaap2021-01-083-36/+37
|/ / / / / /
* | | | | | fixNikolay Korolev2021-01-041-2/+1
| | | | | |
* | | | | | Fix unlimited rotation in Phnom Penh '86Sergeanur2021-01-041-1/+1
| | | | | |
* | | | | | dumbNikolay Korolev2021-01-031-2/+2
| | | | | |
* | | | | | obsolete commentNikolay Korolev2021-01-031-2/+2
| | | | | |
* | | | | | Merge pull request #916 from Sergeanur/VC/VarConsoleaap2021-01-032-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | CVarConsole
| * | | | | | CVarConsoleSergeanur2021-01-022-0/+15
| | | | | | |
* | | | | | | fixed intro text line defaultsNikolay Korolev2021-01-031-1/+2
| | | | | | |
* | | | | | | fixed array sizeNikolay Korolev2021-01-031-1/+1
| | | | | | |
* | | | | | | fixNikolay Korolev2021-01-031-0/+1
| | | | | | |
* | | | | | | slightly better variable nameaap2021-01-021-2/+2
|/ / / / / /
* | | | / / bad stuffNikolay Korolev2021-01-011-1/+0
| |_|_|/ / |/| | | |
* | | | | merge master to miamiNikolay Korolev2021-01-0111-77/+1114
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | actual struct nameNikolay Korolev2021-01-012-5/+5
| | | |
| * | | More bike leftoversSergeanur2020-12-281-2/+2
| | | |
| * | | Fix use of strncmpSergeanur2020-12-251-4/+4
| | | |
| * | | Small type use fixesSergeanur2020-12-251-1/+1
| | | |
| * | | fixNikolay Korolev2020-12-201-1/+1
| | | |
| * | | implemented collectives in scriptNikolay Korolev2020-12-205-13/+980
| | | |
| * | | Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head2020-12-1921-223/+268
| |\ \ \
| * | | | restore original code, fixes, ps2 fontFire-Head2020-12-192-8/+43
| | | | |
| * | | | Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head2020-12-0722-9038/+9503
| |\ \ \ \
| * | | | | ps2 hud, restore original codeFire-Head2020-12-073-10/+85
| | | | | |
* | | | | | fixed some bugs (saves might be broken though)Nikolay Korolev2020-12-312-6/+6
| | | | | |
* | | | | | fixed replayNikolay Korolev2020-12-261-2/+18
| | | | | |
* | | | | | Fix use of strncmpSergeanur2020-12-252-5/+6
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-12-251-1/+1
|\ \ \ \ \ \
| * | | | | | Small type use fixesSergeanur2020-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/vehicles/Cranes.cpp
* | | | | | | fix garageNikolay Korolev2020-12-251-0/+3
|/ / / / / /
* | | | | | fixed review stuffNikolay Korolev2020-12-191-7/+0
| | | | | |
* | | | | | merge attemptNikolay Korolev2020-12-199-47/+191
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-181-12/+12
| | | | | |
| * | | | | Fix placement of some script functionsSergeanur2020-12-162-141/+140
| | | | | |
| * | | | | Use SetPedStateSergeanur2020-12-152-4/+4
| | | | | |
| * | | | | Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREEshfil2020-12-141-1/+8
| | | | | | | | | | | | | | | | | | Fixes 881
| * | | | | Fix some formatting issuesSeemann2020-12-142-7/+7
| | | | | |
| * | | | | CPed::SetWeaponLockOnTargetSergeanur2020-12-141-2/+1
| | | | | |
| * | | | | removed obsolete ifdef (since we have GTA_REPLAY)Nikolay Korolev2020-12-121-2/+0
| | | | | |
| * | | | | fixed some replay bugsNikolay Korolev2020-12-123-1/+49
| | | | | |
| * | | | | fixed a bugNikolay Korolev2020-12-121-1/+5
| | | | | |
| * | | | | Merge pull request #871 from withmorten/sized-enumserorcun2020-12-0911-35/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | Get rid of sized enums
| | * | | | | don't cast script param to uint8withmorten2020-12-071-1/+1
| | | | | | |
| | * | | | | int8 enums fixedwithmorten2020-12-074-18/+18
| | | | | | |
| | * | | | | uint8 enums fixedwithmorten2020-12-078-17/+17
| | | |/ / / | | |/| | |
| * | | | | GenerateOneRandomCar cleanupSergeanur2020-12-081-10/+0
| | | | | |
| * | | | | Fix CRecordDataForChase::ShouldThisPadBeLeftAloneSergeanur2020-12-082-6/+6
| | | | | |
| * | | | | Fix wrong defineSergeanur2020-12-081-1/+1
| |/ / / /
| * | | | fixed parenthesisNikolay2020-12-061-2/+2
| | | | |
| * | | | fixed ANCHOR_BOATNikolay2020-12-051-1/+1
| | | | |
| * | | | forgot to wrap in FIX_BUGSaap2020-12-031-0/+5
| | | | |
| * | | | kludge to prevent dodo unique jumpsaap2020-12-031-1/+2
| | | | |
| * | | | Merge branch 'master' of github.com:GTAmodding/re3aap2020-12-025-16/+30
| |\ \ \ \
| | * | | | added GTA_SCENE_EDITNikolay Korolev2020-12-022-2/+4
| | | | | |
| | * | | | Add GTA_REPLAYSergeanur2020-12-013-14/+26
| | | | | |
| * | | | | better cam lod dist fixaap2020-12-021-0/+8
| |/ / / /
| * | | | Merge pull request #854 from Nick007J/masteraap2020-12-016-100/+113
| |\ \ \ \ | | | | | | | | | | | | small garages + templates revision
| | * | | | small garages revision + small template stuffNikolay Korolev2020-11-306-100/+113
| | | | | |
| * | | | | GTA_VERSION define and some config.h cleanupaap2020-11-293-3/+3
| |/ / / /
| * | | | fix garagesNikolay Korolev2020-11-271-5/+5
| | | | |
| * | | | Script commands split to original filesSergeanur2020-11-247-8912/+9038
| | | | |
| * | | | Add some TODO stubs for unused code to be reversedSergeanur2020-11-232-0/+140
| | | | |
| * | | | one more fixNikolay2020-11-221-1/+1
| | | | |
| * | | | small improvementNikolay2020-11-221-1/+1
| | | | |
| * | | | Merge pull request #823 from aap/masteraap2020-11-221-0/+10
| |\ \ \ \ | | | | | | | | | | | | Neo screen droplets
| | * | | | neo screen dropletsaap2020-11-191-0/+10
| | | | | |
| * | | | | Reorganize CPed functions into their original cpp filesSergeanur2020-11-191-0/+82
| |/ / / /
| * | | | Merge pull request #820 from withmorten/mission-switchererorcun2020-11-172-0/+48
| |\ \ \ \ | | | | | | | | | | | | add mission switcher from miami
| | * | | | add mission switcher from miamiwithmorten2020-11-162-0/+48
| | | | | |
| * | | | | Add debug code to CPathFind::PreparePathDataForTypeSergeanur2020-11-161-0/+16
| | | | | |
| * | | | | small fixNikolay2020-11-161-1/+1
| |/ / / /
| * | | | Font: Hud: Use orig. text dimensions, fix right-align calculationserorcun2020-11-092-3/+3
| | | | |
| * | | | Revert "Font: Fix text dimensions"erorcun2020-11-082-3/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 6729de49b16da9a1be3c95b146ba053bf214c91c.
| * | | | remove autosave at end of mission under MISSION_REPLAYNikolay Korolev2020-11-011-0/+2
| |/ / /
| * | | Font: Fix text dimensionserorcun2020-10-252-3/+3
| | | |
| * | | Use audio enumSergeanur2020-10-231-2/+2
| | | |
| * | | Pickup fixesSergeanur2020-10-212-24/+35
| | | |
* | | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-12-184-153/+153
|\ \ \ \
| * | | | PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-182-13/+13
| | | | |
| * | | | Fix placement of some script functionsSergeanur2020-12-162-140/+140
| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script5.cpp
* | | | | little cleanup and synch on templates and configaap2020-12-181-1/+2
|/ / / /
* | | | More fixesSergeanur2020-12-151-3/+0
| | | |
* | | | SetPedState fixesSergeanur2020-12-152-4/+4
| | | |
* | | | better fixNikolay Korolev2020-12-121-2/+4
| | | |
* | | | fixed a bugNikolay Korolev2020-12-121-1/+5
| | | |
* | | | fixed garages + minor fixesNikolay Korolev2020-12-124-4/+44
| | | |
* | | | Merge pull request #869 from Nick007J/miamiaap2020-12-095-142/+212
|\ \ \ \ | | | | | | | | | | garages revision + fixes
| * \ \ \ sync with upstreamNikolay Korolev2020-12-083-12/+6
| |\ \ \ \
| * | | | | pool stuff fixNikolay Korolev2020-12-063-9/+9
| | | | | |
| * | | | | quick fixNikolay Korolev2020-12-061-1/+2
| | | | | |
| * | | | | garages revision + some fixesNikolay Korolev2020-12-065-157/+213
| | | | | |
* | | | | | Merge pull request #872 from withmorten/sized-enums-miamierorcun2020-12-0914-41/+41
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Get rid of sized enums 2: Electric Boogaloo
| * | | | | uint8 enums fixedwithmorten2020-12-0711-23/+23
| | | | | |
| * | | | | int8 enums fixedwithmorten2020-12-074-18/+18
| |/ / / /
* | | | | Pool fixes from masterSergeanur2020-12-084-11/+11
| | | | |
* | | | | FixesSergeanur2020-12-084-26/+7
|/ / / /
* | | | lil fixNikolay Korolev2020-12-051-1/+1
| | | |
* | | | script from other platforms and unused commandsNikolay Korolev2020-12-054-1/+322
| | | |
* | | | Merge pull request #853 from erorcun/miamierorcun2020-12-021-5/+1
|\ \ \ \ | | | | | | | | | | PlayerPed and "Redefine controls" menu done, fixes
| * | | | PlayerPed and "Redefine controls" menu done, fixeserorcun2020-12-021-5/+1
| | | | |
* | | | | cam lod dist fixaap2020-12-021-0/+8
| | | | |
* | | | | Add GTA_REPLAYSergeanur2020-12-013-15/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Replay.cpp # src/control/Replay.h
* | | | some nasty FIX_BUGS for SLIDE_OBJECTNikolay Korolev2020-11-281-3/+24
| | | |
* | | | Update Script.cppZach Charo2020-11-281-1/+1
| | | | | | | | | | | | Case sensitivity fix. Causes compile issue on linux.
* | | | Some TODOs done in Peds codeSergeanur2020-11-251-10/+4
| | | |
* | | | Script commands split to original filesSergeanur2020-11-249-11507/+11697
| | | |
* | | | Darkel doneSergeanur2020-11-221-2/+2
| | | |
* | | | one more fixNikolay2020-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Restart.cpp
* | | | small improvementNikolay2020-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Restart.cpp
* | | | Merge pull request #825 from aap/miamiaap2020-11-221-0/+10
|\ \ \ \ | | | | | | | | | | neo screen droplets
| * | | | neo screen dropletsaap2020-11-191-0/+10
| | |_|/ | |/| |
* / | | Reorganize CPed functions into their original cpp filesSergeanur2020-11-201-0/+99
|/ / /
* | | small fix of fixNikolay Korolev2020-11-161-0/+1
| | |
* | | small fixNikolay Korolev2020-11-161-1/+1
| |/ |/|
* | car AI revisionNikolay Korolev2020-11-142-14/+16
| |
* | small fixNikolay Korolev2020-11-131-2/+2
| |
* | fixNikolay Korolev2020-11-131-1/+1
| |
* | damnNikolay2020-11-111-1/+1
| |
* | Update src/control/Pickups.cppNikolay2020-11-111-1/+1
| | | | | | Co-authored-by: Sergeanur <s.anureev@yandex.ua>
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-11-104-7/+9
|\ \
| * \ Merge pull request #771 from theR4K/miamiDevSergeanur2020-11-101-0/+1
| |\ \ | | | | | | | | more audio for god of audio
| | * | pointers into referencies!Roman Masanin2020-11-081-1/+1
| | | |
| | * | merge upstreamRoman Masanin2020-11-084-18/+28
| | |\ \
| | * \ \ Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDevRoman Masanin2020-11-012-9/+31
| | |\ \ \
| | * \ \ \ Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDevRoman Masanin2020-10-242-111/+198
| | |\ \ \ \
| | * \ \ \ \ merge UpstreamRoman Masanin2020-10-2421-885/+1139
| | |\ \ \ \ \
| | * | | | | | pedsRoman Masanin2020-10-181-0/+1
| | | | | | | |
| * | | | | | | Pickup fixSergeanur2020-11-081-1/+1
| | | | | | | |
| * | | | | | | Font: Hud: Use orig. text dimensions, fix right-align calculationserorcun2020-11-082-3/+3
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Pickups fixSergeanur2020-11-081-3/+4
| | | | | | |
* | | | | | | CWorld doneNikolay Korolev2020-11-102-0/+15
|/ / / / / /
* | | | | | fixesNikolay Korolev2020-11-021-1/+1
| | | | | |
* | | | | | embarassingNikolay Korolev2020-11-021-2/+2
| | | | | |
* | | | | | fixNikolay Korolev2020-11-021-0/+4
| | | | | |
* | | | | | finished script and replayNikolay Korolev2020-11-013-12/+17
| |_|_|/ / |/| | | |
* | | | | fixed KYFCNikolay Korolev2020-11-011-5/+25
| | | | |
* | | | | overflow fixNikolay Korolev2020-11-011-2/+2
| | | | |
* | | | | Fix undefined colorId for pickupsSergeanur2020-10-261-2/+4
| |_|/ / |/| | |
* | | | Merge pull request #779 from Sergeanur/VC/Pickupserorcun2020-10-242-111/+198
|\ \ \ \ | |_|/ / |/| | | Pickups Done
| * | | Rename CObject flagSergeanur2020-10-211-3/+3
| | | |
| * | | Pickups DoneSergeanur2020-10-212-109/+196
| | | |
* | | | ScriptSoundsSergeanur2020-10-231-19/+13
|/ / /
* | | Messages, fix Fonterorcun2020-10-201-0/+2
| | |
* | | fixNikolay Korolev2020-10-181-1/+1
| | |
* | | fixNikolay Korolev2020-10-181-1/+1
| | |
* | | Merge pull request #769 from Sergeanur/VC/Pickupserorcun2020-10-182-438/+415
|\ \ \ | | | | | | | | Partial Pickups
| * \ \ Merge branch 'miami' into VC/PickupsSergeanur2020-10-183-10/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Pickups.cpp
| * \ \ \ Merge remote-tracking branch 'origin/miami' into VC/PickupsSergeanur2020-10-182-3/+3
| |\ \ \ \
| * | | | | Pickup arrays doneSergeanur2020-10-172-12/+24
| | | | | |
| * | | | | Pickup save/loadSergeanur2020-10-171-5/+17
| | | | | |
| * | | | | Small inner fixSergeanur2020-10-171-2/+8
| | | | | |
| * | | | | More Pickup stuffSergeanur2020-10-172-141/+228
| | | | | |
| * | | | | Partial PickupsSergeanur2020-10-172-296/+156
| | | | | |
* | | | | | 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-1820-412/+697
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'master' into miamiSergeanur2020-10-183-18/+17
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-182-6/+6
| | | | | |
| | * | | | Script.cpp missing breaksshfil2020-10-181-0/+2
| | | | | |
| | * | | | Fix pickup fix :PSergeanur2020-10-171-3/+3
| | | | | |
| | * | | | Pickup fixesSergeanur2020-10-171-7/+6
| | | | | |
| | * | | | Pickup fixSergeanur2020-10-141-4/+4
| | | | | |
| * | | | | Script.cpp missing breaksshfil2020-10-181-0/+2
| | |_|_|/ | |/| | |
| * | | | Merge pull request #765 from erorcun/miamierorcun2020-10-171-2/+2
| |\ \ \ \ | | | | | | | | | | | | Radar, WaterCannon, win/glfw skels
| | * | | | Radar, WaterCannon, win/glfw skelseray orçunus2020-10-171-2/+2
| | | |_|/ | | |/| |
| | * | | Merge pull request #762 from Nick007J/miamierorcun2020-10-1217-392/+676
| | |\ \ \ | | | |_|/ | | |/| | Control update
| * | | | small fixNikolay Korolev2020-10-171-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-10-121-1/+2
| |\| | | | | |/ / | |/| |
| * | | sync with upstreamNikolay Korolev2020-10-122-90/+80
| |\ \ \
| * | | | fixNikolay Korolev2020-10-111-1/+1
| | | | |
| * | | | small fixNikolay Korolev2020-10-111-4/+4
| | | | |
| * | | | small fixNikolay Korolev2020-10-111-1/+1
| | | | |
| * | | | removed extra headerNikolay Korolev2020-10-111-3/+0
| | | | |
| * | | | sync with upstreamNikolay Korolev2020-10-112-1/+21
| |\ \ \ \
| * | | | | Control updatesNikolay Korolev2020-10-1119-452/+764
| | | | | |
* | | | | | fix bullet traces rener and some renamingRoman Masanin2020-10-151-8/+4
| | | | | |
* | | | | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiRoman Masanin2020-10-126-85/+121
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #753 from majesticCoding/miamierorcun2020-10-121-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | CWaterCreatures
| | * | | | CWaterCreaturesmajestic2020-10-111-1/+2
| | |/ / /
| * | | | Merge pull request #758 from erorcun/miamierorcun2020-10-122-82/+93
| |\ \ \ \ | | |_|/ / | |/| | | Hud, Fire, OnscreenBlaBla
| | * | | Hud, Fire, OnscreenBlaBlaeray orçunus2020-10-122-82/+93
| | |/ /
| * | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-10-112-1/+25
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # gamefiles/TEXT/american.gxt # premake5.lua # src/audio/MusicManager.cpp # src/control/Darkel.cpp # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/Frontend.cpp # src/core/Game.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/extras/frontendoption.cpp # src/extras/frontendoption.h # src/render/Hud.cpp # src/skel/glfw/glfw.cpp # src/vehicles/CarGen.cpp # src/vehicles/Vehicle.cpp # src/weapons/WeaponInfo.cpp # utils/gxt/american.txt
| | * Merge branch 'master' of https://github.com/GTAmodding/re3eray orçunus2020-10-051-0/+24
| | |\
| | | * fixed darkel/replayNikolay Korolev2020-10-051-0/+24
| | | |
| | * | Fix some sanitizer errors, improve POSIX streamereray orçunus2020-10-041-1/+1
| | |/
| | * small fixNikolay Korolev2020-10-031-1/+1
| | |
| | * fixed bad bugNikolay Korolev2020-09-301-13/+13
| | |
| | * bug fixedNikolay Korolev2020-09-261-1/+1
| | |
| | * fixed replay bugNikolay Korolev2020-09-261-8/+8
| | |
| | * silentpatch fixesNikolay Korolev2020-09-261-0/+6
| | |
| | * Move a bunch of math to cpp files + small fixesSergeanur2020-09-141-7/+7
| | |
| | * Fixes from miamieray orçunus2020-09-102-4/+4
| | |
| * | Merge branch 'miami' of https://github.com/GTAmodding/re3 into neweray orçunus2020-10-081-1/+1
| |\ \
| * | | Fix some sanitizer errors, improve POSIX streamereray orçunus2020-10-081-1/+1
| | | |
* | | | SpecialFX almost doneRoman Masanin2020-10-111-4/+4
| | | |
* | | | CSpecialFX and some other classesRoman Masanin2020-10-091-5/+4
| |/ / |/| |
* | | Pad, BulletInfo, ProjectileInfo, fixeseray orçunus2020-10-071-1/+1
|/ /
* | Merge pull request #731 from erorcun/miamierorcun2020-10-024-4/+7
|\ \ | | | | | | Population done, mouse AUX buttons, Frontend, Hud, fixes
| * \ Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-09-305-143/+546
| |\ \
| * | | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-304-4/+7
| | | |
* | | | fixed bad bugNikolay Korolev2020-09-301-13/+13
| |/ / |/| |
* | | some SilentPatch fixesshfil2020-09-301-0/+6
| | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Camera.cpp # src/weapons/Weapon.cpp
* | | Merge pull request #718 from Nick007J/miamierorcun2020-09-294-143/+540
|\ \ \ | |/ / |/| | VC replays
| * | now fixed properlyNikolay Korolev2020-09-261-5/+1
| | |
| * | fixed tabsNikolay Korolev2020-09-261-3/+3
| | |
| * | VC replaysNikolay Korolev2020-09-264-139/+540
| | |
* | | Credits & fixeseray orçunus2020-09-273-2/+16
|/ /
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-09-132-7/+7
|\ \
| * \ Merge pull request #702 from Sergeanur/VC/MusicManagerSergeanur2020-09-132-7/+7
| |\ \ | | | | | | | | cMusicManager, cDMAudio, radio position save/load, a few commands imp…
| | * | cMusicManager, cDMAudio, radio position save/load, a few commands implementedSergeanur2020-09-092-7/+7
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-09-114-1/+20
|\| | |
| * | | Merge pull request #701 from erorcun/miamierorcun2020-09-101-1/+1
| |\ \ \ | | | | | | | | | | Peds objectives and wait states done, fixes
| | * | | Peds objectives and wait states done, fixeseray orçunus2020-09-051-1/+1
| | |/ /
| * | | Merge pull request #698 from majesticCoding/miamierorcun2020-09-062-0/+16
| |\ \ \ | | |/ / | |/| | cheats, fixes, cosmetic changes
| | * | cheats, fixes, cosmetic changesmajestic2020-09-012-0/+16
| | | |
| * | | Merge pull request #699 from Nick007J/miamiaap2020-09-012-1/+2
| |\ \ \ | | | | | | | | | | small script fix
| * \ \ \ Merge pull request #696 from Fire-Head/miamiaap2020-09-011-0/+3
| |\ \ \ \ | | |_|/ / | |/| | | Miami Weapon, WeaponEffects done
| | * | | Merge pull request #1 from GTAmodding/miamiFire_Head2020-08-2711-195/+326
| | |\ \ \ | | | | | | | | | | | | Miami
| | * | | | weaponsFire-Head2020-08-271-0/+3
| | | | | |
* | | | | | fixesNikolay Korolev2020-09-022-3/+6
| |_|_|/ / |/| | | |
* | | | | more fixNikolay Korolev2020-08-311-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-08-303-9/+9
|\| | | |
| * | | | CGame done, Peds, fixeseray orçunus2020-08-303-9/+9
| | |/ / | |/| |
* / | | script inaccuracyNikolay Korolev2020-08-301-0/+1
|/ / /
* | | Merge pull request #694 from Sergeanur/miami_CutsceneMgraap2020-08-242-5/+11
|\ \ \ | | | | | | | | CutsceneMgr done
| * | | CutsceneMgr doneSergeanur2020-08-242-5/+11
| | | |
* | | | FixSergeanur2020-08-242-3/+3
| | | |
* | | | Remote doneSergeanur2020-08-242-7/+16
|/ / /
* | | fixed a few embarassing mistakesNikolay Korolev2020-08-231-4/+7
| | |
* | | call streaming funcsaap2020-08-212-3/+2
| | |
* | | CStreaming done, hopefullyaap2020-08-201-1/+1
| | |
* | | Merge pull request #693 from majesticCoding/miamiaap2020-08-202-9/+19
|\ \ \ | | | | | | | | stable CScriptPaths
| * | | stable CScriptPathsmajestic2020-08-202-9/+19
| | | |
* | | | 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-193-102/+173
|\ \ \ \ | | |/ / | |/| | | | | | | | | | # 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-163-102/+173
| | | | |
* | | | | Merge branch 'master' into miamiSergeanur2020-08-193-24/+51
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | | Added bug fix to fix mission related crashesJack Powell2020-08-181-0/+4
| | | |
| * | | CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLEJack Powell2020-08-181-1/+1
| | | |
| * | | Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInsideJack Powell2020-08-181-1/+1
| | | |
| * | | fixed bugfixNikolay Korolev2020-08-181-1/+2
| | | |
| * | | Island loading and PS2 alpha test added to optionsSergeanur2020-08-162-22/+46
| | | |
* | | | 2 new opcodeseray orçunus2020-08-161-4/+7
| |/ / |/| |
* | | Merge branch 'master' into miamiSergeanur2020-08-152-6/+6
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Darkel.cpp # src/core/main.cpp
| * | Darkel fixesSergeanur2020-08-142-8/+14
| | |
* | | 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-142-19/+27
| | |
* | | timecycle doneaap2020-08-091-2/+2
| |/ |/|
* | 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-031-0/+4
| | | | | | | | Fixes are already in miami
* | new opcodes, buyable properties, minor fixeseray orçunus2020-07-303-24/+151
| |
* | Merge branch 'master' into miamiSergeanur2020-07-291-24/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/RpAnimBlend.cpp # src/audio/oal/stream.cpp # src/audio/sampman.h # src/control/Pickups.cpp # src/core/Collision.cpp # src/core/Collision.h # src/core/FileLoader.cpp # src/core/FileMgr.cpp # src/core/FileMgr.h # src/core/Streaming.cpp # src/core/Streaming.h # src/core/SurfaceTable.h # src/modelinfo/VehicleModelInfo.h # src/peds/Ped.cpp # src/rw/RwHelper.cpp # src/rw/RwHelper.h # src/skel/glfw/glfw.cpp # src/skel/platform.h # src/text/Text.cpp # src/text/Text.h # src/vehicles/CarGen.cpp # src/vehicles/Heli.cpp
| * The real pickup reflection fixSergeanur2020-07-291-24/+9
| |
| * 90% fixes, 10% skel refactoringeray orçunus2020-07-241-0/+3
| |
| * 64-bit on Windowseray orçunus2020-07-221-2/+2
| |
| * Fixes from miamieray orçunus2020-07-201-30/+20
| |
* | 90% fixes, 10% skel refactoringeray orçunus2020-07-241-0/+3
| |
* | 64-bit on Windowseray orçunus2020-07-241-2/+2
| |
* | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-222-25/+16
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-181-2/+2
|\|
| * fixNikolay Korolev2020-07-181-2/+2
| |
| * Add audio cache for faster initializationSergeanur2020-07-171-0/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-07-161-3/+3
|\|
| * Fix CCarStateEachFrameSergeanur2020-07-161-3/+3
| |
* | Merge branch 'master' into miamiSergeanur2020-07-135-17/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-19/+19
| |
| * 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-035-15/+15
| |/
| * Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixeseray orçunus2020-07-021-1/+1
| |
| * copypaste bugNikolay Korolev2020-07-011-1/+0
| |
| * Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)erorcun2020-07-014-16/+89
| |
| * little fixNikolay Korolev2020-07-011-1/+2
| |
* | Merge pull request #654 from erorcun/miamierorcun2020-07-094-33/+27
|\ \ | | | | | | VC fighting, Peds, many fixes including ghost bikes
| * | VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-094-33/+27
| | |
* | | CDarkel miami hud colors.Dominik2020-07-071-2/+3
|/ /
* | Noskillx's PR + fix .set loadingeray orçunus2020-07-062-2/+3
| |
* | fixes from master, menu helper texteray orçunus2020-07-041-1/+1
| |
* | Merge pull request #648 from Nick007J/miamiaap2020-07-042-9/+60
|\ \ | | | | | | ice cream attractor + bike respray
| * | ice cream attractor + bike resprayNikolay Korolev2020-07-032-9/+60
| | |
* | | 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-012-889/+1165
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-295-405/+1831
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Merge branch 'master' into ps2menuFire_Head2020-06-299-510/+2177
| |\
| | * 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-212-5/+5
| | |
| | * copypasteNikolay Korolev2020-06-211-1/+1
| | |
| | * script loggingNikolay Korolev2020-06-213-28/+1441
| | |
| | * minor fixNikolay Korolev2020-06-121-1/+1
| | |
| | * fixesNikolay Korolev2020-06-082-7/+9
| | |
| | * fixed some arithmeticNikolay Korolev2020-06-071-16/+32
| | |
| | * Revert "FONT_BANK renamed to FONT_STANDARD"Fire-Head2020-06-075-8/+8
| | | | | | | | | | | | This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e.
| * | mips overdoseFire-Head2020-06-272-4/+4
| | |
* | | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-228-49/+28
| | |
* | | fixNikolay Korolev2020-06-201-1/+0
| | |
* | | fixNikolay Korolev2020-06-201-0/+1
| | |
* | | bikes in garages + bugfixNikolay Korolev2020-06-172-3/+10
| | |
* | | Ped, Weapon and fixeseray orçunus2020-06-172-3/+7
| | |
* | | fix crash-VC pickup scalingeray orçunus2020-06-161-6/+9
| | |
* | | some cutscene opcodes and heli gunseray orçunus2020-06-162-39/+57
| | |
* | | 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-18 19:49:26 +0100