aap
|
7bf8337854
|
CVehicle
|
2020-05-25 18:33:34 +02:00 |
Nikolay Korolev
|
cda3752838
|
comments
|
2020-05-24 13:48:17 +03:00 |
|
Nikolay Korolev
|
607175f02a
|
set pieces
|
2020-05-23 20:06:52 +03:00 |
|
Nikolay Korolev
|
0085ed894f
|
script revision
|
2020-05-20 23:47:44 +03:00 |
|
Nikolay Korolev
|
a5b84eb9fe
|
full script basic support
|
2020-05-17 21:43:11 +03:00 |
|
Nikolay Korolev
|
e3291b0cb1
|
gangs, script and replay fixes
|
2020-05-16 17:00:40 +03:00 |
Sergeanur
|
24875f34d0
|
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
|
2020-05-14 17:05:42 +03:00 |
|
Nikolay Korolev
|
509d57edcb
|
car control and cranes fixes
|
2020-05-13 13:29:17 +03:00 |
|
Sergeanur
|
7c2b9478d5
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/FileLoader.cpp
# src/core/Streaming.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
|
2020-05-13 00:55:52 +03:00 |
|
Sergeanur
|
33dfaf7da1
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
|
2020-05-13 00:27:15 +03:00 |
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
Nikolay Korolev
|
8fae2dcc26
|
garages + script
|
2020-05-11 21:04:35 +03:00 |
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
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 |