Commit Graph

1296 Commits

Author SHA1 Message Date
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin
0e817230af Remove all constexpr 2020-03-22 17:30:54 +01:00
Filip Gawin
b57e4febb0 fix include 2020-03-22 17:30:54 +01:00
Filip Gawin
39462a3865 Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
a097f225bc Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
337924c794 Cleanup audio code + fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
Filip Gawin
8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
Filip Gawin
7c425ac4ac Implement ProcessGarages + small cleanup 2020-03-22 17:30:54 +01:00
Filip Gawin
3b8a177470 Implement SetupJumboEngineSound 2020-03-22 17:30:54 +01:00
Filip Gawin
67398809a3 Implement ProcessFires 2020-03-22 17:30:54 +01:00
Filip Gawin
0d1f42add1 Implement ProcessCrane 2020-03-22 17:30:54 +01:00
Filip Gawin
31382bc22c Implement ProcessCesna 2020-03-22 17:30:54 +01:00
Nikolay Korolev
d1d123dc6a missing endlines 2020-03-22 19:19:07 +03:00
Nikolay Korolev
c29a85a443 console init 2020-03-22 18:48:16 +03:00
Nikolay Korolev
360d9cf889 merge with master 2020-03-22 17:26:18 +03:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
Sergeanur
5e37c3e805 Console 2020-03-22 16:19:10 +02:00
aap
f9342c7e83
Merge pull request #350 from Nick007J/master
bullet traces
2020-03-22 14:41:03 +01:00
aap
398cc6bbec fixed vehicle rendering bug 2020-03-22 11:40:18 +01:00
Nikolay Korolev
7d213a1f32 bullet traces fixes 2020-03-22 13:20:36 +03:00
Nikolay Korolev
65e8558794 Merge remote-tracking branch 'upstream/master' 2020-03-22 13:09:18 +03:00
erorcun
23f2ab5ff1
Merge pull request #348 from erorcun/erorcun
ProcessButtonPresses and fixes
2020-03-22 04:50:38 +03:00
erorcun
b17935b89e
Merge branch 'master' into erorcun 2020-03-22 04:49:24 +03:00
Nikolay Korolev
b557e3afe7 Merge remote-tracking branch 'upstream/master' 2020-03-21 20:15:12 +03:00
Nikolay Korolev
c2f5dfdb1e bullet traces 2020-03-21 20:14:29 +03:00
Nikolay Korolev
fdfffbcba9
Merge pull request #349 from Nick007J/master
purple nines glitch fix
2020-03-21 20:11:08 +03:00
Nikolay Korolev
b4f99c19a4
readme update 2020-03-21 15:34:05 +03:00
Nikolay Korolev
ac610b7e6e fixed erroneous assumption 2020-03-21 15:13:38 +03:00
eray orçunus
d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
Nikolay Korolev
795e07c882 purple nines glitch fix 2020-03-21 14:29:03 +03:00
erorcun
31d16d395e
Merge pull request #346 from Sergeanur/Radar2
Finished CRadar, a bit of CExplosion
2020-03-17 20:47:12 +03:00
erorcun
53e65a32cd
Merge branch 'master' into Radar2 2020-03-17 20:46:37 +03:00
erorcun
7aa5d16b53
Merge pull request #347 from Nick007J/master
replay fixes + script crash fix
2020-03-17 20:41:59 +03:00
erorcun
1ab6702ea6
Merge pull request #345 from whampson/save-stuff
GenericSave() done
2020-03-17 20:35:18 +03:00
Sergeanur
e57ad65d05 Finished CRadar, a bit of CExplosion 2020-03-17 00:22:43 +02:00
Nikolay Korolev
1971b3db62 Merge remote-tracking branch 'upstream/master' 2020-03-15 18:47:36 +03:00
Nikolay Korolev
152d8c2f40 replay bug fixes, script bug fix 2020-03-15 18:47:21 +03:00
Wes Hampson
f35758a8f1 Use WriteDataToBufferPointer 2020-03-13 21:23:03 -07:00
Wes Hampson
afeac54860 Spacing fix 2020-03-13 13:50:23 -07:00
Wes Hampson
3862cda231 Style fix, use CTimeStep 2020-03-13 13:47:53 -07:00
Wes Hampson
8280dda9cb Add CTimeStep 2020-03-13 13:46:59 -07:00
erorcun
3e78600420
Merge pull request #344 from erorcun/erorcun
CPopulation done, CCopPed and fixes
2020-03-12 02:33:55 +03:00
Wes Hampson
0283dbcd12 Fix merge conflict 2020-03-11 15:49:19 -07:00
erorcun
4cc0fc1696
Merge branch 'master' into erorcun 2020-03-12 00:57:35 +03:00
erorcun
33f89dba25
Merge pull request #343 from Nick007J/master
script utils 2
2020-03-12 00:54:02 +03:00
eray orçunus
934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
Wes Hampson
018fb3a929 Style fixes 2020-03-11 14:15:27 -07:00
Wes Hampson
81c4f75c63 Bugfixes, GenericSave() works now! 2020-03-11 14:08:10 -07:00
Wes Hampson
c7f16879df GenericSave complete, still needs some testing 2020-03-11 00:12:40 -07:00