Commit Graph

625 Commits

Author SHA1 Message Date
aap
5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
Nikolay Korolev
00cdcef36a some updates for script 2020-05-10 17:54:13 +03:00
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Nikolay Korolev
61eb361d26 script changes 2020-05-10 15:23:56 +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
Sergeanur
d9a3533438 Small unification 2020-05-10 01:14:00 +03:00
Nikolay Korolev
9fce6c4ed3 car control fixes 2020-05-09 22:24:31 +03:00
Nikolay Korolev
3de003a8e7 new curves + boat fix 2020-05-09 22:11:40 +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
aap
989ded6052 removed cutscene heads 2020-05-09 13:00:39 +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
c11a20cb4f zone info commands + fix 2020-05-08 16:16:46 +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
f80474f590 little script change 2020-05-07 18:08:17 +02: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
5c30b3a188 got rid of superfluous enum; update librw 2020-05-07 12:48:57 +02:00
Sergeanur
bef436400d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/modelinfo/ModelIndices.h
2020-05-07 13:42:50 +03:00
aap
05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap
876e402d1e dont hardcode first vehicle ID; little fix for roadblocks 2020-05-07 09:38:07 +02:00
aap
a8d8c0690d changed default ID ranges. old default.ide incompatible now 2020-05-06 23:39:38 +02:00
Nikolay Korolev
a7c17a329a
fixed lane offset 2020-05-07 00:27:10 +03:00
aap
a1c229784f
Merge pull request #518 from Nick007J/miami
script stubs + REQUEST_COLLISION
2020-05-06 21:55:10 +02:00
aap
965ea93a61 checked some of streaming for VC changes 2020-05-06 21:54:43 +02:00
Nikolay Korolev
599b7301c8 script stubs + REQUEST_COLLISION 2020-05-06 21:15:58 +03: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
8c036ec671 sync with master 2020-05-06 14:42:41 +03:00
aap
e0568a19d5 new zone stuff 2020-05-06 12:23:57 +02:00
aap
cbfc45b3f7 some work on zones 2020-05-06 12:23:26 +02:00
Nikolay Korolev
e5da4c2b4d Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 01:11:18 +03:00
Nikolay Korolev
0b104a59fe script colstore stuff 2020-05-06 01:11:06 +03:00
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
Nikolay Korolev
35bf340401 colstore support in script 2020-05-06 00:21:26 +03:00
Nikolay Korolev
1291dd534b script stuff 2020-05-05 21:45:43 +03: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
Nikolay Korolev
6b4b708fa7 skipped one def 2020-05-05 19:06:24 +03: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
cb8ffbac73 Revert "Remove #endif"
This reverts commit 7200a783ee.
2020-05-05 18:07:43 +03:00
Sergeanur
74b522af71 Merge branch 'master' into miami 2020-05-05 18:07:33 +03:00
Sergeanur
7200a783ee Remove #endif 2020-05-05 18:07:08 +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
Sergeanur
fcd386f55d
Merge pull request #510 from aap/master
implemented most of streamed collisions and big buildings
2020-05-05 17:14:01 +03:00
Nikolay Korolev
fc81a8cbe2
fixed traffic lights 2020-05-05 16:10:22 +03:00
aap
b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur
4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur
e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
Nikolay Korolev
ee261c996b Merge remote-tracking branch 'upstream/master' 2020-05-05 14:40:56 +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
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03: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
Nikolay Korolev
926e216dd4 Merge remote-tracking branch 'upstream/master' 2020-05-03 01:43:12 +03:00
Nikolay Korolev
fa29804c49 script compatibility 2020-05-03 01:42:46 +03:00
Sergeanur
7fc33d85f7
Merge pull request #504 from Sergeanur/PadInputSwitch
Switching pad modes and cheats when player is switching between controller and kb&m
2020-05-03 00:12:54 +03:00
Sergeanur
d2712afc78 Add CURMODE macro 2020-05-03 00:11:02 +03:00
Sergeanur
fc85bb710b Fix COMMAND_GET_CONTROLLER_MODE 2020-05-02 19:39:36 +03:00
Sergeanur
ba8aa38654 Switching pad modes and cheats when player is switching between controller and kb&m 2020-05-02 19:39:36 +03:00
Nikolay Korolev
7d067684ff Merge remote-tracking branch 'upstream/master' 2020-05-02 18:02:45 +03:00
Nikolay Korolev
f372ce156d changed saving compatibility 2020-05-02 18:02:17 +03:00
Sergeanur
52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03: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
aap
4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
2020-04-29 10:26:36 +02:00
Sergeanur
fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
Sergeanur
7bf45124e6 Fix use of integers instead of enum/bool/nil 2020-04-27 12:41:34 +03:00
Sergeanur
f0890b1112 Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-26 22:03:15 +03:00
Nikolay Korolev
34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev
bed41e1bec removed redundant checks 2020-04-24 01:40:12 +03:00
Nikolay Korolev
0fc505926f fix annoying bug 2020-04-24 01:32:17 +03:00
Nikolay Korolev
0b12cacf15 more 1.1 patch 2020-04-24 01:01:41 +03:00
Nikolay Korolev
05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
eray orçunus
c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Nikolay Korolev
7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00