aboutsummaryrefslogtreecommitdiffstats
path: root/src/control
Commit message (Expand)AuthorAgeFilesLines
* removed windows.h for most .cppsaap2020-03-271-0/+1
* Merge pull request #357 from aap/masteraap2020-03-272-0/+10
|\
| * implemented some unused PS2 camsaap2020-03-272-2/+2
| * Finished CCam; various smaller thingsaap2020-03-272-0/+10
* | CCopPed 2 and fixeseray orçunus2020-03-264-15/+49
|/
* change default script to storyaap2020-03-241-1/+1
* merge with upstreamNikolay Korolev2020-03-225-28/+71
|\
| * Cleanup audio code + fixes for reviewFilip Gawin2020-03-221-16/+18
| * Remove unneeded double to float castsFilip Gawin2020-03-222-6/+6
| * Fixes for Serge's reviewFilip Gawin2020-03-224-11/+11
| * Implement ProcessCraneFilip Gawin2020-03-221-0/+41
* | CGame::InitialiseNikolay Korolev2020-03-224-0/+6
|/
* bullet traces fixesNikolay Korolev2020-03-221-2/+2
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-224-17/+15
|\
| * Merge branch 'master' into erorcunerorcun2020-03-223-7/+4
| |\
| * | ProcessButtonPresses and fixeseray orçunus2020-03-214-16/+15
* | | bullet tracesNikolay Korolev2020-03-211-6/+6
| |/ |/|
* | fixed erroneous assumptionNikolay Korolev2020-03-211-4/+0
* | purple nines glitch fixNikolay Korolev2020-03-212-3/+5
|/
* Merge pull request #347 from Nick007J/mastererorcun2020-03-173-80/+209
|\
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-151-1/+1
| |\
| * | replay bug fixes, script bug fixNikolay Korolev2020-03-153-80/+209
* | | Merge pull request #345 from whampson/save-stufferorcun2020-03-174-1/+10
|\ \ \ | |_|/ |/| |
| * | Fix merge conflictWes Hampson2020-03-112-34/+455
| |\|
| * | Add Load/Save functionsWes Hampson2020-03-105-3/+12
* | | Merge branch 'master' into erorcunerorcun2020-03-122-34/+455
|\ \ \ | | |/ | |/|
| * | more utilsNikolay Korolev2020-03-051-23/+72
| * | more utilsNikolay Korolev2020-03-041-20/+131
| * | script utilsNikolay Korolev2020-03-021-28/+119
| * | Merge branch 'master' into script_devNikolay Korolev2020-03-012-166/+178
| |\|
| * | save/loadNikolay Korolev2020-03-012-3/+173
* | | CPopulation done, CCopPed and fixeseray orçunus2020-03-121-1/+1
| |/ |/|
* | review fixesNikolay Korolev2020-03-012-165/+169
* | merge with upstreamNikolay Korolev2020-03-011-1/+9
|\ \ | |/ |/|
| * fixeseray orçunus2020-03-011-0/+8
| * CPopulation 3 and fixeseray orçunus2020-02-271-1/+1
* | removed debug leftoversNikolay Korolev2020-02-241-3/+0
* | more stuff + intro fixNikolay Korolev2020-02-242-23/+633
* | Merge branch 'master' into script_devNikolay Korolev2020-02-241-3/+3
|\|
| * script fixeseray orçunus2020-02-231-3/+3
* | more stuffNikolay Korolev2020-02-241-12/+646
* | more cosmetic stuffNikolay Korolev2020-02-231-0/+5
* | stuffNikolay Korolev2020-02-232-4/+10
* | some changesNikolay Korolev2020-02-233-301/+307
* | some cosmetic stuffNikolay Korolev2020-02-232-118/+244
|/
* ARRAY_SIZENikolay Korolev2020-02-221-2/+2
* mergeNikolay Korolev2020-02-225-152/+10
|\
| * CPopulation 2eray orçunus2020-02-191-1/+4
| * Merge pull request #328 from erorcun/erorcunerorcun2020-02-174-148/+6
| |\
| | * CPopulation 1eray orçunus2020-02-174-148/+6