archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-04 21:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,143 Commits 3 Branches 0 Tags
8623bc97526a2b16ba48f3626722efed2892f539
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikolay Korolev 76b8e09de5 fix ai bug (2) 2020-02-02 12:28:23 +03:00
Nikolay KorolevandGitHub a72e71f265 Merge pull request #315 from Nick007J/master 
fixed ai bug
 2020-02-02 03:22:00 +03:00
Nikolay Korolev c1dc66c63e fixed ai bug 2020-02-02 03:21:21 +03:00
Nikolay KorolevandSergeanur e4f1ab20f1 fixed bullion run 2020-02-02 01:43:04 +02:00
Nikolay Korolev c5e7de02fe fixes 2020-01-04 01:10:35 +03:00
Nikolay Korolev 0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev 42ff0f7c58 bug fixes 2020-01-01 23:55:01 +03:00
Nikolay Korolev c05c516ce7 Merge remote-tracking branch 'upstream/master' into script_dev 2020-01-01 16:01:06 +03:00
Nikolay KorolevandGitHub 84fcda618d Merge pull request #284 from Nick007J/master 
fixed vehicle enter crash
 2020-01-01 16:00:17 +03:00
Nikolay Korolev a19a6a7c0f fixed vehicle enter crash 2020-01-01 15:59:08 +03:00
Nikolay Korolev b307893c9d bug fix 2020-01-01 15:16:38 +03:00
Nikolay Korolev 402ecd6305 fix merge with upstream 2020-01-01 02:55:00 +03:00
Nikolay Korolev 90233baffe fix merge 2020-01-01 02:44:13 +03:00
Nikolay Korolev 5b0cf80a76 merge with upstream 2020-01-01 02:42:00 +03:00
Nikolay Korolev 80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
Nikolay Korolev 5ef291ddf2 Merge remote-tracking branch 'upstream/master' into script_dev 2019-11-09 16:44:36 +03:00
Nikolay Korolev cc9a49d061 script stubs 2019-11-09 16:44:17 +03:00
Nikolay Korolev 6224060627 Merge remote-tracking branch 'upstream/master' into script_dev 2019-10-27 12:51:24 +03:00
Nikolay Korolev 5e77e9d0ea script 600-699 2019-10-27 12:51:09 +03:00
Nikolay Korolev dcd2a94367 fix pager build 2019-10-26 17:27:48 +03:00
Nikolay Korolev 3dee880c29 merge 2019-10-26 17:20:31 +03:00
Nikolay Korolev 542e746f66 script 500-599 2019-10-26 17:16:39 +03:00
Nikolay Korolev d579ee1b64 script 500-599 plus bugfix 2019-10-22 00:39:59 +03:00
Nikolay KorolevandGitHub 52cef5b157 Merge pull request #250 from Nick007J/master 
fixed adrenaline
 2019-10-19 12:38:09 +03:00
Nikolay Korolev 63e39fd8bf fixed adrenaline 2019-10-19 12:37:31 +03:00
Nikolay Korolev f93285df79 Merge remote-tracking branch 'upstream/master' into script_dev 2019-10-14 00:44:48 +03:00
Nikolay KorolevandGitHub 545bd3322c quick fix 2019-10-13 20:13:39 +03:00
Nikolay Korolev 2411558bab copypaste error 2019-10-13 20:12:15 +03:00
Nikolay KorolevandGitHub 483dfbbf1b fixed planes 2019-10-13 18:15:14 +03:00
Nikolay Korolev 8eda735918 400-499 2019-10-13 14:46:09 +03:00
Nikolay Korolev a1700eeaa4 Merge branch 'master' into script_dev 2019-10-12 22:24:58 +03:00
Nikolay KorolevandGitHub 225ad5d78e Merge pull request #237 from Nick007J/master 
fixes
 2019-10-12 22:23:37 +03:00
Nikolay Korolev bd6ded198b fixes 2019-10-12 22:19:54 +03:00
Nikolay Korolev c78fff8d54 script 400-499 start 2019-10-12 22:00:31 +03:00
Nikolay KorolevandGitHub 6f96098549 Merge pull request #232 from Nick007J/master 
blunder
 2019-10-12 13:43:11 +03:00
Nikolay Korolev a34870645a blunder 2019-10-12 13:42:34 +03:00
Nikolay Korolev 803412f33b CCarAI + bugfixes 2019-10-11 00:02:55 +03:00
Nikolay Korolev 80a74d2e77 fixed stupid bug 2019-10-09 01:00:51 +03:00
Nikolay Korolev 9e5a5f2ab6 Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-10-08 23:57:58 +03:00
Nikolay Korolev 4b4e5abffd fixed bugs 2019-10-08 23:57:21 +03:00
Nikolay Korolev e10f5ee6a3 merge 2019-10-06 14:26:50 +03:00
Nikolay Korolev 26f7691031 car AI 2019-10-06 14:25:13 +03:00
Nikolay KorolevandGitHub 5d98e12b85 Merge pull request #209 from erorcun/erorcun 
Peds, a fix and a tad of VC
 2019-09-17 23:43:43 +03:00
Nikolay Korolev 7234e6e698 CAutoPilot and CCurves 2019-09-15 13:29:38 +03:00
Nikolay Korolev 8355a6dccd Merge branch 'carctrl_dev' 2019-09-15 02:28:55 +03:00
Nikolay Korolev 368ce0d4e5 CCarCtrl 2019-09-15 02:28:07 +03:00