Commit Graph

1375 Commits

Author SHA1 Message Date
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
Wes Hampson
5bc51f8462 Save SimpleVars, Scripts, and a few others 2020-03-10 20:27:41 -07:00
Wes Hampson
28342405d3 Add Load/Save functions 2020-03-10 20:26:07 -07:00
Wes Hampson
4fee2cbdd9 Begin work on GenericSave 2020-03-05 01:44:42 -08:00
Nikolay Korolev
1d8b3a216c more utils 2020-03-05 01:10:09 +03:00
Nikolay Korolev
24ad650eb3 Merge branch 'master' into script_dev 2020-03-04 23:14:54 +03:00
Nikolay Korolev
19488323ea
Merge pull request #342 from Nick007J/master
fixed dummyobject bug
2020-03-04 23:14:17 +03:00
Nikolay Korolev
8c13eab30a fixed dummyobject bug 2020-03-04 23:13:45 +03:00
Nikolay Korolev
2058ca6bbb more utils 2020-03-04 23:12:16 +03:00
Nikolay Korolev
0a3211d0cf Merge branch 'master' into script_dev 2020-03-02 22:54:47 +03:00
Nikolay Korolev
d492390fec script utils 2020-03-02 22:54:13 +03:00
erorcun
de68d726a3
Merge pull request #340 from erorcun/erorcun
Fixes and cleanup
2020-03-02 03:09:51 +03:00
eray orçunus
a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
Nikolay Korolev
f72453d03e
Merge pull request #336 from Nick007J/master
script utilities 1
2020-03-01 23:48:48 +03:00
Nikolay Korolev
90ff2f73eb Merge branch 'master' into script_dev 2020-03-01 17:44:37 +03:00
Nikolay Korolev
5eccf44e7a review fixes 2020-03-01 17:42:47 +03:00
Nikolay Korolev
ceab73a053 merge with upstream 2020-03-01 14:19:42 +03:00
Nikolay Korolev
64b28c0730 save/load 2020-03-01 14:18:10 +03:00
erorcun
971f3cb177
Merge pull request #339 from erorcun/erorcun
fixes
2020-03-01 04:46:12 +03:00
eray orçunus
ae523a09a7 fixes 2020-03-01 04:44:58 +03:00
erorcun
625a43064a
Merge pull request #338 from erorcun/erorcun
CPopulation 3 and fixes
2020-02-29 17:40:39 +03:00
eray orçunus
750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00