aboutsummaryrefslogtreecommitdiffstats
path: root/src/control
Commit message (Expand)AuthorAgeFilesLines
* Audio stuff moved around, removed MusicManager dependencies, eMusicMode used ...Sergeanur2019-10-261-3/+3
* Fixed CGameLogic::PassTime typesSergeanur2019-10-261-1/+1
* Fixes for aap review (audio8)Filip Gawin2019-10-261-1/+1
* Fixes for nitpicksFilip Gawin2019-10-261-29/+22
* Fix rebasingFilip Gawin2019-10-261-1/+1
* audio7Filip Gawin2019-10-261-22/+29
* Merge pull request #252 from Sergeanur/MessagesPagerTexterorcun2019-10-241-6/+6
|\
| * Full MessagesSergeanur2019-10-211-6/+6
* | Merge pull request #246 from Sergeanur/PoolsSergeanur2019-10-216-21/+18
|\ \ | |/ |/|
| * Some CPool and CPools funcs, restoring original logic of pool lookup loopsSergeanur2019-10-176-21/+18
* | Merge pull request #248 from Nmzik/masteraap2019-10-2020-2/+124
|\ \
| * | CGame::Process() && CGame::ReloadIPLsnmzik2019-10-1920-2/+45
| * | CPopulation::Initialise()nmzik2019-10-182-0/+79
* | | Moved CCutsceneMgr::ms_cutsceneProcessing to privateSergeanur2019-10-191-1/+1
|/ /
* / Gangs save and missed sound enumsSergeanur2019-10-172-44/+28
|/
* Merge branch 'master' into mastererorcun2019-10-162-19/+28
|\
| * More PathFind fixesSergeanur2019-10-141-5/+6
| * Some PathFind fixes (not all)Sergeanur2019-10-142-14/+22
* | Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-10-144-8/+15
|\|
| * PathFind fix and some Pedseray orçunus2019-10-142-6/+13
| * Fixed unsigned time check in CDarkelSergeanur2019-10-131-1/+1
| * quick fixNikolay Korolev2019-10-131-2/+2
* | copypaste errorNikolay Korolev2019-10-131-1/+1
* | 400-499Nikolay Korolev2019-10-133-12/+416
* | Merge branch 'master' into script_devNikolay Korolev2019-10-125-13/+282
|\|
| * Merge pull request #237 from Nick007J/masterNikolay Korolev2019-10-122-4/+5
| |\
| | * 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
* | | script 400-499 startNikolay Korolev2019-10-122-10/+403
|/ /
* | blunderNikolay Korolev2019-10-121-1/+1
* | Fix typo in CCarAI::GetCarToGoToCoorsSergeanur2019-10-121-1/+1
* | Typo fixSergeanur2019-10-121-1/+1
* | Merge pull request #230 from Nick007J/mastererorcun2019-10-117-34/+721
|\ \ | |/ |/|
| * CCarAI + bugfixesNikolay Korolev2019-10-113-25/+213
| * fixed stupid bugNikolay Korolev2019-10-091-9/+7
| * Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-10-0810-18/+344
| |\
| * | fixed bugsNikolay Korolev2019-10-081-53/+48
| * | mergeNikolay Korolev2019-10-068-226/+1331
| |\ \
| * | | car AINikolay Korolev2019-10-064-15/+445
| * | | CAutoPilot and CCurvesNikolay Korolev2019-09-153-2/+80
* | | | Merge pull request #229 from Sergeanur/SaveLoadTemplatesSergeanur2019-10-118-138/+123
|\ \ \ \
| * | | | Fix CCarGenerator Load/SaveSergeanur2019-10-102-4/+4
| * | | | Added read/write template functions for save data, small Load/Save arguments ...Sergeanur2019-10-087-136/+121
| | |_|/ | |/| |
* / | | CMoneyMessages moved to SpecialFX.cppSergeanur2019-10-101-1/+1
|/ / /
* | | Full CGameLogicSergeanur2019-10-086-1/+324
* | | Pedseray orçunus2019-10-074-6/+9
* | | CGarages::PrintMessages drawing fixesSergeanur2019-10-061-11/+11
| |/ |/|