mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-05-16 11:42:20 +00:00
Code Issues Projects Releases Wiki Activity
3958 commits 3 branches 0 tags 56 MiB
Commit graph

158 commits

Author SHA1 Message Date
Nikolay Korolev 2f979a8cde some changes 2020-05-11 01:00:41 +03:00
Nikolay Korolev 00cdcef36a some updates for script 2020-05-10 17:54:13 +03:00
Nikolay Korolev a827f0dd55 sync with upstream 2020-05-10 12:26:32 +03:00
Nikolay Korolev 2f7d2fa3ad more car control 2020-05-10 12:25:30 +03:00
Sergeanur 35c41208f5 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
 2020-05-10 01:26:12 +03:00
Nikolay Korolev 9fce6c4ed3 car control fixes 2020-05-09 22:24:31 +03:00
Nikolay Korolev 609caad7a4 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-09 20:21:36 +03:00
Nikolay Korolev a55e738dfa ccarctrl big fix 2020-05-09 20:21:13 +03:00
aap 97d5698e0c peds starting to work 2020-05-09 17:05:26 +02:00
Nikolay Korolev e30b538cd3 fix 2020-05-09 00:07:35 +03:00
Nikolay Korolev 46d891b745 fix 2020-05-09 00:00:06 +03:00
Nikolay Korolev 7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
Nikolay Korolev f902136b6a fix 2020-05-08 18:50:16 +03:00
Nikolay Korolev 75943a57b2 gang 2020-05-08 18:48:44 +03:00
Nikolay Korolev 6065f5e52b fix 2020-05-08 17:05:54 +03:00
Nikolay Korolev fb1f51241d
fix 2020-05-08 13:41:28 +03:00
Nikolay Korolev db26700352 final fix 2020-05-08 11:49:40 +03:00
Nikolay Korolev 49cf53644a reasonable spawns 2020-05-08 11:43:27 +03:00
Nikolay Korolev 44c5cdf453 tmp stuff 2020-05-08 11:11:09 +03:00
Nikolay Korolev b99346e6ca sync with upstream 2020-05-07 23:22:15 +03:00
Nikolay Korolev 2dc818e4d2 intermediate changes 2020-05-07 23:21:36 +03:00
aap 19b21cafcd CZoneInfo mostly done; not its dependencies 2020-05-07 17:53:38 +02:00
Nikolay Korolev 5780b4503e sync with upstream 2020-05-07 16:59:40 +03:00
Nikolay Korolev 40888e9486 car control and friends 2020-05-07 16:57:49 +03:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
Nikolay Korolev d5e76471ae Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 19:04:52 +03:00
aap f1c1f56b12 CSphere and CBox for CColModel 2020-05-06 17:56:38 +02:00
Nikolay Korolev f45ea0a1cf Merge remote-tracking branch 'upstream/miami' into miami 2020-05-05 20:22:17 +03:00
Nikolay Korolev 918d6dbf56 some more miami 2020-05-05 20:22:13 +03:00
aap e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
Sergeanur 22e8b0e419 Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL" 
This reverts commit 1eb817de77.

# Conflicts:
#	src/core/Game.cpp
 2020-05-05 18:34:46 +03:00
Sergeanur 12fbf8cede Merge branch 'master' into miami 
# Conflicts:
#	src/core/Game.cpp
 2020-05-05 18:33:32 +03:00
Sergeanur 1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Nikolay Korolev edeb8736f1 remove ifdefs 2020-05-05 18:20:10 +03:00
Sergeanur c2b9ddc5b8 Revert "Remove Miami stuff" 
This reverts commit 9960c41193.
 2020-05-05 18:04:43 +03:00
Sergeanur 9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
Sergeanur dfe0642195
Merge pull request #512 from Nick007J/master 
MIAMI CAutoPilot + CCarAI + multiple fixes
 2020-05-05 17:14:13 +03:00
Nikolay Korolev ae0c83fa01 CAutoPilot + CCarAI + fixes 2020-05-05 14:40:35 +03:00
aap b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Nikolay Korolev 131e8af174
Merge pull request #508 from Nick007J/master 
Scripts compatible saving + CCarCtrl bug + crusher coach bug
 2020-05-04 19:52:26 +03:00
Nikolay Korolev d1a46c35ce fixed spawn bug 2020-05-04 14:57:49 +03:00
aap 67467f15d1 GTA_BRIDGE and GTA_TRAIN defines 2020-05-03 17:28:54 +02:00
aap 702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Sergeanur d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Nikolay Korolev 0fc505926f fix annoying bug 2020-04-24 01:32:17 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Nikolay Korolev 5cb7e2e42a
Merge pull request #440 from Fire-Head/master 
CWeapon done, fixes
 2020-04-15 23:28:09 +03:00
Fire-Head daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
aap c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
Sergeanur 8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +03:00
Sergeanur 97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
eray orçunus 112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
eray orçunus d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
Sergeanur 3d69148497 Added enum to OnscreenTimer, fixed mistakes in CCarCtrl::SteerAIBoatWithPhysicsHeadingForTarget 2020-02-01 18:40:54 +02:00
Sergeanur 79d2ab7619 More fixes 2020-01-31 19:16:13 +02:00
Sergeanur 43bd2227a8 CRemote 2020-01-31 12:23:15 +02:00
Sergeanur bbc68ffb1c AccidentManager 2020-01-11 15:14:02 +02:00
Nikolay Korolev 0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Sergeanur 5b1ffb0912 Some CPool and CPools funcs, restoring original logic of pool lookup loops 2019-10-17 00:53:25 +03:00
Nikolay Korolev bd6ded198b fixes 2019-10-12 22:19:54 +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 e10f5ee6a3 merge 2019-10-06 14:26:50 +03:00
Nikolay Korolev 26f7691031 car AI 2019-10-06 14:25:13 +03:00
Sergeanur bd6e109441 Fix typo in CCarCtrl::WeaveThroughPedsSectorList 2019-10-03 02:39:23 +03:00
eray orçunus 0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
Nikolay Korolev 7234e6e698 CAutoPilot and CCurves 2019-09-15 13:29:38 +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
eray orçunus 88f0ef75e8 P.e.d.s. 2019-09-14 02:24:53 +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 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 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
eray orçunus 8f18f84836 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-08-15 17:54:49 +03:00
eray orçunus 5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
Nikolay Korolev 291f73e3c7 pathetic errors 2019-08-14 22:35:02 +03:00
Nikolay Korolev 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 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 Korolev 5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
aap fd01f9b25c CAutomobile::ProcessControl done 2019-07-18 15:41:09 +02:00
aap ba242bcf58 more CAutomobile::ProcessControl 2019-07-17 23:58:06 +02:00
aap 0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00
Nikolay Korolev b77a9ce955 RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes) 2019-07-14 14:49:27 +03:00
Nikolay Korolev 7fae683316 Script stuff + bug fixes 2019-07-04 01:16:24 +03:00