Commit Graph
100 Commits
Author SHA1 Message Date
Nikolay KorolevandGitHub 5966e627f0 fix bug 2020-04-08 15:17:07 +03:00
Nikolay KorolevandGitHub 8ee98574ff fix bug 2020-04-08 14:16:59 +03:00
Nikolay KorolevandGitHub 8e29a5ec88 bug fix 2020-04-08 14:06:27 +03:00
Nikolay KorolevandGitHub 3a8cbf393a Update README.md 2020-04-06 19:55:20 +03:00
Nikolay KorolevandGitHub 7342ca7af0 Update README.md 2020-04-06 19:54:49 +03:00
Nikolay KorolevandGitHub 4feb5f3f8c Update README.md 2020-04-06 19:52:24 +03:00
Nikolay KorolevandGitHub 3175f2ee48 Merge pull request #383 from Nick007J/master
fixed build
2020-04-06 19:46:52 +03:00
Nikolay Korolev ab25c8cc98 fixed build 2020-04-06 19:46:09 +03:00
Nikolay KorolevandGitHub 81d945488d Merge pull request #382 from Nick007J/master
Cranes
2020-04-06 19:31:54 +03:00
Nikolay Korolev 4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev cf804dee91 Merge remote-tracking branch 'upstream/master' 2020-04-06 19:28:04 +03:00
Nikolay KorolevandGitHub 182ecd301f Merge pull request #354 from PerikiyoXD/master
Implement Init for Stats
2020-04-06 19:26:38 +03:00
Nikolay KorolevandGitHub b991fd9766 Merge branch 'master' into master 2020-04-06 19:26:04 +03:00
Nikolay Korolev e6e51492f0 review fixes 2020-04-06 11:19:29 +03:00
Nikolay Korolev 7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
Nikolay Korolev 7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
Nikolay Korolev 9436b5a8a5 Merge branch 'master' into garages_dev 2020-04-05 12:47:27 +03:00
Nikolay KorolevandGitHub 35a2cc29f7 Merge pull request #380 from Nick007J/master
Shoreside garage fix
2020-04-05 12:46:14 +03:00
Nikolay Korolev 5cbcaa57d7 Merge remote-tracking branch 'upstream/master' 2020-04-05 12:45:30 +03:00
Nikolay Korolev 30b8d7300b shoreside garage fix 2020-04-05 12:44:58 +03:00
Nikolay Korolev 057b28e39b cranes init 2020-04-05 12:35:51 +03:00
Nikolay Korolev bd0cd13be1 Merge remote-tracking branch 'upstream/master' 2020-04-01 23:47:57 +03:00
Nikolay Korolev b7d7dca626 Merge branch 'garages_dev' 2020-04-01 01:59:21 +03:00
Nikolay Korolev 347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
Nikolay KorolevandGitHub 8ff8a4de5e Merge pull request #372 from Nick007J/master
CGarages done
2020-04-01 01:58:28 +03:00
Nikolay Korolev e34631adce review fixes 2020-04-01 00:07:09 +03:00
Nikolay Korolev e2ed468018 Merge remote-tracking branch 'upstream/master' 2020-03-31 23:54:39 +03:00
Nikolay Korolev 357d88a4a8 fix 2020-03-31 01:00:06 +03:00
Nikolay Korolev 2a1b11e1dc Merge branch 'master' of https://github.com/Nick007J/re3 2020-03-31 00:54:20 +03:00
Nikolay Korolev b3bfde0db0 added forgotten function 2020-03-31 00:53:51 +03:00
Nikolay KorolevandGitHub fcf7b99077 Update README.md 2020-03-31 00:50:09 +03:00
Nikolay Korolev 24e4ecf5bb bug fixes, reorganisation 2020-03-31 00:46:44 +03:00
Nikolay Korolev 1b0368ee7d Merge branch 'master' into garages_dev 2020-03-31 00:01:52 +03:00
Nikolay Korolev 50b43b680e finished garages 2020-03-31 00:01:03 +03:00
Nikolay Korolev 23c6a28324 Merge branch 'master' into garages_dev 2020-03-29 18:54:26 +03:00
Nikolay Korolev 3a4e2275de fixed PS2 build 2020-03-29 18:53:58 +03:00
Nikolay Korolev 24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
Nikolay Korolev 0db35f8275 more garages 2020-03-29 18:48:57 +03:00
Nikolay Korolev 02615ccd98 fix 2020-03-29 02:09:02 +03:00
Nikolay Korolev 38c2f8fbb0 fixes 2020-03-29 01:48:49 +03:00
Nikolay Korolev 92edf92570 Merge branch 'master' into garages_dev 2020-03-28 23:42:11 +03:00
Nikolay Korolev 93417853ed fixes 2020-03-28 23:41:37 +03:00
Nikolay Korolev 101c21e064 merge with master 2020-03-28 20:55:15 +03:00
Nikolay Korolev 775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
Nikolay Korolev 9fb101fdd9 Merge branch 'master' into garages_dev 2020-03-28 15:24:55 +03:00
Nikolay Korolev 268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
Nikolay Korolev 861506d048 merge with upstream 2020-03-22 19:47:14 +03: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
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
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 KorolevandGitHub fdfffbcba9 Merge pull request #349 from Nick007J/master
purple nines glitch fix
2020-03-21 20:11:08 +03:00
Nikolay KorolevandGitHub 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
Nikolay Korolev 795e07c882 purple nines glitch fix 2020-03-21 14:29:03 +03: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
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 KorolevandGitHub 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
Nikolay KorolevandGitHub 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
Nikolay Korolev 4d9853b0ce removed debug leftovers 2020-02-24 21:18:11 +03:00
Nikolay Korolev 56c83dfaae more stuff + intro fix 2020-02-24 21:17:15 +03:00
Nikolay Korolev 6260d51d44 Merge branch 'master' into script_dev 2020-02-24 12:10:59 +03:00
Nikolay Korolev 7d78879c48 more stuff 2020-02-24 12:10:21 +03:00
Nikolay Korolev 0255f5d15f more cosmetic stuff 2020-02-23 14:06:12 +03:00
Nikolay Korolev 1721a74466 stuff 2020-02-23 13:30:37 +03:00
Nikolay Korolev 1ba696f5fc some changes 2020-02-23 13:12:44 +03:00
Nikolay Korolev aa5266b1b3 some cosmetic stuff 2020-02-23 02:29:38 +03:00
Nikolay Korolev bc139e0702 ARRAY_SIZE 2020-02-22 17:53:28 +03:00
Nikolay Korolev 1366c58d59 removed extra include 2020-02-22 17:19:56 +03:00
Nikolay Korolev a122d558a2 merge + bug fix 2020-02-22 15:53:41 +03:00
Nikolay Korolev a312e1ff81 merge 2020-02-22 15:36:22 +03:00
Nikolay Korolev 3481e431c9 fixes 2020-02-22 15:35:46 +03:00
Nikolay Korolev 1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev a36da99798 review fixes 2020-02-16 12:44:33 +03:00
Nikolay Korolev 85d815cf9d bug fixes 2020-02-15 23:30:51 +03:00
Nikolay Korolev a361fc0ff5 sync with upstream 2020-02-15 14:54:46 +03:00
Nikolay Korolev 043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
Nikolay Korolev 7547f7ae97 Merge branch 'master' of https://github.com/Nick007J/re3 2020-02-02 15:23:33 +03:00
Nikolay Korolev 911f3360de Merge remote-tracking branch 'upstream/master' 2020-02-02 15:22:35 +03:00
Nikolay KorolevandGitHub c794b59a7c fixed firetruck crash 2020-02-02 15:22:17 +03:00
Nikolay KorolevandGitHub 2c0b67c92f fixed firetruck crash 2020-02-02 15:19:19 +03:00
Nikolay Korolev 2baacf0e9e Merge remote-tracking branch 'upstream/master' 2020-02-02 14:47:16 +03:00
Nikolay Korolev dc2516896f script 900-999 init 2020-02-02 14:47:03 +03:00
Nikolay KorolevandGitHub b0e4f40f44 fixed SET_BOAT_CRUISE_SPEED 2020-02-02 14:09:39 +03:00
Nikolay KorolevandGitHub bedf19c523 fixed police ignore bug 2020-02-02 13:29:13 +03:00
Nikolay KorolevandGitHub 5fa16fe91a Merge pull request #319 from Nick007J/master
fix ai bug (2)
2020-02-02 12:29:05 +03:00