aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-2478-8/+11
|\
| * Merge branch 'miami' into lcsSergeanur2021-07-224-8/+11
| |\
| | * Possible fix of RemoveAndAdd crashSergeanur2021-07-221-5/+5
| | * Fix falling damageSergeanur2021-07-221-1/+1
| | * Fix enum useSergeanur2021-07-221-1/+1
| | * Fix Predator shooting soundSergeanur2021-07-221-1/+1
| | * fix garbage data written in garage save blockwithmorten2021-07-191-0/+3
| * | Merge branch 'miami' into lcsSergeanur2021-07-1874-0/+0
| |\|
| | * render -> renderer (original name)Sergeanur2021-07-1874-0/+0
* | | fixNikolay Korolev2021-07-172-3/+3
* | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-176-386/+831
|\| |
| * | Merge remote-tracking branch 'origin/miami' into lcswithmorten2021-07-153-383/+822
| |\|
| | * Merge pull request #1219 from withmorten/miami-iniwithmorten2021-07-153-383/+822
| | |\
| | | * miami: switch out current ini_parser.hpp with pulzed/mINIwithmorten2021-07-123-383/+822
| | * | Make PS2 VB files work together with PC audio filesSergeanur2021-07-154-71/+1234
| * | | Merge branch 'miami' into lcsSergeanur2021-07-153-3/+9
| |\| |
| | * | Remove stupid castSergeanur2021-07-151-1/+1
| | * | Fix NearPed count going negativeMagnus Larsen2021-07-131-0/+1
| | * | disable USE_CUTSCENE_SHADOW_FOR_PED if COMPATIBLE_SAVES isn't definedwithmorten2021-07-131-1/+6
| | * | Enable cutscene shadowsSergeanur2021-07-131-1/+1
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-132-0/+11
|\| | |
| * | | Merge remote-tracking branch 'origin/miami' into lcswithmorten2021-07-122-0/+11
| |\| |
| | * | fix FixGarageswithmorten2021-07-121-0/+7
| | * | Vanilla config for Windows and win-x86 onlywithmorten2021-07-121-0/+4
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-1232-449/+1333
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-07-1232-449/+1333
| |\| |
| | * | Reorganize config.hSergeanur2021-07-121-128/+52
| | |/
| | * Merge pull request #1150 from withmorten/miami-saveserorcun2021-07-1228-166/+1118
| | |\
| | | * finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-1028-166/+1118
| | * | get rid of // done comments in audiomanager.hwithmorten2021-07-111-174/+174
| | * | tiny diff fixwithmorten2021-07-111-1/+1
| | * | fix hotring flap stat linewithmorten2021-07-111-0/+4
| | * | Physical: division by zero fixerorcun2021-07-101-0/+4
* | | | small changesNikolay Korolev2021-07-121-0/+10
* | | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-1112-69/+57
|\| | |
| * | | Merge branch 'miami' into lcsSergeanur2021-07-102-3/+9
| |\| |
| | * | fix jittery cars at 15fpswithmorten2021-07-091-3/+4
| | * | add librw defines to vanilla defines undefswithmorten2021-07-091-0/+5
| | |/
| * | Remove redundant SampleManager.InitialiseChannel callSergeanur2021-07-101-1/+0
| * | Merge branch 'miami' into lcsSergeanur2021-07-097-25/+16
| |\|
| | * Use CPad functions to check key states in script loaderSergeanur2021-07-082-19/+6
| | * fix macro redefinition warnings on win-glfw buildwithmorten2021-07-082-1/+3
| | * fix sampman_null buildwithmorten2021-07-071-6/+6
| | * fix: add missing limits.h includes to enable bulding on musl.mssx862021-07-052-0/+2
| | * fix screenshot namewithmorten2021-07-031-1/+1
| * | Mission audio cleanup + sound pauseSergeanur2021-07-093-40/+32
* | | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-07-0415-98/+138
|\| |
| * | Merge branch 'miami' into lcsSergeanur2021-07-0315-98/+138
| |\|
| | * Fix overflow in audio codeSergeanur2021-07-031-1/+1
| | * Sanitizer fixes 2erorcun2021-07-033-14/+15