Commit Graph
100 Commits
Author SHA1 Message Date
NikolayandGitHub d90de7f13c Merge pull request #943 from x87/miami
Update command definitions
2021-01-10 12:25:18 +03:00
NikolayandGitHub b7f9bfda4a fail 2021-01-09 02:41:27 +03:00
Nikolay Korolev e92666d988 wtf 2021-01-08 18:57:59 +03:00
Nikolay Korolev 824ca7599c wtf 2021-01-08 13:07:36 +03:00
Nikolay Korolev f8569a74cb fix 2021-01-08 12:59:51 +03:00
Nikolay Korolev 9d6db921bd fail 2021-01-07 18:31:54 +03:00
Nikolay Korolev db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
NikolayandGitHub 08ddef6a93 Merge pull request #929 from majesticCoding/miami
GET_WHEELIE_STATS fix
2021-01-06 23:04:39 +03:00
Nikolay Korolev a6680e38d5 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-05 00:48:40 +03:00
Nikolay Korolev 6fa081e004 fix 2021-01-05 00:48:25 +03:00
Nikolay Korolev 601f77b5c8 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-04 21:03:31 +03:00
Nikolay Korolev 2d072325ad fix 2021-01-04 21:03:19 +03:00
Nikolay Korolev 33f467453e dumb 2021-01-03 23:36:32 +03:00
Nikolay Korolev 21e151cadd hud fix 2021-01-03 20:06:29 +03:00
Nikolay Korolev 0392145512 obsolete comment 2021-01-03 19:03:13 +03:00
Nikolay Korolev 06fd054eb3 fixed intro text line defaults 2021-01-03 18:56:05 +03:00
Nikolay Korolev 5e019ed9f8 fixed array size 2021-01-03 13:57:27 +03:00
Nikolay Korolev 29e0cfa98b fix 2021-01-03 12:52:26 +03:00
Nikolay Korolev a7f053776a Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 23:06:44 +03:00
Nikolay Korolev c75c4603fc bad stuff 2021-01-01 23:06:20 +03:00
Nikolay Korolev 4604b45852 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 14:53:37 +03:00
Nikolay Korolev 9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Nikolay Korolev 2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00
Nikolay Korolev a9bf0fa97e Merge remote-tracking branch 'upstream/miami' into miami 2020-12-31 19:30:11 +03:00
Nikolay Korolev 56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
Nikolay Korolev f6fe5c96c9 Merge remote-tracking branch 'upstream/miami' into miami 2020-12-26 12:56:34 +03:00
Nikolay Korolev 149aef929d fixed replay 2020-12-26 12:56:20 +03:00
Nikolay Korolev 5f98b4fdca Merge remote-tracking branch 'upstream/miami' into miami 2020-12-25 12:12:09 +03:00
Nikolay Korolev 86f04884de fix garage 2020-12-25 12:11:22 +03:00
Nikolay Korolev 8cc3f867a6 fixed double explosion 2020-12-24 17:44:59 +03:00
NikolayandGitHub c995bdcdaf Merge pull request #893 from Nick007J/master
Collective implementation in script
2020-12-24 17:22:28 +03:00
Nikolay Korolev dcb28bfd53 fix 2020-12-20 17:12:34 +03:00
Nikolay Korolev db012aa9e0 Merge remote-tracking branch 'upstream/master' 2020-12-20 17:08:21 +03:00
Nikolay Korolev fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
NikolayandGitHub 867133e93d Merge pull request #891 from Nick007J/miami
merge master to miami
2020-12-19 19:15:52 +03:00
Nikolay Korolev b6298915dd fixed cmakelists 2020-12-19 16:21:33 +03:00
Nikolay Korolev 196a13b1cc removed renderer stuff 2020-12-19 14:52:32 +03:00
Nikolay Korolev 76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
Nikolay Korolev 17efc38e35 removed cullzones stuff from renderer 2020-12-19 12:27:16 +03:00
Nikolay Korolev bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev e3aac6263f Merge remote-tracking branch 'upstream/miami' into miami 2020-12-19 03:21:32 +03:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
Nikolay Korolev 8fb461b873 removed obsolete ifdef (since we have GTA_REPLAY) 2020-12-13 00:20:44 +03:00
Nikolay Korolev 6d61f9d2e1 fixed replay bugs 2020-12-12 23:17:16 +03:00
Nikolay Korolev f5330990b1 Merge remote-tracking branch 'upstream/master' 2020-12-12 23:05:47 +03:00
Nikolay Korolev 01c95378e1 fixed some replay bugs 2020-12-12 23:05:12 +03:00
Nikolay Korolev bfe382c315 better fix 2020-12-12 21:06:14 +03:00
Nikolay Korolev 229b8f304a fixed a bug 2020-12-12 20:37:26 +03:00
Nikolay Korolev 82c40b73ca fixed a bug 2020-12-12 20:35:17 +03:00
Nikolay Korolev 78718700f9 quick fix 2020-12-12 13:00:40 +03:00
Nikolay Korolev 4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03:00
Nikolay Korolev 016ff5b4aa sync with upstream 2020-12-08 12:00:24 +03:00
Nikolay Korolev 406f646949 pool stuff fix 2020-12-06 21:28:40 +03:00
Nikolay Korolev 17a939e38d quick fix 2020-12-06 19:34:43 +03:00
Nikolay Korolev f6818f9654 Merge remote-tracking branch 'upstream/miami' into miami 2020-12-06 19:32:07 +03:00
NikolayandGitHub b5cdc33e7c Merge pull request #865 from Nick007J/miami
script from other platforms and unused commands
2020-12-06 19:31:20 +03:00
Nikolay Korolev fe918d41c2 garages revision + some fixes 2020-12-06 19:30:51 +03:00
NikolayandGitHub 14eb0cd286 fixed parenthesis 2020-12-06 15:27:42 +03:00
NikolayandGitHub efb28b888d fixed ANCHOR_BOAT 2020-12-05 22:26:45 +03:00
Nikolay Korolev a82188ac07 lil fix 2020-12-05 12:12:56 +03:00
Nikolay Korolev 0bd373cd56 script from other platforms and unused commands 2020-12-05 02:49:32 +03:00
Nikolay Korolev 4b9f1680a3 fast fix 2020-12-02 02:41:05 +03:00
Nikolay Korolev fda58fb1df added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03:00
Nikolay Korolev c0ca3c7a3e Merge remote-tracking branch 'upstream/master' 2020-12-02 02:18:38 +03:00
Nikolay Korolev bcc51f4a28 Merge remote-tracking branch 'upstream/master' 2020-12-01 01:47:10 +03:00
Nikolay Korolev a3b83a5d2f Merge remote-tracking branch 'upstream/master' 2020-11-30 02:15:35 +03:00
Nikolay Korolev 8f05ccd6c4 small garages revision + small template stuff 2020-11-30 02:15:03 +03:00
Nikolay Korolev 8cb3c07151 some nasty FIX_BUGS for SLIDE_OBJECT 2020-11-28 21:26:38 +03:00
Nikolay Korolev f50a53e290 fix garages 2020-11-27 19:18:51 +03:00
NikolayandSergeanur 2b53f267a7 one more fix
# Conflicts:
#	src/control/Restart.cpp
2020-11-22 23:13:43 +02:00
NikolayandSergeanur 6a6551f39b small improvement
# Conflicts:
#	src/control/Restart.cpp
2020-11-22 23:13:23 +02:00
NikolayandGitHub 222e7f56ff one more fix 2020-11-22 02:31:52 +03:00
NikolayandGitHub d24e1ee592 small improvement 2020-11-22 02:29:17 +03:00
NikolayandGitHub 6b6b600cee no script logging 2020-11-21 21:12:47 +03:00
NikolayandGitHub b508458f37 small fix 2020-11-16 15:13:30 +03:00
Nikolay Korolev 15b7126243 small fix of fix 2020-11-16 12:28:20 +03:00
Nikolay Korolev 0ac621588e small fix 2020-11-16 12:22:55 +03:00
Nikolay Korolev 26c6908d25 car AI revision 2020-11-14 14:21:56 +03:00
Nikolay Korolev 6682e56f71 small fix 2020-11-13 17:53:03 +03:00
Nikolay Korolev 3048a77a05 fix 2020-11-13 16:02:06 +03:00
Nikolay Korolev a3f24d1bbf Merge remote-tracking branch 'upstream/miami' into miami 2020-11-13 13:20:07 +03:00
Nikolay Korolev 2e915780aa some fixes 2020-11-13 13:19:54 +03:00
Nikolay Korolev 55c9a81922 fixed zone bug 2020-11-12 17:32:16 +03:00
Nikolay a76c6b2307 damn 2020-11-11 13:40:11 +03:00
NikolayandGitHub 984708dfd3 damn 2020-11-11 13:36:10 +03:00
a8b5303207 Update src/control/Pickups.cpp
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
2020-11-11 13:19:21 +03:00
Nikolay Korolev 35874b5fd2 fix 2020-11-11 12:27:40 +03:00
Nikolay Korolev a67d4c70d7 Merge remote-tracking branch 'upstream/miami' into miami 2020-11-11 12:22:57 +03:00
Nikolay Korolev be92957328 fixed top gear 2020-11-11 12:21:30 +03:00
Nikolay Korolev 612a6dd06c Merge remote-tracking branch 'upstream/miami' into miami 2020-11-11 00:08:54 +03:00
Nikolay Korolev ef2089cafb CWorld done 2020-11-11 00:08:32 +03:00
Nikolay Korolev e473123a6a fixes 2020-11-03 00:07:25 +03:00
Nikolay Korolev 0ccc70c843 embarassing 2020-11-02 23:53:52 +03:00
Nikolay Korolev bae6c24209 fix 2020-11-02 15:54:42 +03:00
Nikolay Korolev 5edd9e75da finished script and replay 2020-11-01 18:21:05 +03:00
Nikolay Korolev 45c09224f7 fixed KYFC 2020-11-01 16:34:39 +03:00
Nikolay Korolev 370d693f9d the driver fix 2020-11-01 15:15:23 +03:00
Nikolay Korolev 63a27fbc5f overflow fix 2020-11-01 13:55:29 +03:00
Nikolay Korolev f21cfef8fb remove autosave at end of mission under MISSION_REPLAY 2020-11-01 12:33:16 +03:00
Nikolay Korolev 3bdc974ff5 small glass fix 2020-10-25 20:53:05 +03:00