summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-2011-0/+45
|\
| * update librw (matfx)aap2020-04-202-0/+8
| * Merge pull request #480 from Fire-Head/masterFire_Head2020-04-202-0/+29
| |\
| | * camerapickup ps2 codeFire-Head2020-04-202-0/+29
| * | Merge pull request #479 from Fire-Head/masterFire_Head2020-04-202-0/+8
| |\|
| | * beta OddJob(unique jump etc) sliding textFire-Head2020-04-202-0/+8
| * | Merge pull request #478 from Fire-Head/masterFire_Head2020-04-206-0/+0
| |\|
| | * rem english.gxtFire-Head2020-04-201-0/+0
| | * fixed missing keys in gxt for PL/RU langsFire-Head2020-04-207-0/+0
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-2010-5/+84
|\| |
| * | Fix CPickups::GenerateNewOne loopSergeanur2020-04-191-1/+1
| * | Merge pull request #476 from Fire-Head/masterFire_Head2020-04-1910-5/+84
| |\|
| | * MenuScreens.h fixFire-Head2020-04-191-1/+1
| | * MenuScreens.h fixFire-Head2020-04-191-1/+1
| | * Add polish lang supportFire-Head2020-04-1910-3/+82
| |/
* | fixesNikolay Korolev2020-04-205-8/+6
* | sync with masterNikolay Korolev2020-04-1928-85/+104
|\|
| * Merge pull request #474 from Nick007J/mastererorcun2020-04-1912-96/+200
| |\
| * \ Merge pull request #475 from erorcun/erorcunerorcun2020-04-1927-80/+93
| |\ \
| | * | Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-1927-80/+93
| * | | Fix savename buffer overflowSergeanur2020-04-181-4/+12
| |/ /
* | / 1.1 patch stuffNikolay Korolev2020-04-1913-2/+109
| |/ |/|
* | missing ifdedNikolay Korolev2020-04-191-0/+2
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-187-18/+45
|\|
| * slider fixeray orçunus2020-04-181-3/+2
| * RpClumpRemoveAtomic updateeray orçunus2020-04-181-1/+1
| * Merge pull request #472 from gennariarmando/mastererorcun2020-04-183-3/+15
| |\
| | * Hide Vehicle/Zone name during Wasted/Busted...gennariarmando2020-04-183-3/+15
| * | Merge pull request #473 from erorcun/erorcunerorcun2020-04-184-11/+27
| |\ \ | | |/ | |/|
| | * submodule updateeray orçunus2020-04-181-0/+0
| | * Vc ped ports and Frontend fixeseray orçunus2020-04-183-11/+27
| |/
* / replays bug fixNikolay Korolev2020-04-1812-96/+198
|/
* Changed extraOffset value.gennariarmando2020-04-181-1/+1
* Merge pull request #464 from gennariarmando/mastererorcun2020-04-182-38/+31
|\
| * Fixed menu radio icons.gennariarmando2020-04-182-44/+44
* | premake cleanupSergeanur2020-04-181-31/+20
* | Merge pull request #467 from Nick007J/masterNikolay Korolev2020-04-182-1/+8
|\ \
| * | bug fixesNikolay Korolev2020-04-182-1/+8
|/ /
* | Revert "Part one"Filip Gawin2020-04-1819-172/+230
* | Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-182-0/+2
|\ \
| * \ Merge pull request #466 from ThirteenAG/masterSergeanur2020-04-182-0/+2
| |\ \
| | * | librw compilation in prebuild event of reIIIThirteenAG2020-04-182-0/+2
* | | | Fix crash in cAudioManager::ServicePoliceRadioFilip Gawin2020-04-181-4/+8
* | | | Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-1832-478/+212
|\| | |
| * | | Zones save/loadSergeanur2020-04-181-192/+87
| * | | Remove padding fieldsSergeanur2020-04-1821-188/+94
| |/ /
| * | Merge pull request #465 from erorcun/erorcunerorcun2020-04-185-12/+17
| |\ \
| | * | Various fixeseray orçunus2020-04-185-12/+17
| |/ /
| * | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-171-0/+0
| |\ \
| | * | librw updateSergeanur2020-04-171-0/+0
| * | | implemented librw alphatest settingaap2020-04-171-1/+2
| |/ /
| * | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-173-62/+19
| |\|
| | * premake fixesSergeanur2020-04-171-5/+7
| | * Use LIBRW env var it it's setSergeanur2020-04-171-3/+3
| | * We don't need rw.cpp anymoreSergeanur2020-04-171-40/+0
| * | fixed raster from image conversionaap2020-04-171-37/+2
* | | Part oneFilip Gawin2020-04-1719-230/+172
| |/ |/|
* | Update README.mderorcun2020-04-171-11/+7
* | Update linksSergeanur2020-04-172-3/+2
|/
* Remove CWorld from READMESergeanur2020-04-171-4/+0
* Merge pull request #460 from Sergeanur/StandaloneSergeanur2020-04-17229-6609/+3091
|\
| * appveyor setupSergeanur2020-04-171-29/+8
| * Merge remote-tracking branch 'origin/master' into StandaloneSergeanur2020-04-173-6/+22
| |\ | |/ |/|
* | implemented CVector2D::NormaliseSafe for SkidMarksaap2020-04-173-6/+22
| * Remove patchesSergeanur2020-04-17174-4689/+244
| * Merge remote-tracking branch 'samler/world' into StandaloneSergeanur2020-04-171-8/+10
| |\
| | * Fix CWorld::FindObjectsOfTypeInRangeSectorList bugsaml1er2020-04-171-8/+10
| | |
| | \
| *-. | Merge remote-tracking branches 'origin/master' and 'samler/world' into StandaloneSergeanur2020-04-173-1100/+1127
| |\ \| | |/ / |/| |
| | * Apply clang format to CWorldsaml1er2020-04-171-938/+1031
| | * CWorld fixessaml1er2020-04-171-220/+151
* | | librw submoduleSergey P2020-04-172-0/+3
| * | Merge remote-tracking branch 'Fire-Head/master' into StandaloneSergeanur2020-04-17129-1395/+1346
| |\ \
| | * | rem refsFire-Head2020-04-17139-1430/+1380
| * | | Merge remote-tracking branch 'samler/world' into StandaloneSergeanur2020-04-179-39/+1010
|/| | | | | |/ | |/|
| * | More CWorld fixessaml1er2020-04-173-27/+27
| * | Fix CWorld::RepositionOneObject bugssaml1er2020-04-171-16/+45
| * | CWorld completesaml1er2020-04-173-23/+133
| * | Merge branch 'master' into worldsaml1er2020-04-16113-607/+6781
| |\ \
| * | | Reverse CWorldsaml1er2020-04-168-34/+867
* | | | Merge pull request #458 from erorcun/erorcunerorcun2020-04-1712-67/+102
|\ \ \ \ | |_|_|/ |/| | |
| * | | Ped fixes and ref removaleray orçunus2020-04-1712-67/+102
|/ / /
* | | Merge pull request #455 from erorcun/erorcunerorcun2020-04-1618-142/+167
|\ \ \ | |_|/ |/| |
| * | Some refs removed, little fixes and teleporteray orçunus2020-04-1618-142/+167
|/ /
* | More refs removedSergeanur2020-04-1619-91/+90
* | add textures in correct orderaap2020-04-161-1/+1
* | Merge pull request #448 from Nick007J/masterSergeanur2020-04-163-7/+276
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-168-18/+16
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-167-7/+61
| |\ \ \
| * \ \ \ merge readmesNikolay Korolev2020-04-151-2/+0
| |\ \ \ \
| * | | | | Update README.mdNikolay Korolev2020-04-151-1/+0
| * | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-151-2/+2
| |\ \ \ \ \
| * | | | | | vs botchNikolay Korolev2020-04-151-11/+11
| * | | | | | definition fixNikolay Korolev2020-04-151-1/+1
| * | | | | | anim fixNikolay Korolev2020-04-151-2/+2
| * | | | | | sync with masterNikolay Korolev2020-04-1541-244/+2744
| |\ \ \ \ \ \
| * | | | | | | fixNikolay Korolev2020-04-151-1/+9
| * | | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-151-0/+1
| |\ \ \ \ \ \ \
| * | | | | | | | bullet infoNikolay Korolev2020-04-154-1/+283
* | | | | | | | | Increase alpha entity list capacity for wide screenSergeanur2020-04-162-3/+9
* | | | | | | | | More refs removedSergeanur2020-04-1621-116/+118
* | | | | | | | | first fake RW implementation workingaap2020-04-166-34/+62
* | | | | | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-1621-99/+117
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #453 from Fire-Head/masterFire_Head2020-04-162-69/+33
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Removed refs from sampmanFire-Head2020-04-162-69/+33
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #451 from erorcun/erorcunerorcun2020-04-163-1/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Various fixeseray orçunus2020-04-163-1/+5
| |/ / / / / / / /
| * | | | | | | | Fixed bridge despawnsNikolay Korolev2020-04-161-6/+6
| * | | | | | | | Removed refs from weapons/, WeaponEffects movedSergeanur2020-04-166-8/+8
| * | | | | | | | Fix misplaced targetingSergeanur2020-04-161-4/+2
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | fix Bait crashNikolay Korolev2020-04-161-1/+1
| * | | | | | | Default native resolution mode and small camera fixesSergeanur2020-04-156-6/+60
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Update README.mdNikolay Korolev2020-04-151-2/+0
| | |_|_|/ / | |/| | | |
| * | | | | fix script crashNikolay Korolev2020-04-151-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-1543-250/+3935
|\| | | |
| * | | | Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-1522-57/+2328
| |\ \ \ \
| | * | | | fixed crashFire-Head2020-04-151-1/+1
| | * | | | fixed uzi/ak47/m16 traceFire-Head2020-04-151-1/+1
| | * | | | rem commentFire-Head2020-04-151-1/+1
| | * | | | glass NULL->nilFire-Head2020-04-151-8/+8
| | * | | | 'fix' fixFire-Head2020-04-151-16/+15
| | * | | | weapon cosmetic fixFire-Head2020-04-151-483/+484
| | * | | | Update Weapon.cppFire_Head2020-04-151-1/+1
| | * | | | CWeapon done, ps2 cheats fixFire-Head2020-04-1522-57/+2328
| * | | | | Merge pull request #429 from Nick007J/masterNikolay Korolev2020-04-155-17/+1185
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-151-0/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | fixNikolay Korolev2020-04-141-1/+1
| | * | | | fix debug stuffNikolay Korolev2020-04-142-3/+2
| | * | | | Merge branch 'master' into game_devNikolay Korolev2020-04-1421-1925/+3366
| | |\ \ \ \
| | * | | | | scene editNikolay Korolev2020-04-141-2/+6
| | * | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-1431-258/+1782
| | |\ \ \ \ \
| | * | | | | | scene editNikolay Korolev2020-04-135-25/+806
| | * | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-1247-1098/+2970
| | |\ \ \ \ \ \
| | * | | | | | | scene initNikolay Korolev2020-04-123-15/+399
| * | | | | | | | Merge pull request #447 from erorcun/erorcunerorcun2020-04-151-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Readme updateeray orçunus2020-04-151-1/+0
| |/ / / / / / / /
| * | | | | | | | Merge pull request #416 from saml1er/PedPatherorcun2020-04-152-7/+229
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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-1518-158/+175
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Many fixes and cleanuperay orçunus2020-04-1518-158/+175
| * | | | | | | | | | fixed bug and weirdness in CHeliaap2020-04-151-0/+8
| * | | | | | | | | | fixed clouds and spritesaap2020-04-152-10/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* / | | | | | | | | implemented most of librw wrapperaap2020-04-1522-44/+2212
|/ / / / / / / / /
* | | | | | | | | Merge pull request #435 from GTAmodding/appveyorFilip Gawin2020-04-152-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Update premake5.luaFilip Gawin2020-04-151-1/+2
| * | | | | | | | Collect pdb file on CIFilip Gawin2020-04-151-0/+2
|/ / / / / / / /
* | | | | | / / fixed crashNikolay Korolev2020-04-141-0/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | RwMatFX support with linked RW libsSergeanur2020-04-141-0/+13
|/ / / / / /
* | | | | | fix CTheCarGenerators::SaveAllCarGeneratorsSergeanur2020-04-141-1/+1
* | | | | | Added missing audio ctorsSergeanur2020-04-144-28/+65
* | | | | | Merge pull request #414 from ShFil119/audio17Filip Gawin2020-04-143-1647/+2968
|\ \ \ \ \ \
| * | | | | | Cleanup cAudioManager::ProcessRainOnVehicle a bitFilip Gawin2020-04-131-7/+3
| * | | | | | Update readmeFilip Gawin2020-04-131-1/+0
| * | | | | | Finish audio codeFilip Gawin2020-04-132-1639/+2965
* | | | | | | CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placementSergeanur2020-04-147-136/+69
* | | | | | | Debug font and CProfilesSergeanur2020-04-144-15/+138
* | | | | | | Some cleanup erorcun2020-04-144-110/+124
| |_|_|_|/ / |/| | | | |
* | | | | | update readmeSergeanur2020-04-141-1/+0
* | | | | | Merge pull request #403 from saml1er/roadblocksFilip Gawin2020-04-142-18/+184
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge pull request #406 from Nick007J/masterFilip Gawin2020-04-144-10/+343
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-131-7/+6
| |\ \ \ \ \ \
| * | | | | | | review fixNikolay Korolev2020-04-131-2/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-1326-229/+1588
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | obviously forgot about itNikolay Korolev2020-04-121-1/+1
| * | | | | | | sync with masterNikolay Korolev2020-04-1244-1089/+2626
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into garages_devNikolay Korolev2020-04-111-1/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-114-4/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | CPoolsNikolay Korolev2020-04-117-11/+346
* | | | | | | | | | 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
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #412 from whampson/save-stufferorcun2020-04-133-30/+158
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | FixesWes Hampson2020-04-132-44/+63
| * | | | | | | Remove GenericLoad from TODOsWes Hampson2020-04-131-1/+0
| * | | | | | | GenericLoad() doneWes Hampson2020-04-131-25/+135
* | | | | | | | Merge pull request #413 from erorcun/erorcunerorcun2020-04-1310-56/+217
|\ \ \ \ \ \ \ \
| * | | | | | | | CFileLoader last funcs and Frontend cleanuperay orçunus2020-04-1310-56/+217
| |/ / / / / / /
* | | | | | | | Fix compilation errorSergeanur2020-04-131-7/+7
* | | | | | | | Merge pull request #410 from Sergeanur/PacManPickupserorcun2020-04-135-31/+456
|\ \ \ \ \ \ \ \
| * | | | | | | | CPacManPickupsSergeanur2020-04-135-31/+456
| |/ / / / / / /
* | | | | | | | Merge pull request #411 from aap/mastererorcun2020-04-1310-68/+695
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | finished CBoataap2020-04-1310-68/+695
|/ / / / / / /
* | | | | | | Merge pull request #409 from erorcun/erorcunerorcun2020-04-125-42/+62
|\ \ \ \ \ \ \
| * | | | | | | Frontend fixes + triangle for back as defaulteray orçunus2020-04-125-42/+62
* | | | | | | | Merge pull request #408 from erorcun/erorcunerorcun2020-04-121-4/+1
|\| | | | | | |
| * | | | | | | Revert "fix"eray orçunus2020-04-121-4/+1
* | | | | | | | Merge pull request #407 from erorcun/erorcunerorcun2020-04-121-2/+4
|\| | | | | | |
| * | | | | | | Ped fixeray orçunus2020-04-121-2/+4
* | | | | | | | Remove CObject from readmeSergeanur2020-04-121-1/+0
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #402 from Nick007J/masterNikolay Korolev2020-04-127-31/+612
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Update README.mdNikolay Korolev2020-04-111-1/+0
| | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-114-4/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fixed malloc/newNikolay Korolev2020-04-111-1/+1
| * | | | | Merge branch 'master' of https://github.com/Nick007J/re3Nikolay Korolev2020-04-111-2/+0
| |\ \ \ \ \
| | * | | | | Update README.mdNikolay Korolev2020-04-111-2/+0
| * | | | | | fix constantsNikolay Korolev2020-04-111-14/+14
| |/ / / / /
| * | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-1112-121/+584
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | RecordNikolay Korolev2020-04-115-22/+394
| * | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-1094-10317/+12432
| |\ \ \ \ \
| * | | | | | record initNikolay Korolev2020-04-105-10/+222
* | | | | | | Merge pull request #399 from saml1er/masterNikolay Korolev2020-04-1210-36/+318
|\ \ \ \ \ \ \
| * | | | | | | CObject fixessaml1er2020-04-111-13/+13
| * | | | | | | Addendum to previous commitsaml1er2020-04-101-2/+1
| * | | | | | | Refactor CObject::ObjectDamage switch statementsaml1er2020-04-101-105/+102
| * | | | | | | Fix cast in CObject::ObjectDamagesaml1er2020-04-101-1/+1
| * | | | | | | Refactor CObject::ObjectDamagesaml1er2020-04-102-142/+141
| * | | | | | | Fix Object.h and Object.cpp indentationsaml1er2020-04-102-235/+235
| * | | | | | | CObject completesaml1er2020-04-1010-29/+316
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #388 from ShFil119/audio16Sergeanur2020-04-124-242/+270
|\ \ \ \ \ \ \
| * | | | | | | Cleanup audio codeFilip Gawin2020-04-124-242/+270
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | fixed cranes bugNikolay Korolev2020-04-121-1/+3
|/ / / / / /
* | | | | | Merge pull request #405 from erorcun/erorcunerorcun2020-04-121-1/+1
|\ \ \ \ \ \
| * | | | | | CDebug fixeray orçunus2020-04-121-1/+1
|/ / / / / /
* | | | | | Merge pull request #400 from erorcun/erorcunerorcun2020-04-1112-805/+1578
|\ \ \ \ \ \
| * | | | | | CMenuManager done and CHud fixeseray orçunus2020-04-1112-805/+1578
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #404 from Sergeanur/rwlinkSergeanur2020-04-1117-3/+457
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Link with RW libsSergeanur2020-04-1117-3/+457
|/ / / / /
* | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-114-6/+9
|\ \ \ \ \
| * | | | | Fix cutscene camera latencySergeanur2020-04-113-2/+3
| | |_|_|/ | |/| | |
| * | | | fixing r* visioned leakSergeanur2020-04-101-4/+6
* | | | | fixed traffic light positionaap2020-04-111-2/+2
|/ / / /
* | | | fuck you git, i fixed this alreadyaap2020-04-101-1/+1
* | | | implemented CTrafficLightsaap2020-04-1010-116/+577
|/ / /
* | | disabling the code that freezes gang membersSergeanur2020-04-101-0/+3
* | | Merge pull request #397 from Nick007J/masterNikolay Korolev2020-04-101-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-100-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #396 from Nick007J/masterNikolay Korolev2020-04-101-6/+6
|\ \ \ \
| | * | | fixNikolay Korolev2020-04-101-0/+1
| |/ / /
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-102-8/+5
| |\ \ \ | |/ / / |/| | |
* | | | PlayerSkin small cleanupSergeanur2020-04-102-8/+5
| * | | fixed intro crashNikolay Korolev2020-04-101-6/+6
|/ / /
* | | Fixing mixed IsCutsceneProcessing and IsRunningSergeanur2020-04-106-5/+5
* | | Fix sprite vertical scaleSergeanur2020-04-104-9/+9
|/ /
* | fix weather initNikolay Korolev2020-04-101-3/+3
* | normalized line endings to LFaap2020-04-0937-7716/+7716
* | Merge remote-tracking branch 'Fire-Head/master'Sergeanur2020-04-0920-832/+1643
|\ \
| * | PS2 Cheats, restored R*namesFire-Head2020-04-0912-197/+320
| * | cleanupFire-Head2020-04-091-21/+45
| * | (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowModeFire-Head2020-04-0912-662/+1326
* | | Merge pull request #393 from Sergeanur/txdimgaap2020-04-094-7/+258
|\ \ \
| * | | txd.img creatorSergeanur2020-04-094-7/+258
* | | | Merge pull request #395 from aap/masteraap2020-04-0921-1831/+1810
|\ \ \ \
| * | | | fixed questionable RW usage; changed radar mask to PS2 techinqueaap2020-04-0921-1831/+1810
* | | | | CStats finishedSergeanur2020-04-093-20/+245
|/ / / /
* | | | AddExplosion shadow fixSergeanur2020-04-091-0/+5
* | | | Update README.mdNikolay Korolev2020-04-091-1/+0
* | | | Merge pull request #391 from Sergeanur/Cheatsaap2020-04-093-26/+242
|\ \ \ \
| * | | | CheatsSergeanur2020-04-083-26/+242
| |/ / /
* | | | Merge pull request #390 from Sergeanur/Explosionaap2020-04-098-47/+426
|\ \ \ \
| * | | | Finished CExplosionSergeanur2020-04-098-47/+426
| | |/ / | |/| |
* | | | Merge pull request #389 from Nick007J/masteraap2020-04-094-7/+488
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-081-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | fixed random number retrievalNikolay Korolev2020-04-081-4/+4
| * | | review fixNikolay Korolev2020-04-081-1/+1
| * | | review fixesNikolay Korolev2020-04-081-15/+15
| * | | final fixesNikolay Korolev2020-04-081-10/+17
| * | | Merge branch 'master' into garages_devNikolay Korolev2020-04-082-2/+2
| |\ \ \ | | | |/ | | |/|
| * | | fixNikolay Korolev2020-04-081-1/+1
| * | | Merge branch 'master' into garages_devNikolay Korolev2020-04-0816-157/+1333
| |\ \ \
| * | | | rain fixNikolay Korolev2020-04-081-8/+8
| * | | | fixesNikolay Korolev2020-04-082-26/+18
| * | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-0713-703/+1124
| |\ \ \ \
| * | | | | weather stuffNikolay Korolev2020-04-073-6/+488
* | | | | | Merge pull request #387 from aap/masteraap2020-04-094-16/+265
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-085-12/+14
| |\ \ \ \ \
| * | | | | | implemented CSkidmarksaap2020-04-084-16/+263
| * | | | | | Reverting tabs back to spaces for aapSergeanur2020-04-081-34/+34
* | | | | | | fix bugNikolay Korolev2020-04-081-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix target sprite sizeSergeanur2020-04-081-1/+1
| |/ / / / |/| | | |
* | | | | fix bugNikolay Korolev2020-04-081-1/+1
| |_|_|/ |/| | |
* | | | fix bugNikolay Korolev2020-04-081-1/+1
* | | | bug fixNikolay Korolev2020-04-081-2/+2
* | | | Reverting tabs back to spaces for aapSergeanur2020-04-081-34/+34
|/ / /
* | | Merge pull request #385 from aap/masteraap2020-04-0810-128/+1295
|\ \ \
| * | | finished CMotionBlurStreaks, CSpecialFXaap2020-04-076-44/+293
| * | | implemented CRubbishaap2020-04-075-22/+303
| * | | implemented CShinyTextsaap2020-04-074-60/+251
| * | | implemented CRubbishaap2020-04-073-8/+454
| |/ /
* | / Small camera fixesSergeanur2020-04-084-59/+68
| |/ |/|
* | Merge pull request #386 from erorcun/erorcunerorcun2020-04-072-9/+29
|\ \
| * | Menu map changeseray orçunus2020-04-072-9/+29
|/ /
* | Merge pull request #384 from erorcun/erorcunerorcun2020-04-079-68/+462
|\ \
| * | Menu maperay orçunus2020-04-079-68/+462
| |/
* | Fix CI buildFilip Gawin2020-04-071-5/+5
* | Cleanup audiocode and fix for ComputeDopplerEffectedFrequencyFilip Gawin2020-04-074-630/+637
|/
* finished CCollisionaap2020-04-063-4/+81
* Update README.mdNikolay Korolev2020-04-061-1/+1
* Update README.mdNikolay Korolev2020-04-061-1/+1
* Update README.mdNikolay Korolev2020-04-061-6/+8
* Merge branch 'master' of github.com:GTAmodding/re3aap2020-04-060-0/+0
|\
| * Merge pull request #383 from Nick007J/masterNikolay Korolev2020-04-061-4/+4
| |\
| | * fixed buildNikolay Korolev2020-04-061-4/+4
| |/
* / fixed typoaap2020-04-061-4/+4
|/
* Merge pull request #379 from erorcun/erorcunaap2020-04-066-82/+1208
|\
| * Frontend (last-3)eray orçunus2020-04-046-82/+1208
* | Merge pull request #381 from aap/masteraap2020-04-062-0/+2593
|\ \
| * | PS2 Frontend Controlsaap2020-04-052-0/+2593
| * | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-051-2/+3
| |\ \
| * \ \ Merge branch 'master' of github.com:gtamodding/re3aap2020-04-0318-84/+1011
| |\ \ \ | | | |/ | | |/|
* | | | Merge pull request #382 from Nick007J/masterNikolay Korolev2020-04-0612-121/+834
|\ \ \ \
| * | | | stats fixNikolay Korolev2020-04-063-62/+51
| * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-062-6/+87
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #354 from PerikiyoXD/masterNikolay Korolev2020-04-062-6/+87
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into masterNikolay Korolev2020-04-06157-3870/+17524
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implement Init for StatsPerikiyoXD2020-03-242-5/+88
| | * | | | review fixesNikolay Korolev2020-04-061-12/+18
| | * | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-0619-362/+3459
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | fixed look behind bugaap2020-04-051-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #378 from aap/masteraap2020-04-0519-361/+3458
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | CCamera fixesaap2020-04-0319-361/+3458
* | | | | Merge pull request #380 from Nick007J/masterNikolay Korolev2020-04-051-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | | | * Cranes doneNikolay Korolev2020-04-068-116/+564
| | | | * Merge branch 'master' into garages_devNikolay Korolev2020-04-0513-58/+807
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-0512-56/+804
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #377 from Fire-Head/masteraap2020-04-037-20/+763
|\ \ \ \ \
| * | | | | Glass cosmetic fixesFire_Head2020-04-021-7/+7
| * | | | | Glass doneFire-Head2020-04-017-20/+763
* | | | | | Merge pull request #376 from Nick007J/masteraap2020-04-036-28/+207
|\ \ \ \ \ \
* | | | | | | Fix CFont type uint16 -> wcharSergeanur2020-04-022-31/+31
* | | | | | | fixesSergeanur2020-04-023-5/+10
| |_|_|/ / / |/| | | | |
| | | * | | shoreside garage fixNikolay Korolev2020-04-051-2/+3
| | |/ / / | |/| | |
| | | | * cranes initNikolay Korolev2020-04-054-21/+291
| | |_|/ | |/| |
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-012-127/+174
| |\ \ \ | |/ / / |/| | |
* | | | AudioScriptObject finishedSergeanur2020-04-012-127/+174
| * | | Merge branch 'garages_dev'Nikolay Korolev2020-04-016-28/+207
|/| | |
| * | | vehicles missing functions + fixesNikolay Korolev2020-04-016-28/+207
* | | | Merge pull request #372 from Nick007J/masterNikolay Korolev2020-04-014-152/+1101
|\| | |
| * | | review fixesNikolay Korolev2020-03-312-117/+68
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-3124-536/+1705
| |\ \ \ | |/ / / |/| | |
* | | | timebarsSergeanur2020-03-318-2/+220
* | | | Merge pull request #373 from erorcun/erorcunaap2020-03-318-19/+788
|\ \ \ \
| * | | | Mouse free cam for peds&cars (under FREE_CAM)eray orçunus2020-03-318-19/+788
| | |/ / | |/| |
* | | | Merge pull request #371 from Sergeanur/MoreLanguagesaap2020-03-3113-515/+697
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-03-3062-741/+2609
| |\ \ \ | |/ / / |/| | |
| * | | Add russian lang supportSergeanur2020-03-3013-515/+697
| | * | fixNikolay Korolev2020-03-311-1/+1
| | * | Merge branch 'master' of https://github.com/Nick007J/re3Nikolay Korolev2020-03-301-2/+0
| | |\ \
| | | * | Update README.mdNikolay Korolev2020-03-301-2/+0
| | * | | added forgotten functionNikolay Korolev2020-03-301-1/+4
| | |/ /
| | * | bug fixes, reorganisationNikolay Korolev2020-03-303-48/+55
| | * | Merge branch 'master' into garages_devNikolay Korolev2020-03-3011-55/+329
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #366 from Nick007J/masteraap2020-03-2916-144/+1475
|\ \ \ \
* \ \ \ \ Merge pull request #370 from erorcun/erorcunerorcun2020-03-291-2/+0
|\ \ \ \ \
| * | | | | Update Readmeeray orçunus2020-03-291-2/+0
|/ / / / /
* | | | | Merge pull request #369 from erorcun/erorcunerorcun2020-03-2911-53/+329
|\ \ \ \ \
| * | | | | CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-2911-53/+329
| | | | * | finished garagesNikolay Korolev2020-03-302-49/+550
| | | | * | Merge branch 'master' into garages_devNikolay Korolev2020-03-2946-588/+848
| | | | |\ \ | | | |_|/ / | | |/| | |
| | * | | | fixed PS2 buildNikolay Korolev2020-03-291-0/+2
| | * | | | merge with upstreamNikolay Korolev2020-03-2946-588/+846
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #365 from Fire-Head/masteraap2020-03-2930-126/+590
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into masterFire_Head2020-03-2924-558/+783
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #367 from Sergeanur/wrappers_cleanupaap2020-03-2914-423/+5
|\ \ \ \ \ \ \
| * | | | | | | Wrappers cleanupSergeanur2020-03-2914-423/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #368 from aap/masteraap2020-03-294-0/+217
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | rotating FollowPed cam (disabled by default for now)aap2020-03-294-0/+217
|/ / / / / /
* | | | | | Fire and PlayerSkin fixSergeanur2020-03-292-39/+41
| * | | | | style & cosmetic fixesFire-Head2020-03-292-9/+1
| * | | | | style & cosmetic fixesFire-Head2020-03-292-32/+32
| * | | | | CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-2830-129/+593
| | | * | | fixNikolay Korolev2020-03-291-1/+1
| | | | * | more garagesNikolay Korolev2020-03-292-118/+607
| | | |/ /
| | | * | fixesNikolay Korolev2020-03-281-40/+36
| | | * | Merge branch 'master' into garages_devNikolay Korolev2020-03-286-104/+520
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #364 from erorcun/erorcunerorcun2020-03-281-1/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Limit frontend FPS to 100eray orçunus2020-03-281-1/+7
| |/ / /
* | | | audio16 fixes for reviewFilip Gawin2020-03-281-9/+5
* | | | ProcessVehicleEngine and ProcessActiveQueuesFilip Gawin2020-03-282-40/+457
* | | | Merge pull request #360 from ShFil119/impr/assemblyaap2020-03-283-63/+60
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup patching systemFilip Gawin2020-03-282-54/+57
| * | | Remove assembly from patcher.hFilip Gawin2020-03-272-10/+4
| | * | fixesNikolay Korolev2020-03-282-77/+134
| | * | merge with masterNikolay Korolev2020-03-2857-90/+681
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #363 from erorcun/erorcunerorcun2020-03-2851-69/+318
|\ \ \ \
| * | | | CCopPed done and #include cleanuperay orçunus2020-03-2851-69/+318
* | | | | Merge pull request #362 from Fire-Head/masteraap2020-03-286-20/+362
|\ \ \ \ \
| * | | | | WaterCannon uv macrosFire-Head2020-03-281-13/+13
| * | | | | WaterCannon done, resource icoFire-Head2020-03-286-20/+362
* | | | | | CCam fixaap2020-03-281-1/+1
| |/ / / / |/| | | |
| | | * | garage update part 2Nikolay Korolev2020-03-288-122/+660
| | | * | Merge branch 'master' into garages_devNikolay Korolev2020-03-2870-2123/+6496
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | remove include <new> from common.haap2020-03-2823-22/+70
* | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-03-283-286/+305
|\ \ \ \ \
| * | | | | Fix Text n PagerSergeanur2020-03-282-285/+285
| * | | | | Set Xinput version to 9.1.0 + vibration setSergeanur2020-03-281-1/+20
| | |/ / / | |/| | |
* / | | | CCam fixaap2020-03-281-1/+1
|/ / / /
* | | | removed windows.h for most .cppsaap2020-03-2713-331/+362
* | | | XInputSergeanur2020-03-273-1/+60
* | | | Merge pull request #357 from aap/masteraap2020-03-2718-1268/+4695
|\ \ \ \ | |/ / / |/| | |
| * | | implemented some unused PS2 camsaap2020-03-275-6/+302
| * | | Finished CCam; various smaller thingsaap2020-03-2718-1268/+4399
* | | | Merge pull request #356 from blingu/mastererorcun2020-03-264-31/+430
|\ \ \ \
| * | | | Update Fire.cppblingu2020-03-261-5/+5
| * | | | Update Fire.cppblingu2020-03-261-1/+1
| * | | | Update Fire.cppblingu2020-03-261-1/+1
| * | | | Update Vehicle.cppblingu2020-03-261-1/+1
| * | | | Update Fire.cppblingu2020-03-251-2/+2
| * | | | added InflictDamage() declarationblingu2020-03-251-0/+1
| * | | | added wrapper for InflictDamage()blingu2020-03-251-0/+1
| * | | | Update Fire.cppblingu2020-03-251-2/+2
| * | | | m_snTimeInMilliseconds to GetTimeInMilliseconds()blingu2020-03-251-12/+12
| * | | | Update Fire.cppblingu2020-03-251-6/+6
| * | | | renamed field_24 to m_nNextTimeToAddFlamesblingu2020-03-251-1/+1
| * | | | Update Fire.cppblingu2020-03-251-8/+0
| * | | | Update Fire.hblingu2020-03-251-1/+1
| * | | | Update Fire.hblingu2020-03-251-3/+3
| * | | | Update Fire.cppblingu2020-03-251-118/+114
| * | | | Update Fire.cppblingu2020-03-241-15/+419
| * | | | Update Fire.hblingu2020-03-241-1/+1
| * | | | Update Fire.hblingu2020-03-241-16/+21
| | |_|/ | |/| |
* | | | Merge pull request #355 from erorcun/erorcunerorcun2020-03-2617-185/+575
|\ \ \ \ | |_|/ / |/| | |
| * | | CCopPed 2 and fixeseray orçunus2020-03-2617-185/+575
|/ / /
| | * garages part 1Nikolay Korolev2020-03-2813-50/+795
| |/ |/|
* | Merge pull request #353 from Sergeanur/Debugaap2020-03-254-5/+221
|\ \ | |/ |/|
| * obrstr + DebugSergeanur2020-03-244-5/+221
* | change default script to storyaap2020-03-241-1/+1
* | fix and cleanup in AddToPopulationaap2020-03-241-11/+11
* | added an assert to CPed::BuildPedLists, but too many peds still crash the gameaap2020-03-241-7/+11
|/
* Merge pull request #352 from Nick007J/masteraap2020-03-2335-131/+383
|\
| * merge with upstreamNikolay Korolev2020-03-2231-4323/+4590
| |\
| * | missing endlinesNikolay Korolev2020-03-225-5/+5
| * | console initNikolay Korolev2020-03-221-0/+1
| * | merge with masterNikolay Korolev2020-03-225-40/+97
| |\ \
| * | | CGame::InitialiseNikolay Korolev2020-03-2235-12/+333
* | | | Fix order of math operations on integers (fires)Filip Gawin2020-03-221-1/+1
| |_|/ |/| |
* | | Remove all constexprFilip Gawin2020-03-224-16/+17
* | | fix includeFilip Gawin2020-03-221-1/+1
* | | Fixes for reviewFilip Gawin2020-03-221-1/+1
* | | Fixes for reviewFilip Gawin2020-03-225-38/+53
* | | Cleanup audio code + fixes for reviewFilip Gawin2020-03-224-329/+196
* | | Remove unneeded double to float castsFilip Gawin2020-03-226-341/+341
* | | Fixes for Serge's reviewFilip Gawin2020-03-2219-791/+624
* | | Implement ProcessGarages + small cleanupFilip Gawin2020-03-227-3091/+3394
* | | Implement SetupJumboEngineSoundFilip Gawin2020-03-222-13/+39
* | | Implement ProcessFiresFilip Gawin2020-03-223-7/+79
* | | Implement ProcessCraneFilip Gawin2020-03-222-2/+91
* | | Implement ProcessCesnaFilip Gawin2020-03-222-4/+67
| |/ |/|
* | ConsoleSergeanur2020-03-225-1/+125
* | Merge pull request #350 from Nick007J/masteraap2020-03-224-11/+110
|\|
| * bullet traces fixesNikolay Korolev2020-03-224-29/+21
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-2218-732/+1738
| |\
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-211-1/+0
| |\ \
| * | | bullet tracesNikolay Korolev2020-03-213-11/+118
* | | | fixed vehicle rendering bugaap2020-03-221-0/+1
| |_|/ |/| |
* | | Merge pull request #348 from erorcun/erorcunerorcun2020-03-2218-732/+1738
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into erorcunerorcun2020-03-224-8/+4
| |\ \ | |/ / |/| |
* | | Merge pull request #349 from Nick007J/masterNikolay Korolev2020-03-213-7/+5
|\ \ \ | | |/ | |/|
| * | fixed erroneous assumptionNikolay Korolev2020-03-211-4/+0
| * | purple nines glitch fixNikolay Korolev2020-03-212-3/+5
* | | readme updateNikolay Korolev2020-03-211-1/+0
|/ /
| * ProcessButtonPresses and fixeseray orçunus2020-03-2118-731/+1738
|/
* Merge pull request #346 from Sergeanur/Radar2erorcun2020-03-176-1436/+1606
|\
| * Merge branch 'master' into Radar2erorcun2020-03-1722-1429/+1770
| |\ | |/ |/|
* | Merge pull request #347 from Nick007J/mastererorcun2020-03-174-80/+213
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-1520-151/+588
| |\ \
| * | | replay bug fixes, script bug fixNikolay Korolev2020-03-154-80/+213
* | | | Merge pull request #345 from whampson/save-stufferorcun2020-03-1719-31/+239
|\ \ \ \ | |_|/ / |/| | |
| * | | Use WriteDataToBufferPointerWes Hampson2020-03-141-35/+35
| * | | Spacing fixWes Hampson2020-03-131-3/+3
| * | | Style fix, use CTimeStepWes Hampson2020-03-131-4/+6
| * | | Add CTimeStepWes Hampson2020-03-132-0/+15
| * | | Fix merge conflictWes Hampson2020-03-114-34/+457
| |\ \ \
| * | | | Style fixesWes Hampson2020-03-112-2/+2
| * | | | Bugfixes, GenericSave() works now!Wes Hampson2020-03-111-15/+10
| * | | | GenericSave complete, still needs some testingWes Hampson2020-03-117-83/+122
| * | | | Save SimpleVars, Scripts, and a few othersWes Hampson2020-03-111-31/+83
| * | | | Add Load/Save functionsWes Hampson2020-03-119-21/+44
| * | | | Begin work on GenericSaveWes Hampson2020-03-053-4/+86
| | | | * Finished CRadar, a bit of CExplosionSergeanur2020-03-166-220/+390
| |_|_|/ |/| | |
* | | | Merge pull request #344 from erorcun/erorcunerorcun2020-03-1220-151/+588
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into erorcunerorcun2020-03-114-34/+457
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #343 from Nick007J/mastererorcun2020-03-114-34/+457
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | more utilsNikolay Korolev2020-03-041-23/+72
| * | Merge branch 'master' into script_devNikolay Korolev2020-03-041-2/+2
| |\ \ | |/ / |/| |
| * | more utilsNikolay Korolev2020-03-041-20/+131
| * | Merge branch 'master' into script_devNikolay Korolev2020-03-0211-92/+122
| |\ \
| * | | script utilsNikolay Korolev2020-03-023-28/+121
| * | | Merge branch 'master' into script_devNikolay Korolev2020-03-0111-264/+635
| |\ \ \
| * | | | save/loadNikolay Korolev2020-03-012-3/+173
| | | | * CPopulation done, CCopPed and fixeseray orçunus2020-03-1120-151/+588
| |_|_|/ |/| | |
* | | | Merge pull request #342 from Nick007J/masterNikolay Korolev2020-03-041-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | fixed dummyobject bugNikolay Korolev2020-03-041-2/+2
|/ / /
* | | Merge pull request #340 from erorcun/erorcunerorcun2020-03-0211-92/+122
|\ \ \
| * | | Fixes and cleanuperay orçunus2020-03-0211-92/+122
|/ / /
* | | Merge pull request #336 from Nick007J/masterNikolay Korolev2020-03-017-333/+1722
|\ \ \ | | |/ | |/|
| * | review fixesNikolay Korolev2020-03-012-165/+169
| * | merge with upstreamNikolay Korolev2020-03-0110-99/+466
| |\ \ | |/ / |/| / | |/
* | Merge pull request #339 from erorcun/erorcunerorcun2020-03-015-10/+42
|\ \
| * | fixeseray orçunus2020-03-015-10/+42
|/ /
* | Merge pull request #338 from erorcun/erorcunerorcun2020-02-298-95/+430
|\ \
| * | CPopulation 3 and fixeseray orçunus2020-02-278-95/+430
|/ /
| * removed debug leftoversNikolay Korolev2020-02-241-3/+0
| * more stuff + intro fixNikolay Korolev2020-02-243-24/+635
| * Merge branch 'master' into script_devNikolay Korolev2020-02-246-13/+13
| |\ | |/ |/|
* | script fixeseray orçunus2020-02-231-3/+3
* | Merge pull request #333 from Nick007J/masteraap2020-02-2324-35/+1226
|\ \
* \ \ Merge pull request #334 from erorcun/erorcunerorcun2020-02-234-9/+9
|\ \ \
| * | | some fixeseray orçunus2020-02-224-9/+9
|/ / /
* | | Fix police radio conditionFilip Gawin2020-02-221-1/+1
| | * 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-236-309/+315
| | * some cosmetic stuffNikolay Korolev2020-02-232-118/+244
| |/
| * ARRAY_SIZENikolay Korolev2020-02-221-2/+2
| * removed extra includeNikolay Korolev2020-02-221-2/+0
| * merge + bug fixNikolay Korolev2020-02-223-5/+12
| * mergeNikolay Korolev2020-02-2219-165/+848
| |\ | |/ |/|
* | Merge pull request #329 from erorcun/erorcunerorcun2020-02-196-11/+367
|\ \
| * | CPopulation 2eray orçunus2020-02-196-11/+367
|/ /
* | Merge pull request #328 from erorcun/erorcunerorcun2020-02-1714-112/+442
|\ \
| * | CPopulation 1eray orçunus2020-02-1714-112/+442
* | | Merge pull request #327 from Nick007J/masteraap2020-02-1718-56/+1195
|\ \ \ | |/ / |/| |
| | * fixesNikolay Korolev2020-02-222-14/+13
| | * script 1000-1154Nikolay Korolev2020-02-1624-35/+1225
| |/
| * review fixesNikolay Korolev2020-02-162-64/+66
| * bug fixesNikolay Korolev2020-02-154-15/+36
| * sync with upstreamNikolay Korolev2020-02-1533-919/+2009
| |\ | |/ |/|
* | Merge pull request #326 from erorcun/erorcunerorcun2020-02-133-13/+13
|\ \
| * | a fixeray orçunus2020-02-133-13/+13
|/ /
* | Merge pull request #325 from erorcun/erorcunerorcun2020-02-1312-18/+369
|\ \
| * | CPlayerPed doneeray orçunus2020-02-1312-18/+369
|/ /
* | Fixed random sound volumeSergeanur2020-02-071-1/+1
* | cMusicManagerSergeanur2020-02-0710-304/+1006
* | CullZone fixSergeanur2020-02-042-4/+4
* | Merge pull request #323 from erorcun/erorcunerorcun2020-02-031-10/+7
|\ \
| * | few little thingseray orçunus2020-02-031-10/+7
|/ /
* | Merge pull request #322 from erorcun/erorcunerorcun2020-02-032-12/+57
|\ \
| * | A bug fix and VC ports for veh. enter/exiteray orçunus2020-02-032-12/+57
|/ /
* | Merge pull request #321 from Sergeanur/audio_enumsSergeanur2020-02-025-550/+551
|\ \
| * | Audio, use of enums and true/falseSergeanur2020-02-025-550/+551
* | | Merge pull request #320 from erorcun/erorcunerorcun2020-02-028-19/+13
|\ \ \ | |/ / |/| |
| * | Some fixes and some cosmetic thingseray orçunus2020-02-028-19/+13
|/ /
| * script 900-999Nikolay Korolev2020-02-1513-18/+641
| * Merge branch 'master' of https://github.com/Nick007J/re3Nikolay Korolev2020-02-020-0/+0
| |\
| | * fixed firetruck crashNikolay Korolev2020-02-021-1/+1
| * | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-02-021-1/+1
| |\ \ | |/ / |/| / | |/
* | fixed firetruck crashNikolay Korolev2020-02-021-1/+1
| * 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
* | Merge pull request #319 from Nick007J/masterNikolay Korolev2020-02-021-2/+2
|\ \
| | * script 900-999 initNikolay Korolev2020-02-025-2/+495
| |/
| * fix ai bug (2)Nikolay Korolev2020-02-021-2/+2
|/
* Merge pull request #315 from Nick007J/masterNikolay Korolev2020-02-021-1/+1
|\
| * 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
* Removed dup hookSergeanur2020-02-011-1/+0
* Added enum to OnscreenTimer, fixed mistakes in CCarCtrl::SteerAIBoatWithPhysicsHeadingForTargetSergeanur2020-02-014-12/+18
* Fix damage bar assert crashSergeanur2020-02-012-4/+5
* Fix CTheScripts::AddToInvisibilitySwapArraySergeanur2020-02-011-2/+2
* Fix Projectile Air ResistanceSergeanur2020-01-311-1/+1
* Fix SET_BOAT_CRUISE_SPEEDSergeanur2020-01-311-4/+5
* Fix boat componentSergeanur2020-01-311-1/+1
* More fixesSergeanur2020-01-313-57/+55
* Fixing IS_AREA_OCCUPIED commandSergeanur2020-01-311-1/+1
* Fixed wrong slot indexing in FrontendSergeanur2020-01-311-1/+1
* Fix corrupt savesSergeanur2020-01-311-3/+3
* Merge pull request #299 from Sergeanur/PedIKaap2020-01-317-23/+236
|\
| * suggested fixesSergeanur2020-01-302-11/+11
| * acosSergeanur2020-01-292-5/+5
| * readme changeSergeanur2020-01-291-1/+0
| * cameraSergeanur2020-01-292-6/+72
| * CPedIK finishedSergeanur2020-01-293-11/+159
* | Merge pull request #298 from Sergeanur/saveaap2020-01-3112-61/+614
|\ \
| * | sizeofs n stuffSergeanur2020-01-312-19/+31
| * | CDate separatedSergeanur2020-01-274-107/+111
| * | fix var namesSergeanur2020-01-272-16/+16
| * | saveSergeanur2020-01-2710-61/+598
* | | Merge pull request #300 from Sergeanur/Remoteaap2020-01-317-11/+74
|\ \ \
| * | | CRemoteSergeanur2020-01-317-11/+74
|/ / /
* | / RC toyz crashfixSergeanur2020-01-311-1/+1
| |/ |/|
* | Fixed autoaiming cameraSergeanur2020-01-291-1/+1
|/
* Coronas is doneSergeanur2020-01-261-1/+0
* Replay is doneSergeanur2020-01-261-1/+0
* More unfinished classesSergeanur2020-01-261-3/+16
* Fix invert mouse on/offSergeanur2020-01-261-1/+1
* Merge pull request #296 from Sergeanur/audioSergeanur2020-01-2512-1450/+1395
|\
| * audio stuffSergeanur2020-01-2512-1450/+1395
|/
* Partial CBoatSergeanur2020-01-243-9/+264
* CPlayerPed continues (#294)erorcun2020-01-2311-88/+503
* Fixing possible leaks in CModelInfo::ShutDownSergeanur2020-01-233-2/+26
* Fixing some plane funcs declarationsSergeanur2020-01-232-4/+4
* Plane crashfix and moreSergeanur2020-01-236-12/+10
* ConstructMloClumpsSergeanur2020-01-214-6/+13
* Refactor CCullZone::CalcDistToCullZoneSquaredSergeanur2020-01-201-21/+8
* Atan2 and SqrtSergeanur2020-01-201-1/+1
* disable cullzone writerSergeanur2020-01-202-1/+2
* CullZone.dat writer startSergeanur2020-01-202-23/+272
* Merge pull request #293 from Sergeanur/Unusedaap2020-01-2012-23/+272
|\
| * MLO, XtraCompsModelInfo, MovingThing, SolidSergeanur2020-01-2012-23/+272
|/
* PowerPointsSergeanur2020-01-203-1/+84
* Two audio structs renamed to their original namesSergeanur2020-01-132-10/+10
* Fix molotovSergeanur2020-01-131-1/+1
* Fix projectile crashSergeanur2020-01-131-15/+0
* Merge pull request #290 from Sergeanur/ProjectileInfoaap2020-01-125-15/+318
|\
| * FixesSergeanur2020-01-123-12/+28
| * ProjectileInfoSergeanur2020-01-114-12/+299
* | Merge pull request #291 from Sergeanur/AccidentManagererorcun2020-01-128-66/+143
|\ \
| * | AccidentManagerSergeanur2020-01-117-20/+97
| * | moveSergeanur2020-01-112-0/+0
| |/
* | Merge pull request #292 from erorcun/erorcunerorcun2020-01-124-17/+17
|\ \ | |/ |/|
| * Fixes 2eray orçunus2020-01-114-17/+17
|/
* Merge pull request #289 from erorcun/erorcunerorcun2020-01-115-24/+56
|\
| * Fixeseray orçunus2020-01-105-24/+56
* | Merge pull request #288 from Sergeanur/UserDisplayerorcun2020-01-114-184/+332
|\ \ | |/ |/|
| * CUserDisplay, CPlaceName, CCurrentVehicleSergeanur2020-01-074-184/+332
|/
* Merge pull request #287 from Sergeanur/LastDarkelaap2020-01-073-10/+46
|\
| * Finishing CDarkelSergeanur2020-01-073-10/+46
* | Remove CProjectile from TODO listSergeanur2020-01-071-1/+0
|/
* Fixing Projectile codeSergeanur2020-01-078-34/+47
* CPlayerPed & CMenuManager (#286)erorcun2020-01-0713-801/+1032
* Merge pull request #285 from Nick007J/script_deverorcun2020-01-0737-133/+3101
|\
| * fixesNikolay Korolev2020-01-031-3/+3
| * script 800-899Nikolay Korolev2020-01-0324-132/+1329
| * bug fixesNikolay Korolev2020-01-015-7/+13
| * Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2020-01-011-1/+1
| |\
| * | bug fixNikolay Korolev2020-01-011-1/+1
| * | fix merge with upstreamNikolay Korolev2020-01-013-8/+4
| * | fix mergeNikolay Korolev2020-01-011-1/+0
| * | merge with upstreamNikolay Korolev2020-01-0170-823/+4005
| |\ \
| * | | some not fully tested stuffNikolay Korolev2020-01-0115-42/+920
| * | | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-11-0930-495/+1626
| |\ \ \
| * | | | script stubsNikolay Korolev2019-11-092-7/+520
| * | | | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-10-2728-4399/+7103
| |\ \ \ \
| * | | | | script 600-699Nikolay Korolev2019-10-277-7/+383
* | | | | | Use CGeneral::faststricmp in CPed::ServiceTalkingSergeanur2020-01-071-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #284 from Nick007J/masterNikolay Korolev2020-01-011-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fixed vehicle enter crashNikolay Korolev2020-01-011-1/+1
|/ / / /
* | | | making particleobject compile on vs2015aap2019-12-281-1/+1
* | | | Merge pull request #283 from erorcun/erorcunerorcun2019-12-289-17/+364
|\ \ \ \
| * | | | CPlayerPed & fixeseray orçunus2019-12-289-17/+364
|/ / / /
* | | | Merge pull request #282 from erorcun/erorcunerorcun2019-12-234-31/+456
|\ \ \ \
| * | | | CEmergencyPed doneeray orçunus2019-12-224-31/+456
|/ / / /
* | | | Merge pull request #281 from erorcun/erorcunerorcun2019-12-167-28/+374
|\ \ \ \
| * | | | CPlayerInfo doneeray orçunus2019-12-167-28/+374
|/ / / /
* | | | Merge pull request #280 from erorcun/erorcunerorcun2019-12-0621-139/+554
|\ \ \ \
| * | | | CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-0521-139/+554
|/ / / /
* | | | Merge pull request #278 from Fire-Head/mastererorcun2019-12-021-56/+49
|\ \ \ \
| * | | | fixed mouse bindingFire_Head2019-11-301-56/+49
* | | | | Fix CalculateDistanceFilip Gawin2019-12-011-3/+3
* | | | | Audio fixes for erorcun reviewFilip Gawin2019-12-014-41/+41
* | | | | Implement ProcessVehicleSirenOrAlarmFilip Gawin2019-12-012-4/+49
* | | | | Fix sound when "up" and "down" are pressed togetherFilip Gawin2019-12-011-10/+6
|/ / / /
* | | | Merge pull request #276 from erorcun/erorcunerorcun2019-11-272-5/+5
|\ \ \ \
| * | | | Shadow/blood fade and scale fixeray orçunus2019-11-272-5/+5
* | | | | Merge pull request #273 from erorcun/erorcunerorcun2019-11-2611-79/+590
|\| | | |
| * | | | CCivilianPed done & restore peds running to phoneeray orçunus2019-11-2611-79/+590
|/ / / /
* | | | Merge pull request #272 from erorcun/erorcunerorcun2019-11-205-88/+404
|\ \ \ \
| * | | | CPed completed!eray orçunus2019-11-205-88/+404
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-11-122-2/+276
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Frontend, Peds & logic and overflow fixeseray orçunus2019-11-1215-341/+804
* | | | | fixesSergeanur2019-11-111-22/+34
* | | | | TempColModelsSergeanur2019-11-111-1/+263
* | | | | Fix max iterator value in `InitialisePoliceRadio`Filip Gawin2019-11-111-1/+1
| * | | | Frontend, Peds & logic and overflow fixeseray orçunus2019-11-1215-341/+804
|/ / / /
* | | | Merge pull request #263 from Sergeanur/strcmperorcun2019-11-0919-53/+101
|\ \ \ \ | |_|_|/ |/| | |
| * | | Implemented faststrcmp, faststricmp, strcasecmpSergeanur2019-10-3019-53/+101
* | | | Fix link to config.h in readmeFilip Gawin2019-11-071-1/+1
* | | | Readme revision (#268)erorcun2019-11-062-61/+73
* | | | Merge pull request #267 from ShFil119/audio12erorcun2019-11-053-18/+89
|\ \ \ \
| * | | | RE cAudioManager::UpdateReflectionsFilip Gawin2019-11-053-18/+89
* | | | | Merge pull request #266 from erorcun/erorcunerorcun2019-11-055-28/+387
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Peds & a few fixeseray orçunus2019-11-055-28/+387
|/ / / /
* | | | Merge pull request #265 from erorcun/erorcunerorcun2019-11-033-12/+19
|\ \ \ \
| * | | | Renderer fixeseray orçunus2019-11-033-12/+19
|/ / / /
* | | | Merge pull request #264 from erorcun/erorcunerorcun2019-11-014-27/+511
|\ \ \ \
| * | | | Script fixeray orçunus2019-11-011-7/+6
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-10-3010-22/+904
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #255 from Nick007J/mastererorcun2019-10-3010-22/+904
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | fix pager buildNikolay Korolev2019-10-261-1/+1
| * | | mergeNikolay Korolev2019-10-2699-2728/+6012
| |\ \ \
| * | | | script 500-599Nikolay Korolev2019-10-261-0/+1
| * | | | script 500-599 plus bugfixNikolay Korolev2019-10-2114-22/+907
| | | * | The Pedseray orçunus2019-10-303-20/+505
| |_|/ / |/| | |
* | | | CRadar::Initialise() + fixesSergeanur2019-10-302-15/+92
* | | | Fixed settings loading, added TopLineEmptyFileSergeanur2019-10-303-4/+7
* | | | Small CPad fixesSergeanur2019-10-295-12/+14
* | | | Some fixes for cAudioManager::SetupSuspectLastSeenReportSergeanur2019-10-291-25/+102
* | | | Implement PreloadMissionAudio + small fixesFilip Gawin2019-10-275-49/+132
* | | | Audio fixesSergeanur2019-10-273-49/+55
* | | | Merge pull request #261 from erorcun/erorcunerorcun2019-10-271-40/+40
|\ \ \ \
| * | | | Fall damage fixeray orçunus2019-10-271-40/+40
|/ / / /
* | | | Fixed credits not workingSergeanur2019-10-272-1/+6
* | | | Fix cAudioManager::AddReleasingSoundsSergeanur2019-10-271-36/+36
* | | | ProcessFrontEnd fixesFilip Gawin2019-10-271-24/+36
* | | | const fixSergeanur2019-10-271-1/+1
* | | | Simplify CControllerConfigManager::InitialiseControllerActionNameArraySergeanur2019-10-271-112/+45
| |_|/ |/| |
* | | Merge pull request #259 from Fire-Head/masterFire_Head2019-10-272-56/+56
|\ \ \
| * | | fix Messages.cppFire_Head2019-10-271-49/+49
| * | | fix Pad.hFire_Head2019-10-271-7/+7
| * | | Merge pull request #1 from GTAmodding/masterFire_Head2019-10-2755-5950/+8935
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'master' into masterFire_Head2019-10-2718-328/+2874
|\| | |
| * | | ControllerConfig doneFire-Head2019-10-2718-275/+2872
* | | | SfxEnumSergeanur2019-10-272-3899/+3913
* | | | Audio9 (fixes)Filip Gawin2019-10-272-81/+63
* | | | cAudioManager::TranslateEntity cleanupSergeanur2019-10-273-22/+11
* | | | Revert m_alphaEntityList capacitySergeanur2019-10-261-1/+1
* | | | Removed redundant check in IsPickupModel, TestModelIndices addedSergeanur2019-10-262-1/+7
* | | | Fixed use of boolean type for in CGameLogicSergeanur2019-10-261-6/+6
* | | | Merge pull request #256 from erorcun/erorcunerorcun2019-10-262-11/+178
|\ \ \ \ | |_|_|/ |/| | |
| * | | Gang attack fix & SeekCareray orçunus2019-10-262-11/+178
|/ / /
* | | Fix hornPatternsArraySergeanur2019-10-261-1/+10
* | | Merge pull request #254 from Sergeanur/AudioSergeanur2019-10-2614-393/+387
|\ \ \
| * | | A bit more enums for ChangeMusicModeSergeanur2019-10-262-4/+5
| * | | audio.h -> audio_enums.hSergeanur2019-10-263-2/+2
| * | | Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-2614-389/+382
* | | | Fix audio bugSergeanur2019-10-261-1/+1
|/ / /
* | | Added timing to RwTextureGtaStreamReadSergeanur2019-10-261-2/+16
* | | Fixed CGameLogic::PassTime typesSergeanur2019-10-261-1/+1
* | | CPedIK limb movement info reversedSergeanur2019-10-262-9/+10
* | | VisibilityPlugins callbacks and fixesSergeanur2019-10-261-12/+18
* | | Fixed markers rotation speedSergeanur2019-10-261-1/+1
* | | Fixes for aap review (audio8)Filip Gawin2019-10-2611-2315/+1240
* | | Audio fixes from SergFilip Gawin2019-10-262-27/+41
* | | Fixes for nitpicksFilip Gawin2019-10-268-129/+127
* | | Fix rebasingFilip Gawin2019-10-261-1/+1
* | | Cleanup audioFilip Gawin2019-10-262-63/+44
* | | Cleanup police radioFilip Gawin2019-10-262-962/+717
* | | More audio windowsFilip Gawin2019-10-263-51/+987
* | | More audio (to hook and test)Filip Gawin2019-10-2616-75/+574
* | | More workFilip Gawin2019-10-266-154/+269
* | | audio7Filip Gawin2019-10-268-162/+957
* | | Merge pull request #253 from erorcun/erorcunerorcun2019-10-267-8/+368
|\ \ \
| * | | Fixes&Pedseray orçunus2019-10-257-8/+368
* | | | Fixing array sizes in CMessagesSergeanur2019-10-251-17/+17
* | | | Fix CPager::Process loopSergeanur2019-10-251-0/+1
|/ / /
* | | Merge pull request #247 from Sergeanur/3dMarkerserorcun2019-10-235-17/+354
|\ \ \
| * | | Changed math functionsSergeanur2019-10-171-2/+2
| * | | Full C3dMarkersSergeanur2019-10-175-17/+354
* | | | Merge pull request #252 from Sergeanur/MessagesPagerTexterorcun2019-10-2314-124/+1262
|\ \ \ \ | |_|/ / |/| | |
| * | | FixesSergeanur2019-10-213-61/+55
| * | | Full MessagesSergeanur2019-10-217-71/+950
| * | | Full CPagerSergeanur2019-10-204-8/+225
| * | | Move MessagesSergeanur2019-10-202-0/+0
| * | | CText encoding fixesSergeanur2019-10-203-23/+71
* | | | CGame::FinalShutdownSergeanur2019-10-211-2/+15
* | | | Merge pull request #246 from Sergeanur/PoolsSergeanur2019-10-2113-51/+147
|\ \ \ \ | |/ / / |/| | |
| * | | Some CPool and CPools funcs, restoring original logic of pool lookup loopsSergeanur2019-10-1613-51/+147
| |/ /
* | | Merge pull request #248 from Nmzik/masteraap2019-10-2044-3/+304
|\ \ \ | |_|/ |/| |
| * | typo fixnmzik2019-10-191-1/+1
| * | getter and enum fixnmzik2019-10-191-2/+2
| * | CGame::Process() && CGame::ReloadIPLsnmzik2019-10-1944-3/+225
| * | CPopulation::Initialise()nmzik2019-10-182-0/+79
* | | Moved CCutsceneMgr::ms_cutsceneProcessing to privateSergeanur2019-10-193-4/+3
* | | Merge pull request #250 from Nick007J/masterNikolay Korolev2019-10-191-1/+1
|\ \ \ | |/ / |/| |
| * | fixed adrenalineNikolay Korolev2019-10-191-1/+1
|/ /
* | Fixed nasty warningsSergeanur2019-10-172-3/+2
* | Fixed train sounds not workingSergeanur2019-10-171-7/+4
* | Gangs save and missed sound enumsSergeanur2019-10-174-47/+30
|/
* Merge pull request #244 from Nick007J/mastererorcun2019-10-1612-12/+854
|\
| * Merge branch 'master' into mastererorcun2019-10-163-24/+359
| |\ | |/ |/|
* | Merge pull request #245 from erorcun/erorcunerorcun2019-10-161-5/+331
|\ \
| * | Pedseray orçunus2019-10-161-5/+331
|/ /
* | 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-1311-32/+331
| |\ | |/ |/|
* | Merge pull request #243 from erorcun/erorcunerorcun2019-10-134-8/+46
|\ \
| * | PathFind fix and some Pedseray orçunus2019-10-134-8/+46
|/ /
* | Fixed unsigned time check in CDarkelSergeanur2019-10-131-1/+1
* | Fixed widescreen turning off during cutscenesSergeanur2019-10-132-2/+17
* | quick fixNikolay Korolev2019-10-131-2/+2
* | fixed planesNikolay Korolev2019-10-131-2/+2
* | Merge pull request #239 from erorcun/erorcunerorcun2019-10-134-16/+262
|\ \
| * | Peds&fixeseray orçunus2019-10-134-16/+262
|/ /
* | Fix uninitialized orderInCatSergeanur2019-10-121-2/+2
| * copypaste errorNikolay Korolev2019-10-131-1/+1
| * 400-499Nikolay Korolev2019-10-137-13/+444
| * Merge branch 'master' into script_devNikolay Korolev2019-10-1210-23/+299
| |\ | |/ |/|
* | Merge pull request #237 from Nick007J/masterNikolay Korolev2019-10-122-4/+5
|\ \
| * | 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
|\ \ \
| * | | Fixed iteration typoSergeanur2019-10-121-2/+2
| * | | Full CRestartSergeanur2019-10-112-9/+276
* | | | Fixed wrong CAutomobile field typeSergeanur2019-10-122-2/+2
* | | | Removed !this check in CVehicle::IsWrecked, added CPed::IsNotInWreckedVehicle insteadSergeanur2019-10-123-8/+15
* | | | Merge pull request #232 from Nick007J/masterNikolay Korolev2019-10-121-1/+1
|\ \ \ \ | | |/ / | |/| |
| | | * script 400-499 startNikolay Korolev2019-10-126-10/+421
| | |/ | |/|
| * | blunderNikolay Korolev2019-10-121-1/+1
|/ /
* | Fix typo in CCarAI::GetCarToGoToCoorsSergeanur2019-10-121-1/+1
* | Logic fix in CParticleObject::UpdateAllSergeanur2019-10-121-2/+2
* | Typo fixSergeanur2019-10-121-1/+1
* | Fixed save game Load/Save failed assertion on Debug buildSergeanur2019-10-112-1/+5
* | Merge pull request #230 from Nick007J/mastererorcun2019-10-1110-51/+735
|\ \ | |/ |/|
| * CCarAI + bugfixesNikolay Korolev2019-10-106-41/+226
| * fixed stupid bugNikolay Korolev2019-10-091-9/+7
| * Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-10-0840-149/+880
| |\
| * | fixed bugsNikolay Korolev2019-10-081-53/+48
| * | mergeNikolay Korolev2019-10-0654-848/+6582
| |\ \
| * | | car AINikolay Korolev2019-10-065-16/+446
| * | | CAutoPilot and CCurvesNikolay Korolev2019-09-153-2/+80
* | | | Merge pull request #229 from Sergeanur/SaveLoadTemplatesSergeanur2019-10-1113-193/+199
|\ \ \ \
| * | | | Fix CCarGenerator Load/SaveSergeanur2019-10-102-4/+4
| * | | | Added read/write template functions for save data, small Load/Save arguments unificationSergeanur2019-10-0812-191/+197
| | |_|/ | |/| |
* | | | Single-wagon train fixSergeanur2019-10-101-1/+1
* | | | CMoneyMessages moved to SpecialFX.cppSergeanur2019-10-105-114/+111
* | | | CalculateBoundingSphereRadiusCBSergeanur2019-10-101-15/+29
|/ / /
* | | Full CGameLogicSergeanur2019-10-0819-6/+400
* | | Fixed crash when aboarding trainSergeanur2019-10-081-3/+2
* | | Fixing typo for cursor coordsSergeanur2019-10-071-1/+1
* | | Aspect ratio fix for player skin menuSergeanur2019-10-072-1/+13
* | | CHud::Draw - removed render states, readded hud toogle with second controllerSergeanur2019-10-071-8/+3
* | | Corona streaks fixSergeanur2019-10-071-3/+5
* | | Merge pull request #227 from erorcun/erorcunerorcun2019-10-073-3/+7
|\ \ \
| * | | Little fixeray orçunus2019-10-073-3/+7
|/ / /
* | | Merge pull request #226 from erorcun/erorcunerorcun2019-10-0612-55/+354
|\ \ \
| * | | Pedseray orçunus2019-10-0612-55/+354
|/ / /
* | | Radio shadow fix, RAMPAGE!! message fixSergeanur2019-10-062-4/+4
* | | CGarages::PrintMessages drawing fixesSergeanur2019-10-061-11/+11
* | | Fixing ColPoints againSergeanur2019-10-063-5/+5
* | | CHud: timer and damage fixesSergeanur2019-10-061-46/+70
* | | Possible fix for wheel bugSergeanur2019-10-061-7/+9
| |/ |/|
* | Fixed player blip heading when looking left/right/behindSergeanur2019-10-061-0/+4
* | Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFileSergeanur2019-10-064-18/+31
* | Fixed a bunch of calculation mistakes in CHudSergeanur2019-10-053-132/+158
* | Merge pull request #225 from erorcun/erorcunerorcun2019-10-054-34/+119
|\ \
| * | Fixeseray orçunus2019-10-054-34/+119
* | | Merge pull request #223 from Sergeanur/fix/WideCoronaaap2019-10-052-3/+5
|\ \ \ | |/ / |/| |
| * | Corona widescreen fixSergeanur2019-10-052-3/+5
* | | Triangular radar blipsSergeanur2019-10-055-1/+100
* | | Merge pull request #224 from erorcun/erorcunerorcun2019-10-056-173/+227
|\ \ \ | |/ / |/| |
| * | CDarkel, walkaround fixeray orçunus2019-10-056-173/+227
|/ /
* | Fix warningsSergeanur2019-10-041-4/+4
* | Merge pull request #222 from erorcun/erorcunerorcun2019-10-042-122/+256
|\ \
| * | Fix radareray orçunus2019-10-042-122/+256
| * | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-10-0411-102/+1301
| |\ \ | |/ / |/| |
* | | Fixed disappearing ammo countSergeanur2019-10-031-17/+13
* | | Merge pull request #221 from Sergeanur/FixFormatSergeanur2019-10-032-3/+2
|\ \ \
| * | | Fix formatting mistakesSergeanur2019-10-032-3/+2
|/ / /
* | | Merge pull request #220 from Sergeanur/Pickupsaap2019-10-038-85/+1178
|\ \ \
| * | | Fixed some formattingSergeanur2019-10-031-6/+2
| * | | Checks rewrittenSergeanur2019-10-032-88/+96
| * | | Drop w'sSergeanur2019-10-032-15/+15
| * | | CPickupsSergeanur2019-10-038-85/+1174
|/ / /
* | | Merge pull request #219 from Sergeanur/MoneyMessagesaap2019-10-033-0/+111
|\ \ \
| * | | No dwSergeanur2019-10-031-3/+3
| * | | Added missed config.hSergeanur2019-10-031-0/+1
| * | | CMoneyMessagesSergeanur2019-10-032-0/+110
|/ / /
* | | Merge pull request #218 from erorcun/erorcunaap2019-10-035-39/+289
|\ \ \
| | * | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-10-031-1/+1
| |/| | | |/ / |/| |
* | | Merge pull request #217 from Sergeanur/WeaveThroughPedsSectorListerorcun2019-10-031-1/+1
|\ \ \
| * | | Fix typo in CCarCtrl::WeaveThroughPedsSectorListSergeanur2019-10-031-1/+1
|/ / /
| * / Fixes & pedseray orçunus2019-10-035-39/+289
|/ /
* | Merge pull request #216 from erorcun/erorcunerorcun2019-10-012-23/+70
|\ \
| * | Mostly fixeray orçunus2019-10-012-23/+70
|/ /
* | Merge pull request #214 from erorcun/erorcunerorcun2019-10-017-95/+755
|\ \
| * | Moar pedseray orçunus2019-10-017-95/+755
* | | Merge pull request #215 from Sergeanur/FixCPickuperorcun2019-10-011-2/+5
|\ \ \ | |/ / |/| |
| * | Fix CPickupSergeanur2019-10-011-2/+5
|/ /
* | Merge pull request #213 from Sergeanur/PlayerSkinerorcun2019-09-285-4/+205
|\ \
| * | zero checkSergeanur2019-09-281-1/+1
| * | PlayerSkinSergeanur2019-09-285-4/+205
|/ /
* | Merge pull request #212 from Sergeanur/CutsceneMgrerorcun2019-09-288-2/+467
|\ \
| * | Added CUTSCENEDIRSIZE to Config enum and CUTSCENENAMESIZE macroSergeanur2019-09-283-4/+7
| * | Added f for floats, removed checks for deleteSergeanur2019-09-281-7/+5
| * | RefactoringSergeanur2019-09-282-41/+41
| * | Full CCutsceneMgrSergeanur2019-09-287-2/+466
|/ /
* | Merge pull request #211 from erorcun/erorcunerorcun2019-09-277-70/+1593
|\ \
| * | Peds, ProcessObjective and fixeseray orçunus2019-09-267-70/+1593
* | | Merge pull request #210 from erorcun/erorcunaap2019-09-203-34/+301
|\| |
| * | Pedseray orçunus2019-09-203-34/+301
|/ /
* | Merge pull request #209 from erorcun/erorcunNikolay Korolev2019-09-179-123/+827
|\ \ | |/ |/|
| * Peds, a fix and a tad of VCeray orçunus2019-09-179-123/+827
|/
* Merge pull request #208 from Nick007J/masteraap2019-09-159-50/+427
|\
| * Merge branch 'carctrl_dev'Nikolay Korolev2019-09-159-50/+427
|/|
| * CCarCtrlNikolay Korolev2019-09-159-50/+427
* | Merge pull request #207 from Nick007J/masteraap2019-09-1411-57/+666
|\|
| * fix debugNikolay Korolev2019-09-141-4/+1
| * fix typoNikolay Korolev2019-09-143-4/+4
| * Merge branch 'carctrl_dev'Nikolay Korolev2019-09-1411-57/+669
|/|
| * more CCarCtrlNikolay Korolev2019-09-148-41/+535
| * Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-09-123-25/+26
| |\
| * \ Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-09-1219-15/+503
| |\ \
| * | | DragCarToPointNikolay Korolev2019-09-127-23/+141
* | | | Merge pull request #206 from erorcun/erorcunaap2019-09-148-246/+665
|\ \ \ \ | |_|_|/ |/| | |
| * | | P.e.d.s.eray orçunus2019-09-148-246/+665
|/ / /
* | | fixed launch in space bugNikolay Korolev2019-09-121-1/+1
* | | Merge pull request #205 from erorcun/erorcunaap2019-09-123-24/+25
|\ \ \ | |_|/ |/| |
| * | Little cleanuperay orçunus2019-09-123-24/+25
* | | Merge pull request #204 from erorcun/erorcunaap2019-09-1219-15/+503
|\| |
| * | World and Pedseray orçunus2019-09-1219-15/+503
* | | Merge pull request #203 from Nick007J/masteraap2019-09-127-30/+502
|\ \ \ | |/ / |/| / | |/
| * make ATTEMPTS_TO_FIND_NEXT_NODE a defineNikolay Korolev2019-09-111-4/+6
| * ccarctrlNikolay Korolev2019-09-116-27/+118
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-09-1110-143/+1700
| |\ | |/ |/|
* | Merge pull request #202 from erorcun/erorcunaap2019-09-076-24/+485
|\ \
| * | Pedseray orçunus2019-09-076-24/+485
|/ /
* | Merge pull request #201 from erorcun/erorcunaap2019-09-063-32/+42
|\ \
| * | Fix and cancellable car entereray orçunus2019-09-053-32/+42
* | | Merge pull request #200 from erorcun/erorcunaap2019-09-045-106/+1192
|\| |
| * | CPed::ProcessControl and some cleanuperay orçunus2019-09-035-106/+1192
|/ /
* | Merge pull request #199 from Nick007J/masteraap2019-09-023-2/+268
|\ \
| | * ccarctrlNikolay Korolev2019-09-112-3/+145
| | * More CCarCtrlNikolay Korolev2019-09-025-10/+247
| |/
| * CCarCtrl Weave stuff doneNikolay Korolev2019-09-012-31/+130
| * CCarCtrl stuffNikolay Korolev2019-09-013-2/+169
|/
* Merge pull request #198 from ShFil119/audio6aap2019-08-2849-1835/+4519
|\
| * Audio fixesFilip Gawin2019-08-277-608/+95
| * CleanupFilip Gawin2019-08-2735-1085/+1553
| * More more more audioFilip Gawin2019-08-2756-963/+1674
| * CleanupFilip Gawin2019-08-2741-7968/+1434
| * More audio pedFilip Gawin2019-08-2749-252/+8804
|/
* Merge pull request #197 from Nick007J/masteraap2019-08-254-7/+197
|\
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-2517-109/+1326
| |\ | |/ |/|
* | Merge pull request #196 from erorcun/erorcunaap2019-08-238-127/+764
|\ \
| * | Pedseray orçunus2019-08-238-127/+764
|/ /
* | Merge pull request #195 from erorcun/erorcunaap2019-08-1711-15/+595
|\ \
| * | AnimViewer messages, Particle fix, Pedseray orçunus2019-08-1711-15/+595
* | | Merge pull request #194 from Nick007J/masteraap2019-08-174-22/+139
|\ \ \ | |/ / |/| |
| | * more CCarCtrlNikolay Korolev2019-08-254-7/+197
| |/
| * mergeNikolay Korolev2019-08-1748-420/+2706
| |\ | |/ |/|
* | Merge pull request #193 from erorcun/erorcunaap2019-08-165-120/+189
|\ \
| * | Little CPed fixes & Peddebugeray orçunus2019-08-165-120/+189
* | | Merge pull request #192 from erorcun/erorcunaap2019-08-152-86/+51
|\| |
| * | AnimViewer fixeseray orçunus2019-08-152-86/+51
* | | Merge pull request #191 from erorcun/erorcunaap2019-08-1526-21/+581
|\| |
| * | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-08-1521-297/+1986
| |\ \ | |/ / |/| |
* | | Merge pull request #190 from Fire-Head/masteraap2019-08-1519-292/+1983
|\ \ \
| * | | fixFire-Head2019-08-151-7/+7
| * | | Merge branch 'master' into masterFire_Head2019-08-1564-407/+6131
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #189 from Nick007J/masterNikolay Korolev2019-08-141-2/+2
|\ \ \ \
| | * | | CParticleObject done, cDMAudio doneFire-Head2019-08-1517-235/+1930
| | * | | sampman cosmetic fixFire-Head2019-08-032-44/+47
| | | * | AnimViewer!eray orçunus2019-08-1526-20/+582
| | | | * more CCarCtrlNikolay Korolev2019-08-174-22/+138
| | |_|/ | |/| |
| * | | pathetic errorsNikolay Korolev2019-08-141-2/+2
|/ / /
* | | Merge pull request #188 from erorcun/erorcunaap2019-08-136-16/+456
|\ \ \ | | |/ | |/|
| * | More pedseray orçunus2019-08-136-16/+456
|/ /
* | Merge pull request #187 from erorcun/erorcunaap2019-08-112-17/+10
|\ \
| * | Ped variables fixeray orçunus2019-08-112-17/+10
|/ /
* | appveyor fixNikolay Korolev2019-08-111-2/+2
* | Merge pull request #186 from Nick007J/masteraap2019-08-1122-51/+515
|\ \
| * | more CCarCtrlNikolay Korolev2019-08-1121-51/+433
| * | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-1013-143/+1598
| |\ \
| * | | More CCarCtrlNikolay Korolev2019-08-103-2/+84
* | | | Merge pull request #185 from erorcun/erorcunaap2019-08-115-102/+627
|\ \ \ \ | |_|/ / |/| | |
| * | | P.e.d.s. and fixeseray orçunus2019-08-115-102/+627
|/ / /
* | | finished CPathFindaap2019-08-0910-134/+1057
* | | Merge pull request #184 from erorcun/erorcunaap2019-08-084-9/+541
|\ \ \ | |/ / |/| |
| * | Pedseray orçunus2019-08-084-9/+541
|/ /
* | Merge pull request #183 from Nick007J/masteraap2019-08-0716-8/+601
|\ \
| * | Minor fixesNikolay Korolev2019-08-061-19/+21
| * | CCarCtrl::GenerateOneRandomVehicle!Nikolay Korolev2019-08-0616-8/+599
|/ /
* | fixed COMMAND_ADD_BLIP_FOR_COORD_OLDNikolay Korolev2019-08-051-0/+1
* | Merge pull request #182 from erorcun/erorcunaap2019-08-053-68/+656
|\ \
| * | CPed part 218eray orçunus2019-08-053-68/+656
|/ /
* | implemented CHeliaap2019-08-0415-52/+1187
* | Merge pull request #181 from Nick007J/masteraap2019-08-032-9/+5
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-032-1/+36
| |\ \ | |/ / |/| |
* | | Merge pull request #180 from erorcun/erorcunaap2019-08-032-1/+36
|\ \ \
| * | | A fix and a function made me notice iteray orçunus2019-08-032-1/+36
|/ / /
| * | fixed collisionNikolay Korolev2019-08-031-1/+1
| * | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #179 from Nick007J/masteraap2019-08-0314-28/+534
|\ \ \ | |_|/ |/| |
| | * fixed heading calculationNikolay Korolev2019-08-031-8/+4
| |/
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-0319-406/+9692
| |\ | |/ |/|
* | Merge pull request #178 from Fire-Head/masteraap2019-08-0219-406/+9692
|\ \
| * \ Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-08-0271-487/+4953
| |\ \
| * | | fixFire-Head2019-08-021-18/+4
| * | | sampman doneFire-Head2019-08-0219-406/+9692
| * | | Merge pull request #2 from GTAmodding/masterFire_Head2019-07-24126-1555/+11784
| |\ \ \
| | | | * RunningScript, part 4, plus some fixesNikolay Korolev2019-08-0314-28/+534
| |_|_|/ |/| | |
* | | | some CPed cleanupaap2019-08-022-102/+73
* | | | Merge pull request #177 from erorcun/erorcunaap2019-08-0210-28/+547
|\ \ \ \
| * | | | The Pedseray orçunus2019-08-0210-28/+547
|/ / / /
* | | | implemented CPlaneaap2019-07-319-40/+1048
* | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-310-0/+0
|\ \ \ \
| * \ \ \ Merge pull request #176 from Fire-Head/masteraap2019-07-291-17/+3
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | implemented CTrainaap2019-07-3115-97/+941
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * / / restore original shadows fadingFire-Head2019-07-291-17/+3
|/ / /
* | | Merge pull request #175 from erorcun/erorcunaap2019-07-294-25/+252
|\ \ \
| * | | Peds and fixeseray orçunus2019-07-294-25/+252
* | | | Merge pull request #172 from erorcun/erorcunaap2019-07-281-1/+1
|\| | |
| * | | Address fixeray orçunus2019-07-281-1/+1
* | | | Merge pull request #171 from erorcun/erorcunaap2019-07-283-27/+359
|\| | |
| * | | Peds, mainly audioeray orçunus2019-07-283-27/+359
|/ / /
* | | Merge pull request #170 from Nick007J/masterNikolay Korolev2019-07-281-1/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-280-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #169 from Nick007J/masterNikolay Korolev2019-07-282-2/+4
|\ \ \ \
| | * | | ped chat fixNikolay Korolev2019-07-281-1/+1
| |/ / /
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-2818-38/+764
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-2814-8/+671
|\ \ \ \
| * \ \ \ Merge pull request #168 from Nick007J/masteraap2019-07-2814-6/+669
| |\ \ \ \
* | | | | | CAutomobile::PreRender; whole class finishedaap2019-07-2818-38/+764
| | | * | | fixed phonesNikolay Korolev2019-07-282-2/+4
| | |/ / /
| | * | | fix debug messageNikolay Korolev2019-07-281-1/+0
| | * | | fixed wantedNikolay Korolev2019-07-281-0/+3
| | * | | fixed cargen loadNikolay Korolev2019-07-281-2/+2
| | * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-2713-174/+612
| | |\ \ \ | | |/ / / | |/| | |
| * | | | fixed intro skipNikolay Korolev2019-07-271-2/+2
|/ / / /
* | | | renamed flag to R* nameaap2019-07-273-9/+9
* | | | CAutomobile::Render; moved some math code into .cppaap2019-07-274-123/+379
* | | | fixed CAutomobile bugaap2019-07-262-6/+6
* | | | CAutomobile effect stuffaap2019-07-269-40/+222
* | | | Merge pull request #167 from Nick007J/masterNikolay Korolev2019-07-261-1/+1
|\ \ \ \
| | * | | cargen + some scriptNikolay Korolev2019-07-2713-6/+667
| |/ / /
| * / / fixed bridgeNikolay Korolev2019-07-261-1/+1
|/ / /
* | | Merge pull request #166 from Nick007J/masteraap2019-07-261-5/+5
|\ \ \
| * | | fixed wantedNikolay Korolev2019-07-261-5/+5
|/ / /
* | | CAutomobile::FireTruckControl and HydraulicControlaap2019-07-2612-20/+373
* | | Merge pull request #165 from Nick007J/masteraap2019-07-261-2/+2
|\ \ \
| * | | fight fixNikolay Korolev2019-07-261-2/+2
|/ / /
* | | Merge pull request #164 from Nick007J/masterNikolay Korolev2019-07-263-3/+3
|\ \ \
| * | | fixed remoteNikolay Korolev2019-07-263-3/+3
|/ / /
* | | Merge pull request #163 from Nick007J/masteraap2019-07-2619-21/+758
|\ \ \
| * \ \ Merge branch 'master' into masteraap2019-07-2614-146/+1000
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #162 from erorcun/erorcunaap2019-07-2610-137/+876
|\ \ \ \
| * | | | Ped & fixes, including peds dive into danger fixeray orçunus2019-07-2510-137/+876
|/ / / /
* | | | implemented CAutomobile::TankControlaap2019-07-256-10/+125
| * | | Running script part 3Nikolay Korolev2019-07-2519-21/+758
|/ / /
* | | fixed dinputaap2019-07-253-33/+44
* | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-2421-74/+2403
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into masterFire_Head2019-07-2421-74/+2403
| |\|
| | * updateFire-Head2019-07-247-41/+20
| | * shadows doneFire-Head2019-07-2420-60/+2412
| | * Merge pull request #1 from GTAmodding/masterFire_Head2019-07-110-0/+0
| | |\
* | | | fixed buoyancy; implemented CAutomobile::ProcessBuoyancyaap2019-07-246-23/+146
|/ / /
* | | implemented cBuoyancyaap2019-07-235-2/+243
* | | bit more CAutomobileaap2019-07-239-18/+219
* | | Merge pull request #161 from ShFil119/audio5aap2019-07-221-5/+3
|\ \ \
| * | | Try to fix rpg bugFilip Gawin2019-07-211-3/+1
| * | | Fix setting sampleIndexFilip Gawin2019-07-211-2/+2
|/ / /
* | | Merge pull request #160 from erorcun/erorcunaap2019-07-206-28/+507
|\ \ \
| * | | CPed continues, including some fixeseray orçunus2019-07-206-28/+507
|/ / /
* | | Merge pull request #158 from Nick007J/masterКоролев Николай Николаевич2019-07-201-1/+1
|\ \ \
| * | | fix door issueNikolay Korolev2019-07-201-1/+1
|/ / /
* | | Merge pull request #156 from Nick007J/masteraap2019-07-204-1/+17
|\ \ \
| * | | fixNikolay Korolev2019-07-201-1/+0
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-201-2/+2
| |\ \ \ | |/ / / |/| | |
* | | | Update README.mdSergey P2019-07-201-2/+2
| * | | added CPool<cAudioScriptObject, cAudioScriptObject>Nikolay Korolev2019-07-205-1/+18
|/ / /
* | | Merge pull request #155 from ThirteenAG/masteraap2019-07-201-0/+14
|\ \ \
| * | | Update .appveyor.ymlThirteenAG2019-07-201-0/+14
* | | | Merge pull request #153 from ThirteenAG/masteraap2019-07-207-35/+412
|\| | |
| * | | small cleanupThirteenAG2019-07-202-15/+2
| * | | premake and appveyor updateThirteenAG2019-07-207-35/+425
* | | | Merge pull request #154 from Nick007J/masteraap2019-07-204-35/+37
|\ \ \ \
| * | | | fixed script issuesNikolay Korolev2019-07-202-9/+11
| * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-2010-25/+23
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | one more fixaap2019-07-201-1/+1
* | | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-201-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #152 from Nick007J/masteraap2019-07-201-0/+2
| |\ \ \ \ \
* | | | | | | couple of fixesaap2019-07-209-24/+22
|/ / / / / /
| | * / / / fixed replayNikolay Korolev2019-07-202-26/+26
| |/ / / /
| * / / / fix crashNikolay Korolev2019-07-201-0/+2
|/ / / /
* | | | Merge pull request #149 from ShFil119/audio4aap2019-07-2019-409/+3438
|\ \ \ \
| * | | | fixes for #142Filip Gawin2019-07-194-5/+5
| * | | | More audio scriptFilip Gawin2019-07-193-46/+549
| * | | | more audio processFilip Gawin2019-07-196-105/+1137
| * | | | ProcessActiveQueuesFilip Gawin2019-07-194-121/+510
| * | | | ComputeDopplerEffectedFrequencyFilip Gawin2019-07-1914-279/+1384
| |/ / /
* | | | Merge pull request #151 from Nick007J/masteraap2019-07-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fixed references leakNikolay Korolev2019-07-191-1/+1
|/ / /
* | | fixed dodo bugaap2019-07-191-1/+3
* | | implemented col line renderingaap2019-07-1914-22/+354
* | | CAutomobile ctor, car spawner, fixesaap2019-07-1910-50/+232
* | | *cough*aap2019-07-191-1/+1
* | | fixed eventlist bugaap2019-07-191-1/+1
* | | CAutomobile damageaap2019-07-186-23/+323
* | | CAutomobile::ProcessControl doneaap2019-07-1812-11/+239
* | | Merge pull request #147 from erorcun/erorcunaap2019-07-1811-201/+850
|\ \ \
| * | | Wanted changes in PlayerPed/PedModelInfoeray orçunus2019-07-184-28/+26
| * | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-1824-69/+1548
| |\ \ \
| * | | | The Peds, mainly dying/injuringeray orçunus2019-07-1811-201/+852
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-1738-108/+1502
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-168-418/+405
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #148 from Nick007J/masteraap2019-07-181-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fixed car AI bugNikolay Korolev2019-07-181-0/+1
|/ / / / / /
* | | | | | more CAutomobile::ProcessControlaap2019-07-1717-37/+605
* | | | | | Merge pull request #145 from guard3/masteraap2019-07-171-24/+25
|\ \ \ \ \ \
| * | | | | | Fixed Bridgeguard32019-07-171-24/+25
* | | | | | | Merge pull request #141 from guard3/masteraap2019-07-176-8/+917
|\| | | | | |
| * | | | | | Fluffguard32019-07-176-8/+917
* | | | | | | Merge pull request #140 from Nick007J/masteraap2019-07-171-0/+1
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | dodo crash fixNikolay Korolev2019-07-171-0/+1
|/ / / / /
* | | | | renamed some variables and added files; more CAutomobile::ProcessControlaap2019-07-1720-45/+213
* | | | | Merge pull request #139 from Nick007J/masteraap2019-07-175-4/+8
|\ \ \ \ \
| * | | | | fix fixNikolay Korolev2019-07-171-1/+1
| * | | | | script fix, bomb fix, flying components fixNikolay Korolev2019-07-175-4/+8
|/ / / / /
* | | | | more fixes; started CAutomobile::ProcessControlaap2019-07-169-79/+350
* | | | | fixed mergeaap2019-07-161-2/+1
* | | | | Merge pull request #137 from erorcun/erorcunaap2019-07-1614-81/+674
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into erorcunaap2019-07-1632-435/+1374
| |\ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | Merge pull request #136 from Nick007J/masteraap2019-07-1624-15/+968
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fixNikolay Korolev2019-07-151-1/+2
| * | | | testNikolay Korolev2019-07-152-5/+5
| * | | | fixNikolay Korolev2019-07-151-2/+1
| * | | | fixed arithmeticsNikolay Korolev2019-07-141-16/+64
| * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-146-431/+411
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | started making frontend accurate to gameaap2019-07-146-431/+411
| * | | | fixed copsNikolay Korolev2019-07-145-2/+8
| * | | | RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes)Nikolay Korolev2019-07-1411-16/+337
| * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-143-229/+234
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #131 from gennariarmando/masteraap2019-07-143-229/+234
|\ \ \ \ \
| * | | | | Frontend fixes._AG2019-07-113-229/+234
| | |_|_|/ | |/| | |
* | | | | Merge pull request #135 from Nick007J/masterКоролев Николай Николаевич2019-07-131-0/+2
|\ \ \ \ \
| | | * | | Partial RunningScript part2Nikolay Korolev2019-07-1416-6/+584
| | |/ / / | |/| | |
| * | | | fixed policeDontCareNikolay Korolev2019-07-131-0/+2
|/ / / /
| | * / Phone, World, Pederay orçunus2019-07-1516-82/+676
| |/ / |/| |
* | | little change to aspect ratio definesaap2019-07-121-1/+4
* | | more CWanted; added CEventListaap2019-07-1213-90/+667
* | | CAutomobile::ProcessControlInputsaap2019-07-117-8/+154
|/ /
* | Merge pull request #130 from Fire-Head/masteraap2019-07-118-12/+1463
|\|
| * Merge branch 'master' into masterFire_Head2019-07-11141-917/+6878
| |\ | |/ |/|
* | Merge pull request #129 from erorcun/erorcunaap2019-07-102-4/+112
|\ \
| * | Fix CPhone crash, more functionseray orçunus2019-07-102-4/+112
* | | tried to fix CMenuManager::Process but still issuesaap2019-07-101-56/+60
* | | and of course the last commit didnt fix everythingaap2019-07-1019-36/+40
* | | added wrappers around math functionsaap2019-07-1031-191/+204
* | | Merge pull request #128 from erorcun/erorcunaap2019-07-107-9/+191
|\| |
| * | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-1054-249/+3963
| |\ \ | |/ / |/| |
* | | fixed COMMAND_IS_PLAYER_IN_AREA_3Daap2019-07-101-2/+2
* | | fixed some stuff in frontend, badly broke others; disabled reversed frontend for the momentaap2019-07-106-203/+323
* | | Merge pull request #127 from gennariarmando/masteraap2019-07-109-92/+305
|\ \ \
| * | | More frontend inputs._AG2019-07-109-92/+305
* | | | Merge pull request #126 from Nick007J/masteraap2019-07-107-4/+716
|\ \ \ \
| * | | | fixNikolay Korolev2019-07-091-0/+1
| * | | | sync with upstreamNikolay Korolev2019-07-0938-86/+1065
| |\ \ \ \
| * | | | | RunningScript: 1/12Nikolay Korolev2019-07-097-4/+715
* | | | | | CVehicle::ProcessWheelaap2019-07-103-48/+158
| |_|/ / / |/| | | |
* | | | | more CVehicleaap2019-07-0910-30/+278
| |/ / / |/| | |
* | | | yet more CAutomobileaap2019-07-0917-23/+201
* | | | more CAutomobileaap2019-07-0917-36/+395
* | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-081-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #123 from erorcun/erorcunaap2019-07-081-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-084-27/+1360
|\| | | |
| * | | | Merge pull request #122 from Nick007J/masteraap2019-07-084-27/+1360
| |\ \ \ \
| | * | | | Added script commandsNikolay Korolev2019-07-072-0/+1159
| | * | | | More scriptNikolay Korolev2019-07-073-7/+93
| | * | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-0716-30/+557
| | |\ \ \ \
| | * | | | | More scriptsNikolay Korolev2019-07-073-26/+114
* | | | | | | more CAutomobileaap2019-07-0818-34/+475
|/ / / / / /
| | | | * / Phone start, ped spinning and cop car fix, and some love to CPederay orçunus2019-07-107-9/+191
| | | |/ /
| | | * / One driver owns all the cars fixeray orçunus2019-07-081-0/+1
| |_|/ / |/| | |
* | | | little changes; one more function of CAutomobileaap2019-07-089-103/+138
* | | | cleaned up patching of virtual functions; started CAutomobileaap2019-07-0864-279/+772
| |/ / |/| |
* | | Merge pull request #111 from gennariarmando/masteraap2019-07-0716-30/+557
|\ \ \ | |/ / |/| |
| * | Darkel is bored._AG2019-07-071-1/+2
| * | blah_AG2019-07-072-3/+3
| * | Merge branch 'master' of https://github.com/gtamodding/re3_AG2019-07-07159-187/+389
| |\ \
| * \ \ Merge branch 'master' into master_AG2019-07-0743-1288/+3366
| |\ \ \
| * | | | Lil update._AG2019-07-073-97/+115
| * | | | Darkel/Wanted update._AG2019-07-0416-24/+531
* | | | | Merge pull request #120 from ShFil119/audio4aap2019-07-076-20/+331
|\ \ \ \ \
| * | | | | Fix reverse warn and air brakesFilip Gawin2019-07-072-11/+165
| * | | | | cAudioManager::InitialiseFilip Gawin2019-07-076-6/+167
| * | | | | cleanup AudioManagerFilip Gawin2019-07-071-7/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #121 from Nick007J/masteraap2019-07-075-55/+466
|\ \ \ \ \
| * | | | | IntoTheScripts!Nikolay Korolev2019-07-075-55/+466
| |/ / / /
* / / / / implemented CDooraap2019-07-076-19/+177
|/ / / /
| | | * fixfixfixFire-Head2019-07-112-68/+0
| | | * Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-07-112-0/+67
| | | |\
| | | | * WaterLevel doneFire-Head2019-07-118-12/+1459
| |_|_|/ |/| | |
| | | * waterupdFire-Head2019-07-112-1/+1
| | | * water fixFire-Head2019-07-111-28/+28
| | | * WaterLevel doneFire-Head2019-07-118-12/+1464
| |_|/ |/| |
* | | the great reorganizationaap2019-07-07150-36/+44
* | | finished CPhysicalaap2019-07-073-11/+55
* | | made code use TimeStepIn(Milli)Seconds; purged unnecessary inlinesaap2019-07-0711-112/+114
* | | Merge pull request #114 from Nick007J/masteraap2019-07-074-8/+163
|\ \ \
| * | | Added CUpsideDownCarCheck and CStuckCarCheckNikolay Korolev2019-07-064-8/+163
* | | | Merge pull request #115 from erorcun/erorcunaap2019-07-074-26/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-0722-223/+610
| |\ \ \ | |/ / / |/| | |
* | | | some work on vehiclesaap2019-07-069-227/+243
| |/ / |/| |
* | | misc classes finishedaap2019-07-0613-4/+374
| * | General fixeseray orçunus2019-07-074-27/+19
|/ /
* | Merge pull request #113 from erorcun/erorcunaap2019-07-066-59/+540
|\ \
| * \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-0616-1132/+2172
| |\ \
| * | | CPed...eray orçunus2019-07-066-63/+540
* | | | Merge pull request #112 from guard3/masteraap2019-07-066-7/+185
|\ \ \ \ | |_|/ / |/| | |
| * | | CBridgeguard32019-07-066-7/+185
|/ / /
* | | finished CDamageManageraap2019-07-054-102/+383
* | | Merge pull request #108 from ShFil119/audio3aap2019-07-055-970/+1282
|\ \ \
| * \ \ Merge branch 'master' into audio3aap2019-07-0519-185/+1273
| |\ \ \ | |/ / / |/| | |
* | | | implemented some CVehicle functionsaap2019-07-059-59/+502
| |/ / |/| |
* | | fixed rand (thanks nick)aap2019-07-043-7/+3
| |/ |/|
* | Merge pull request #110 from erorcun/erorcunaap2019-07-041-3/+3
|\ \
| * | Little fixeseray orçunus2019-07-041-3/+3
* | | Merge pull request #109 from erorcun/erorcunaap2019-07-0410-56/+704
|\| |
| * | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-0445-364/+1945
| |\ \ | |/ / |/| |
| * | Even more CPederay orçunus2019-07-0410-57/+705
| | * More AudioManagerFilip Gawin2019-07-045-972/+1080
| | * RandomDisplacementFilip Gawin2019-07-042-0/+21
| | * RequireDigitalHandleFilip Gawin2019-07-044-5/+30
| | * ReleaseDigitalHandleFilip Gawin2019-07-044-45/+65
| | * PlayerJustGotInCarFilip Gawin2019-07-042-2/+12
| | * CreateEntityFilip Gawin2019-07-042-7/+33
| | * Introduce totalAudioEntitiesFilip Gawin2019-07-041-4/+8
| | * SetEntityStatusFilip Gawin2019-07-042-0/+10
| | * PreTerminateGameSpecificShutdownFilip Gawin2019-07-042-0/+35
| | * DestroyEntityFilip Gawin2019-07-042-0/+20
| | * PostTerminateGameSpecificShutdownFilip Gawin2019-07-042-2/+10
| | * SetDynamicAcousticModelingStatusFilip Gawin2019-07-042-3/+9
| | * IsAudioInitialisedFilip Gawin2019-07-042-0/+9
| | * GenerateIntegerRandomNumberTableFilip Gawin2019-07-042-0/+9
| |/ |/|
* | Merge pull request #107 from Nick007J/masteraap2019-07-042-2/+2
|\ \
| * | Fixed type of m_ItemToFlashNikolay Korolev2019-07-042-2/+2
|/ /
* | Merge pull request #106 from Nick007J/masteraap2019-07-0416-15/+288
|\ \
| * | Script stuff + bug fixesNikolay Korolev2019-07-0416-15/+288
|/ /
* | Merge pull request #101 from gennariarmando/masteraap2019-07-0324-194/+1444
|\ \
| * | Update Frontend._AG2019-07-0324-194/+1444
|/ /
* | fixed boat renderingaap2019-07-031-9/+12
* | Merge pull request #89 from ShFil119/testaap2019-07-033-18/+34
|\ \
| * | Fix address of IsPedHeadAbovePosFilip Gawin2019-07-021-1/+1
| * | Check if address is used twiceFilip Gawin2019-07-022-17/+33
* | | fixed car colour texture bugaap2019-07-031-0/+1
* | | cleaned up to be closer to original gameaap2019-07-0310-134/+172
* | | Merge pull request #90 from GTAmodding/revert-88-masteraap2019-07-0224-1488/+126
|\ \ \
| * | | Revert "Implemented frontend inputs."aap2019-07-0224-1488/+126
|/ / /
* | | Merge pull request #88 from gennariarmando/masteraap2019-07-0224-126/+1488
|\ \ \ | |_|/ |/| |
| * | Removed macros from Pad.cpp:_AG2019-07-022-35/+136
| * | Implemented frontend inputs._AG2019-07-0225-125/+1386
|/ /
* | Merge pull request #86 from erorcun/erorcunaap2019-07-028-37/+70
|\ \
| * | Kangaroo cheat and bug fixeseray orçunus2019-07-028-37/+70
* | | Merge pull request #85 from erorcun/erorcunaap2019-07-013-55/+39
|\| |
| * | CPed fixeseray orçunus2019-07-013-55/+39
|/ /
* | Merge pull request #82 from erorcun/erorcunaap2019-07-0113-62/+608
|\ \
| * \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-0115-62/+446
| |\ \ | |/ / |/| |
* | | Merge pull request #81 from Nick007J/masteraap2019-06-308-27/+419
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-3036-120/+905
| |\ \ \ | |/ / / |/| | |
* | | | little cleanupaap2019-06-308-35/+27
| |_|/ |/| |
| * | Completed CReplayNikolay Korolev2019-06-304-1/+63
| * | 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-305-15/+112
| | * More CPederay orçunus2019-07-0113-62/+608
| | * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-3030-85/+878
| | |\ | |_|/ |/| |
* | | Merge pull request #80 from ShFil119/specialaap2019-06-303-9/+213
|\ \ \
| * | | Implement GetSpecialCharacterTalkSfxFilip Gawin2019-06-303-9/+213
| |/ /
* / / finished CEntityaap2019-06-3027-76/+665
|/ /
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-3098-1116/+7938
| |\ | |/ |/|
* | Merge pull request #79 from Nick007J/masteraap2019-06-307-38/+42
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-3037-317/+319
| |\ \ | |/ / |/| |
* | | Merge pull request #78 from ShFil119/cleanupaap2019-06-3037-317/+319
|\ \ \
| * | | Cleanup project a bitFilip Gawin2019-06-3037-317/+319
* | | | Merge pull request #77 from Nick007J/masteraap2019-06-3060-53/+844
|\ \ \ \ | |/ / / |/| | |
| | * | Reactivated Store(Restore)StuffIn(From)Mem, fixed bugsNikolay Korolev2019-06-307-38/+42
| |/ /
| * | PlayBackThisFrameInterpolation and all it required...Nikolay Korolev2019-06-3058-11/+662
| * | ProcessCarUpdateNikolay Korolev2019-06-296-37/+146
| * | CReplay::PlaybackThisFrame + fixesNikolay Korolev2019-06-293-7/+38
|/ /
* | fixaap2019-06-291-1/+1
* | fix hud render states; bug in coronasaap2019-06-294-717/+709
* | Merge pull request #71 from ShFil119/audio2aap2019-06-295-12/+5891
|\ \
| * | Implement the rest of GetXTalkSfxFilip Gawin2019-06-292-265/+2238
| * | Implement some GetXTalkSfx methodsFilip Gawin2019-06-295-223/+612
| * | fixes for AudioManager::GetPhraseFilip Gawin2019-06-293-15/+267
| * | AudioManager::GetPhraseFilip Gawin2019-06-293-3/+3268
* | | Merge pull request #72 from Nick007J/masteraap2019-06-296-10/+164
|\ \ \ | |/ / |/| |
| * | fixNikolay Korolev2019-06-291-1/+1
| * | fixNikolay Korolev2019-06-291-2/+0
| * | Fixed mergeNikolay Korolev2019-06-291-1/+0
| * | Merged with upstreamNikolay Korolev2019-06-2920-70/+248
| |\ \ | |/ / |/| |
| * | more replay stuff, bug fixNikolay Korolev2019-06-293-13/+63
| * | RetrievePedAnimationNikolay Korolev2019-06-291-0/+41
| * | ProcessPedUpdateNikolay Korolev2019-06-297-6/+73
| | * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2942-132/+931
| | |\ | |_|/ |/| |
* | | fixaap2019-06-291-1/+1
* | | missed two lines in CCollisionaap2019-06-291-0/+4
* | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-291-12/+12
|\ \ \
| * | | Merge pull request #70 from Nick007J/masteraap2019-06-291-12/+12
| |\| |
| | * | Changed to actual crimes namesNikolay Korolev2019-06-291-12/+12
| |/ /
* / / miscellaneous, mostly world relatedaap2019-06-2920-69/+244
|/ /
* | forgot the actual file...aap2019-06-281-0/+212
* | PS2-like MatFX from skygfxaap2019-06-282-0/+4
* | island load screen, some more CTextaap2019-06-284-8/+72
* | fixed CFileMgr, the craziest bug i ever hadaap2019-06-284-8/+5
* | misc stuff, mostly collisionaap2019-06-2816-45/+388
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-281-38/+23
| |\ | |/ |/|
* | Merge pull request #67 from gennariarmando/masteraap2019-06-281-38/+23
|\ \
| * | Little ops._AG2019-06-281-2/+2
| * | Some Hud.cpp fixes._AG2019-06-281-38/+23
* | | Merge pull request #68 from erorcun/erorcunaap2019-06-287-23/+166
|\ \ \ | |/ / |/| |
| | * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2815-229/+690
| |/| | |/ |/|
* | CHud cleanup: fixes and cosmetic treatmentaap2019-06-284-216/+233
* | CStreaming DONEaap2019-06-2811-34/+334
* | Merge pull request #59 from Nick007J/masteraap2019-06-282-0/+144
|\ \
| * | 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-274-27/+234
| |\ \
| * | | Added GangsNikolay Korolev2019-06-272-0/+133
| | | * Footstepseray orçunus2019-06-287-23/+166
| |_|/ |/| |
* | | Merge pull request #62 from erorcun/erorcunaap2019-06-272-13/+11
|\ \ \
| * | | Several little mistakes in CPederay orçunus2019-06-272-13/+11
* | | | CStreaming almost doneaap2019-06-2710-66/+421
|/ / /
* | | started filling debug menuaap2019-06-2710-12/+187
* | | Merge pull request #61 from gennariarmando/masteraap2019-06-272-72/+164
|\ \ \
| * | | Finished Hud.cpp_AG2019-06-272-72/+164
* | | | Merge pull request #60 from erorcun/erorcunaap2019-06-273-6/+6
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-274-27/+234
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix 3 bugseray orçunus2019-06-273-6/+6
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2636-68/+825
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-264-16/+61
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-262-112/+309
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2610-691/+792
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2519-498/+2545
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge pull request #57 from gennariarmando/masteraap2019-06-274-65/+115
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Reverted Pad.cpp to previous state._AG2019-06-271-10/+14
| * | | | | | | Update Wanted.cpp_AG2019-06-265-79/+125
| | |_|_|_|/ / | |/| | | | |
* | | | | | | yet more CStreamingaap2019-06-274-27/+234
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #48 from Nick007J/masteraap2019-06-2636-68/+825
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixed autobuildNikolay Korolev2019-06-261-1/+1
| * | | | | Fixed merge errorsNikolay Korolev2019-06-264-4/+4
| * | | | | Merge with upstreamNikolay Korolev2019-06-2650-677/+4811
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | blaaap2019-06-261-1/+1
* | | | | | some more CStreaming + fixes by erorcunaap2019-06-264-16/+61
| |_|_|_|/ |/| | | |
* | | | | CStreaming streamsaap2019-06-262-112/+309
| |_|_|/ |/| | |
* | | | fixed bug in CPedaap2019-06-261-3/+3
* | | | Merge pull request #51 from gennariarmando/masteraap2019-06-268-668/+773
|\ \ \ \
| * | | | Little fix #52._AG2019-06-253-26/+27
| * | | | Better organization for Frontend.cpp_AG2019-06-258-668/+772
| | |_|/ | |/| |
* | | | CPed cleanupaap2019-06-261-18/+14
* | | | Merge pull request #50 from erorcun/erorcunaap2019-06-261-50/+50
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix car animations & M16 bugeray orçunus2019-06-251-50/+50
* | | | fixed PedTypeaap2019-06-261-2/+2
| |/ / |/| |
* | | Frontend clean upaap2019-06-252-76/+185
* | | Merge pull request #49 from gennariarmando/masteraap2019-06-2519-498/+2436
|\ \ \ | |/ / |/| |
| * | Initial commit for Frontend._AG2019-06-2519-498/+2436
|/ /
* | Merge pull request #43 from erorcun/erorcunaap2019-06-2414-40/+789
|\ \
| * | CPed, CVehicle, mostly entering/exiting careray orçunus2019-06-2414-40/+789
* | | replaced some ctors; made PreRender call game functionaap2019-06-245-5/+11
* | | fixed bug in CPlaceableaap2019-06-241-40/+31
* | | more CStreamingaap2019-06-243-51/+747
|/ /
* | more Radar codeaap2019-06-234-40/+352
* | some Radar and Hud cleanup; fix in Physicalaap2019-06-239-169/+181
| * More replay stuffNikolay Korolev2019-06-2536-51/+719
| * CReplay::StorePedAnimationNikolay Korolev2019-06-232-24/+68
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-236-22/+20
| |\ | |/ |/|
* | fixed key binding, head shots, freezesaap2019-06-236-22/+20
| * StorePedUpdateNikolay Korolev2019-06-233-4/+71
|/
* Fixed little bug in Radar.cpp._AG2019-06-221-3/+3
* Merge pull request #29 from erorcun/erorcunaap2019-06-225-29/+361
|\
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-221-0/+1
| |\
| * \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-229-111/+676
| |\ \
| * | | Shotgun fix, CPed, CWeaponInfoeray orçunus2019-06-225-29/+361
* | | | Merge pull request #30 from gennariarmando/masteraap2019-06-225-24/+142
|\ \ \ \
| * | | | More CRadar stuff._AG2019-06-225-24/+142
| | |_|/ | |/| |
* | | | Merge pull request #32 from Nick007J/masteraap2019-06-2213-8/+531
|\ \ \ \ | |/ / / |/| | |
| * | | attempt to fix build errorNikolay Korolev2019-06-222-11/+3
| * | | fixed tabNikolay Korolev2019-06-221-3/+3
| * | | fixed typesNikolay Korolev2019-06-221-22/+22
| * | | fixNikolay Korolev2019-06-221-2/+2
| * | | tabifyNikolay Korolev2019-06-225-117/+117
| * | | Fixed types in BulletTrace.hNikolay Korolev2019-06-221-3/+3
| * | | Fixed types in Pickup.hNikolay Korolev2019-06-221-4/+4
| * | | Added newlines at end of fileNikolay Korolev2019-06-225-5/+5
| * | | Delete .gitignoreКоролев Николай Николаевич2019-06-221-8/+0
| * | | First commit of replay systemNikolay Korolev2019-06-2214-8/+542
| * | | First commit of replay systemNikolay Korolev2019-06-221-0/+5
* | | | blaaap2019-06-221-0/+1
| |_|/ |/| |
* | | Merge pull request #28 from gennariarmando/masteraap2019-06-214-96/+193
|\ \ \
| * | | Clean up_AG2019-06-212-14/+20
| * | | Update Radar.cpp_AG2019-06-204-92/+183
* | | | more CStreaming; fixed CFileLoaderaap2019-06-214-9/+465
* | | | Merge pull request #26 from erorcun/erayaap2019-06-2112-26/+637
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix throwable weaponseray orçunus2019-06-201-2/+3
| * | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erayeray orçunus2019-06-2011-57/+466
| |\ \ \ | | | |/ | | |/|
| * | | Big CPed updateeray orçunus2019-06-2012-26/+636
* | | | added some World definesaap2019-06-211-6/+18
| |/ / |/| |
* | | Merge pull request #27 from gennariarmando/masteraap2019-06-205-39/+78
|\ \ \ | | |/ | |/|
| * | Code clean up._AG2019-06-205-39/+78
|/ /
* / started CStreamingaap2019-06-206-18/+388
|/
* Merge pull request #25 from gennariarmando/masteraap2019-06-2016-260/+839
|\
| * Fix bug in templates.h, again._AG2019-06-201-2/+2
| * Update Radar.cpp_AG2019-06-204-16/+87
| * Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG2019-06-2016-258/+766
|/
* finally finished CVehicleModelInfoaap2019-06-205-9/+46
|\
| * implemented cHandlingDataMgraap2019-06-198-5/+457
* | typo in visibility pluginsaap2019-06-201-1/+1
* | implemented cHandlingDataMgraap2019-06-208-5/+457
|/
* implemented CObjectDataaap2019-06-1910-23/+153
* implemented CPedStatsaap2019-06-194-11/+190
* finished CPedTypeaap2019-06-194-22/+232
* some CPed flags named from SAaap2019-06-192-11/+11
* cleanup on CPed and CPedTypeaap2019-06-196-121/+151
* Merge pull request #22 from erorcun/masteraap2019-06-196-24/+166
|\
| * CPed merge fixeseray orçunus2019-06-186-108/+96
| * Merge branch 'master' of git://github.com/GTAmodding/re3eray orçunus2019-06-1861-58/+2147
| |\ | |/ |/|
* | silly mistake in CFileLoaderaap2019-06-181-2/+2
* | finished CFileLoader, except a crash!aap2019-06-1817-13/+345
* | fixed anim bugaap2019-06-172-2/+2
* | forgot main.haap2019-06-171-0/+14
* | Merge pull request #24 from gennariarmando/masteraap2019-06-171-1/+1
|\ \
| * \ Merge branch 'master' of https://github.com/gennariarmando/re3_AG2019-06-177-7/+613
| |\ \
| | * \ Merge pull request #1 from GTAmodding/master_AG2019-06-177-7/+613
| | |\ \
| * | | | Fixed health icon._AG2019-06-171-1/+1
| |/ / /
* | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-177-7/+613
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #23 from Fire-Head/masteraap2019-06-177-7/+613
| |\ \ \
| | * | | CdStream RwFreeAlign/RwMallocAlignFire-Head2019-06-177-7/+613
| | * | | Merge pull request #8 from GTAmodding/masterFire_Head2019-06-1780-714/+3839
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge pull request #7 from GTAmodding/masterFire_Head2019-06-137-6/+369
| | |\ \ \
* | | | | | first part of CFileLoaderaap2019-06-1741-45/+1182
|/ / / / /
| | | | * CPed fixeseray orçunus2019-06-184-33/+31
| | | | * CPed::Avoid and needed changeseray orçunus2019-06-174-6/+162
| |_|_|/ |/| | |
* | | | Merge pull request #20 from gennariarmando/masteraap2019-06-1717-191/+292
|\ \ \ \ | | |_|/ | |/| |
| * | | Update HUD stuff, bug and format fixes._AG2019-06-1717-191/+292
|/ / /
* | | fixed rebind bugFire_Head2019-06-171-1/+1
* | | got rid of upper case typesaap2019-06-1749-708/+701
* | | updated guidelinesaap2019-06-161-4/+37
* | | some more cleanupaap2019-06-165-56/+44
* | | Merge pull request #16 from erorcun/masteraap2019-06-169-17/+371
|\ \ \
| * | | Delete duplicate enumeray orçunus2019-06-163-183/+9
| * | | Merge branch 'master' of git://github.com/GTAmodding/re3eray orçunus2019-06-1637-91/+2629
| |\ \ \ | |/ / / |/| | |
* | | | fix the cleanup...aap2019-06-162-39/+41
* | | | some cleanupaap2019-06-165-167/+167
* | | | Merge pull request #17 from gennariarmando/masteraap2019-06-1635-55/+2619
|\ \ \ \
| * | | | Changes for the pull request._AG2019-06-161-3/+3
| * | | | Updates Draw.cpp, MusicManager.cpp._AG2019-06-1611-21/+561
| * | | | New updates for Hud.cpp and more._AG2019-06-1528-37/+2061
* | | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-152-3/+3
|\| | | |
| * | | | Merge pull request #15 from ShFil119/patch-1aap2019-06-131-1/+1
| |\ \ \ \
| | * | | | Fix value of CReplay modeFilip Gawin2019-06-131-1/+1
| |/ / / /
* | | | | silly mistake in txd storeaap2019-06-152-2/+7
| | * | | CPed fixes and needed functions for further commitseray orçunus2019-06-166-69/+330
| | * | | More CPed functions and minor fixeseray orçunus2019-06-154-11/+201
| | * | | Fix duplicate code for PedNodeeray orçunus2019-06-142-19/+2
| | * | | Some CPed functionserorcun2019-06-144-4/+131
| |/ / /
| * | | Merge pull request #14 from ShFil119/patch-1aap2019-06-131-2/+2
|/| | |
| * | | Fix typo in link to appveyor's accountFilip Gawin2019-06-131-2/+2
|/ / /
* | | Merge pull request #13 from ShFil119/CIdebugaap2019-06-133-10/+16
|\ \ \
| * | | CI add debug modeFilip Gawin2019-06-133-10/+16
| | |/ | |/|
* / | finished some classesaap2019-06-137-6/+85
|/ /
* | implemented GTA stream read functionsaap2019-06-137-6/+369
* | Merge pull request #12 from Fire-Head/masteraap2019-06-1326-137/+2230
|\|
| * Update Pad.cppFire_Head2019-06-131-4/+4
| * Update CutsceneMgr.hFire_Head2019-06-131-2/+0
| * Merge branch 'master' into masterFire_Head2019-06-1338-55/+534
| |\ | |/ |/|
* | silly mistakeaap2019-06-131-1/+1
* | fixed CFileMgr somewhat; still issues when loading savesaap2019-06-137-21/+22
* | implemented CutsceneObject; little fixesaap2019-06-1212-12/+137
* | implemented CCutsceneHead and dependenciesaap2019-06-1221-20/+374
| * Update Replay.hFire_Head2019-06-131-0/+1
| * Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-06-1317-59/+405
| |\
| | * Merge pull request #6 from GTAmodding/masterFire_Head2019-06-1217-59/+407
| | |\ | |_|/ |/| |
* | | Merge branch 'master' into masterFire_Head2019-06-123-3/+245
|\ \ \ | | |/ | |/|
* | | implemented CTimeCycleaap2019-06-129-5/+248
* | | added NodeName pluginaap2019-06-123-4/+65
* | | little cleanupaap2019-06-125-50/+60
* | | updated READMEaap2019-06-121-0/+32
| | * CPad doneFire-Head2019-06-1327-135/+2232
| |/
| * CameraCreate cosmetic fixFire-Head2019-06-121-30/+30
| * CameraCreate/CameraDestroy/CameraSize doneFire-Head2019-06-123-3/+243
| * Merge pull request #5 from GTAmodding/masterFire_Head2019-06-122-8/+18
| |\ | |/ |/|
* | fixed debugmenuaap2019-06-122-8/+18
* | Merge pull request #11 from Fire-Head/masteraap2019-06-123-175/+175
|\|
| * Merge pull request #4 from GTAmodding/masterFire_Head2019-06-1213-25/+258
| |\ | |/ |/|
* | Merge pull request #9 from ShFil119/COnscreenTimeraap2019-06-1211-23/+255
|\ \
| * | Add NUMONSCREENTIMERENTRIES in config.hFilip Gawin2019-06-123-18/+19
| * | RE more stuff from COnscreenTimerFilip Gawin2019-06-128-11/+232
| * | Add GetTranslatedName to CZoneFilip Gawin2019-06-112-2/+12
* | | animation fixesaap2019-06-122-2/+3
| | * Merge pull request #3 from GTAmodding/masterFire_Head2019-06-1225-2/+3162
| | |\ | |_|/ |/| |
* | | added animation system (with skin support for now)aap2019-06-1123-2/+3075
* | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-1110-111/+1147
|\ \ \
| * \ \ Merge pull request #8 from Fire-Head/masteraap2019-06-116-35/+872
| |\ \ \ | | |/ / | |/| |
| * | | Merge pull request #7 from Fire-Head/masterFire_Head2019-06-035-76/+275
| |\ \ \
* | | | | added CDirectoryaap2019-06-032-0/+87
|/ / / /
| | | * tmpFire-Head2019-06-113-175/+175
| | |/
| | * premake: disabled SAFESEHFire-Head2019-06-061-0/+1
| | * VK_LEFT fixFire-Head2019-06-051-0/+1
| | * win.cpp/skeleton.cpp doneFire-Head2019-06-051-34/+34
| | * input done, fixed cheats inputFire-Head2019-06-055-31/+866
| |/
| * added NO_MOVIESFire-Head2019-06-035-31/+45
| * Merge pull request #2 from GTAmodding/masterFire_Head2019-06-0224-18/+250
| |\ | |/ |/|
* | added CPhysical flags from Nickaap2019-06-022-8/+8
* | added some small bits and stubsaap2019-06-0222-10/+242
* | Merge pull request #6 from Fire-Head/masteraap2019-06-021-3/+5
|\ \
| | * gamestates fixed, mpeg now workingFire-Head2019-06-023-46/+231
| |/
| * mouse fixedFire-Head2019-06-021-3/+5
| * Merge pull request #1 from GTAmodding/masterFire_Head2019-06-022-3/+4
| |\ | |/ |/|
* | fixed mergeaap2019-06-022-3/+4
* | Merge pull request #5 from Fire-Head/masteraap2019-06-02237-452/+258828
|\|
| * Merge branch 'master' into masterFire_Head2019-06-0224-46/+1505
| |\ | |/ |/|
* | implemented splashes; fixed zonesaap2019-06-0114-91/+241
* | added CPointLightsaap2019-06-015-3/+366
* | more RW lightsaap2019-06-013-2/+174
* | added CCoronasaap2019-06-0111-4/+782
* | Merge pull request #4 from Fire-Head/masteraap2019-05-3119-333/+2423
|\ \
| | * skeleton updated, windows specific stuff addedFire-Head2019-06-02237-452/+258832
| |/
| * rw skeletonFire-Head2019-05-3119-333/+2423
|/
* more high level functionsaap2019-05-3128-24/+415
* CCredits name cleanupaap2019-05-312-391/+391
* Merge branch 'master' of github.com:GTAmodding/re3aap2019-05-319-15/+39
|\
| * Merge pull request #3 from Fire-Head/masteraap2019-05-309-15/+39
| |\
| | * fixed CParticle crash && RandTableFire-Head2019-05-309-15/+39
| |/
* / added CCreditsaap2019-05-314-0/+529
|/
* added CTextaap2019-05-306-1/+260
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-3065-157/+779
* fixed ped statesaap2019-05-301-3/+6
* added CMBluraap2019-05-309-7/+301
* added CAntennasaap2019-05-304-0/+167
* clean upaap2019-05-3020-301/+114
* Merge pull request #2 from Fire-Head/masteraap2019-05-2924-125/+3152
|\
| * fix2Fire-Head2019-05-291-2/+2
| * fixFire-Head2019-05-292-3/+3
| * Updates, CTimer startedFire-Head2019-05-2916-35/+336
| * Particle, ParticleMgr doneFire-Head2019-05-2914-121/+2847
* | implemented some of CCam and dependenciesaap2019-05-2913-42/+1367
|/
* more CVehicleModelInfoaap2019-05-284-2/+237
* implemented bits of CWorldaap2019-05-2815-44/+915
* implemented CFileMgr (barf)aap2019-05-244-1/+330
* updated READMEaap2019-05-221-0/+6
* Merge branch 'master' of github.com:GTAmodding/re3aap2019-05-222-1/+22
|\
| * Merge pull request #1 from ShFil119/appveyoraap2019-05-202-1/+22
| |\
| | * Store artifactsFilip Gawin2019-05-191-0/+2
| | * AppVeyorFilip Gawin2019-05-192-1/+20
| |/
* | added CFontaap2019-05-226-19/+656
* | finished CSprite(2d)aap2019-05-215-192/+730
|/
* CPhysical almost doneaap2019-05-1912-60/+804
* more work on CPhysicalaap2019-05-18106-103/+57865
* fixed pathfindaap2019-05-171-14/+17
* reversed CPhysical::ProcessShiftSectorListaap2019-05-1710-7/+235
* renames and a fixaap2019-05-153-98/+97
* first commitaap2019-05-15116-0/+15132