Commit Graph
100 Commits
Author SHA1 Message Date
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
Nikolay Korolev 67701df91f fix debug 2019-09-14 21:06:10 +03:00
Nikolay Korolev fbe09534d9 fix typo 2019-09-14 20:58:09 +03:00
Nikolay Korolev 84186e7b0f Merge branch 'carctrl_dev' 2019-09-14 20:54:56 +03:00
Nikolay Korolev 57f24ad533 more CCarCtrl 2019-09-14 20:53:04 +03:00
Nikolay Korolev 3e71c15b33 Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-09-12 19:15:13 +03:00
Nikolay KorolevandGitHub 4041159855 fixed launch in space bug 2019-09-12 19:13:32 +03:00
Nikolay Korolev 571e65db4f Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-09-12 13:12:22 +03:00
Nikolay Korolev a3aea359b2 DragCarToPoint 2019-09-12 13:11:13 +03:00
Nikolay Korolev 426efa9ecb make ATTEMPTS_TO_FIND_NEXT_NODE a define 2019-09-11 22:12:43 +03:00
Nikolay Korolev 05b01c5ff5 ccarctrl 2019-09-11 21:42:34 +03:00
Nikolay Korolev c86c9b3118 Merge remote-tracking branch 'upstream/master' 2019-09-11 17:52:07 +03:00
Nikolay Korolev 448d5a8857 ccarctrl 2019-09-11 17:51:40 +03:00
Nikolay Korolev b2236d8951 More CCarCtrl 2019-09-02 19:04:09 +03:00
Nikolay Korolev 3c0bbb10f3 CCarCtrl Weave stuff done 2019-09-01 20:38:35 +03:00
Nikolay Korolev cd30a76dc5 CCarCtrl stuff 2019-09-01 17:02:23 +03:00
Nikolay Korolev 16624e174b Merge remote-tracking branch 'upstream/master' 2019-08-25 16:48:13 +03:00
Nikolay Korolev 64cef333c8 more CCarCtrl 2019-08-25 16:47:22 +03:00
Nikolay Korolev 13233ccaed merge 2019-08-17 15:46:19 +03:00
Nikolay Korolev c16849d4a2 more CCarCtrl 2019-08-17 15:44:25 +03:00
Nikolay KorolevandGitHub cf8375343b Merge pull request #189 from Nick007J/master
pathetic errors
2019-08-14 22:36:16 +03:00
Nikolay Korolev 291f73e3c7 pathetic errors 2019-08-14 22:35:02 +03:00
Nikolay KorolevandGitHub 1497dbaa8d appveyor fix 2019-08-11 23:43:11 +03:00
Nikolay Korolev 14b945ba08 more CCarCtrl 2019-08-11 20:11:54 +03:00
Nikolay Korolev 6a7fdadeaa Merge remote-tracking branch 'upstream/master' 2019-08-10 10:44:39 +03:00
Nikolay Korolev 0303955de3 More CCarCtrl 2019-08-10 10:44:19 +03:00
Nikolay Korolev c2a7c448ba Minor fixes 2019-08-07 00:42:38 +03:00
Nikolay Korolev 4ae4bc94c6 CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
Nikolay KorolevandGitHub 20d1381a0f fixed COMMAND_ADD_BLIP_FOR_COORD_OLD 2019-08-06 00:13:01 +03:00
Nikolay Korolev 45a8295029 Merge remote-tracking branch 'upstream/master' 2019-08-03 21:43:34 +03:00
Nikolay Korolev d3ddfd8e40 fixed collision 2019-08-03 21:43:07 +03:00
Nikolay Korolev 2fb5187e51 Merge remote-tracking branch 'upstream/master' 2019-08-03 18:51:41 +03:00
Nikolay Korolev 537f0dfc16 fixed heading calculation 2019-08-03 18:51:19 +03:00
Nikolay Korolev a3bdaccafb Merge remote-tracking branch 'upstream/master' 2019-08-03 16:02:09 +03:00
Nikolay Korolev ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
Nikolay KorolevandGitHub 17de819ef8 Merge pull request #170 from Nick007J/master
ped chat fix
2019-07-28 19:52:30 +03:00
Nikolay Korolev 6c017fc29d Merge remote-tracking branch 'upstream/master' 2019-07-28 19:51:54 +03:00
Nikolay Korolev aac7acd785 ped chat fix 2019-07-28 19:51:13 +03:00
Nikolay KorolevandGitHub 179a34177f Merge pull request #169 from Nick007J/master
fixed phone
2019-07-28 15:53:26 +03:00
Nikolay Korolev f7c93fc15c Merge remote-tracking branch 'upstream/master' 2019-07-28 15:52:39 +03:00
Nikolay Korolev 6fa6837baa fixed phones 2019-07-28 15:49:42 +03:00
Nikolay Korolev 6dfb2ca79e fix debug message 2019-07-28 13:38:25 +03:00
Nikolay Korolev 128d31746d fixed wanted 2019-07-28 13:35:24 +03:00
Nikolay Korolev 6ff6305be9 fixed cargen load 2019-07-28 12:57:25 +03:00
Nikolay Korolev d62225968b Merge remote-tracking branch 'upstream/master' 2019-07-27 21:28:42 +03:00
Nikolay Korolev 345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
Nikolay KorolevandGitHub fc5fc602ba fixed intro skip 2019-07-27 20:44:22 +03:00
Nikolay KorolevandGitHub 0c447c70e4 Merge pull request #167 from Nick007J/master
fixed bridge
2019-07-26 18:02:33 +03:00
Nikolay Korolev efdd44cd68 fixed bridge 2019-07-26 18:01:56 +03:00
Nikolay Korolev 4658ebfdc2 fixed wanted 2019-07-26 17:29:28 +03:00
Nikolay Korolev dae2d30d8f fight fix 2019-07-26 13:39:56 +03:00
Nikolay KorolevandGitHub c63de7ec43 Merge pull request #164 from Nick007J/master
fixed remote
2019-07-26 10:45:36 +03:00
Nikolay Korolev fe53007919 fixed remote 2019-07-26 10:44:56 +03:00
Nikolay Korolev 5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
Королев Николай НиколаевичandGitHub 4c6d247b2a Merge pull request #158 from Nick007J/master
fix door issue
2019-07-20 23:13:05 +03:00
Nikolay Korolev b0f3ecdb63 fix door issue 2019-07-20 23:12:12 +03:00
Nikolay Korolev da9eef47a5 fix 2019-07-20 18:04:23 +03:00
Nikolay Korolev 4e4be46105 Merge remote-tracking branch 'upstream/master' 2019-07-20 18:01:33 +03:00
Nikolay Korolev a951996943 added CPool<cAudioScriptObject, cAudioScriptObject> 2019-07-20 18:00:57 +03:00