aap
|
6e4710b717
|
CVisibilityPlugins
|
2020-05-11 22:21:18 +02:00 |
|
Nikolay Korolev
|
9b23e33c36
|
sync with upstream
|
2020-05-11 21:21:09 +03:00 |
|
Sergeanur
|
5f1c3fa208
|
Merge remote-tracking branch 'origin/miami' into miami
|
2020-05-11 21:07:36 +03:00 |
|
Sergeanur
|
0aa7f13c32
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssociation.h
# src/animation/AnimBlendClumpData.h
# src/animation/AnimManager.h
# src/animation/FrameUpdate.cpp
# src/control/AutoPilot.h
# src/control/PathFind.h
# src/core/PlayerInfo.h
# src/entities/Building.h
# src/entities/Dummy.h
# src/entities/Entity.h
# src/entities/Physical.h
# src/entities/Treadable.h
# src/modelinfo/BaseModelInfo.h
# src/modelinfo/ClumpModelInfo.cpp
# src/modelinfo/ClumpModelInfo.h
# src/modelinfo/PedModelInfo.h
# src/modelinfo/SimpleModelInfo.h
# src/modelinfo/TimeModelInfo.h
# src/modelinfo/VehicleModelInfo.h
# src/objects/CutsceneHead.h
# src/objects/CutsceneObject.h
# src/objects/DummyObject.h
# src/objects/Object.h
# src/peds/DummyPed.h
# src/peds/PedIK.cpp
# src/rw/VisibilityPlugins.cpp
# src/vehicles/Automobile.h
# src/vehicles/Boat.h
# src/vehicles/Heli.h
# src/vehicles/Plane.h
# src/vehicles/Train.h
# src/vehicles/Vehicle.h
|
2020-05-11 21:07:12 +03:00 |
|
Nikolay Korolev
|
5f5babe7fe
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-11 21:05:01 +03:00 |
|
Nikolay Korolev
|
8fae2dcc26
|
garages + script
|
2020-05-11 21:04:35 +03:00 |
|
eray orçunus
|
36e2bc95d3
|
Fix Windows build and premake
|
2020-05-11 20:10:01 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
aap
|
95920d54f2
|
random fixes
|
2020-05-11 17:04:08 +02:00 |
|
aap
|
d4250fc2c7
|
CRenderer
|
2020-05-11 17:03:44 +02:00 |
|
aap
|
b11715608f
|
few fixes
|
2020-05-11 09:18:41 +02:00 |
|
aap
|
ad90a06a39
|
little fix for cam
|
2020-05-11 09:18:21 +02:00 |
|
erorcun
|
c66c45f4c8
|
Merge pull request #509 from Fire-Head/master
OpenAL update
|
2020-05-11 03:23:36 +03:00 |
|
Nikolay Korolev
|
2f085ea5f5
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-11 01:00:50 +03:00 |
|
Nikolay Korolev
|
2f979a8cde
|
some changes
|
2020-05-11 01:00:41 +03:00 |
|
aap
|
198b80f560
|
RpAnimBlend and frame updates
|
2020-05-10 23:47:53 +02:00 |
|
aap
|
9e842f1628
|
vehicle model descriptions; a bit of heli code
|
2020-05-10 20:51:29 +02:00 |
|
aap
|
7919b92d28
|
force load weapons as long as we dont stream em yet
|
2020-05-10 19:09:49 +02:00 |
|
aap
|
d9a8bab631
|
update file loader for new VC fields
|
2020-05-10 18:14:14 +02:00 |
|
bigbossbro08
|
bd302ecca1
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-10 22:05:45 +06:00 |
|
bigbossbro08
|
b4abb6ddd8
|
fixed few more typos
|
2020-05-10 22:04:36 +06:00 |
|
bigbossbro08
|
c798e1bacd
|
Fixed typos and made all assert functions optional
|
2020-05-10 21:49:33 +06:00 |
|
Nikolay Korolev
|
653d808417
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-10 18:26:13 +03:00 |
|
aap
|
5b605c1271
|
some fixes and cosmetic changes
|
2020-05-10 17:09:57 +02:00 |
|
aap
|
0552d49fce
|
CVehicleModelInfo
|
2020-05-10 17:09:14 +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
|
512f5657f7
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-10 15:24:09 +03:00 |
|
Nikolay Korolev
|
61eb361d26
|
script changes
|
2020-05-10 15:23:56 +03:00 |
|
aap
|
f7aa4e108a
|
added some anim groups
|
2020-05-10 14:22:22 +02:00 |
|
aap
|
f7300c7a27
|
CPedModelInfo
|
2020-05-10 13:08:02 +02:00 |
|
Nikolay Korolev
|
4b892e9eb9
|
fix boats
|
2020-05-10 13:20:01 +03:00 |
|
Nikolay Korolev
|
662246b9e2
|
fix boat
|
2020-05-10 12:56:13 +03:00 |
|
Nikolay Korolev
|
1f3f82eedc
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-10 12:37:43 +03:00 |
|
aap
|
58d9e9cd59
|
CSimpleModelInfo
|
2020-05-10 11:34:26 +02: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 |
|
aap
|
1b936f6ffb
|
CClumpModelInfo; little fixes
|
2020-05-10 11:20:27 +02:00 |
|
aap
|
f0442960a2
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-10 10:04:27 +02:00 |
|
aap
|
e9fbd2ccfd
|
CWeaponModelInfo
|
2020-05-10 10:04:20 +02: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
|
5fd8eec42c
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-09 20:30:05 +03:00 |
|
aap
|
c020992e4d
|
back to ped.ifp
|
2020-05-09 19:29:31 +02: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
|
f23ecfbc84
|
accidentally swapped reft and light
|
2020-05-09 17:29:13 +02:00 |
|
aap
|
97d5698e0c
|
peds starting to work
|
2020-05-09 17:05:26 +02:00 |
|
Sergeanur
|
28103775ba
|
Place debug menu under ifdef
|
2020-05-09 16:06:13 +03:00 |
|
Sergeanur
|
1b599b2d35
|
Fix compilation error
|
2020-05-09 15:41:00 +03:00 |
|
aap
|
989ded6052
|
removed cutscene heads
|
2020-05-09 13:00:39 +02:00 |
|
aap
|
36e1f7b4fb
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-09 13:00:07 +02:00 |
|
eray orçunus
|
b80c4bae6b
|
Menu map fixes and resizable window on GLFW
|
2020-05-09 13:58:31 +03:00 |
|
aap
|
ea053467b5
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-09 12:45:27 +02:00 |
|
aap
|
40cfd0576f
|
Merge pull request #526 from Nick007J/miami
GenerateOneRandomCar except bikes
|
2020-05-09 12:45:25 +02:00 |
|
erorcun
|
ce4996b09c
|
Merge pull request #527 from erorcun/erorcun
Menu map fixes and resizable window on GLFW
|
2020-05-09 13:44:43 +03:00 |
|
eray orçunus
|
f754da272f
|
Menu map fixes and resizable window on GLFW
|
2020-05-09 13:43:08 +03:00 |
|
aap
|
d26ffdd05f
|
fixes for anims
|
2020-05-09 12:04:48 +02:00 |
|
aap
|
e8c0619226
|
named anim assoc flags
|
2020-05-09 09:51:31 +02:00 |
|
aap
|
633c2a7aeb
|
Merge branch 'master' of github.com:GTAmodding/re3
|
2020-05-09 09:50:08 +02:00 |
|
aap
|
3f09ec0744
|
named anim assoc flags
|
2020-05-09 09:50:00 +02:00 |
|
Sergeanur
|
4b8d6a3223
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssocGroup.cpp
# src/animation/AnimBlendAssociation.cpp
# src/animation/AnimManager.cpp
# src/core/Streaming.cpp
|
2020-05-09 02:56:53 +03:00 |
|
Sergeanur
|
d686f587cc
|
Merge remote-tracking branch 'origin/master'
|
2020-05-09 02:51:40 +03:00 |
|
Sergeanur
|
e917cd1f46
|
Fix corona scaling
|
2020-05-09 02:50:48 +03: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
|
3d394c2f95
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-08 23:30:04 +03:00 |
|
Nikolay Korolev
|
7e753c2596
|
CCarCtrl::GenerateOneRandomCar
|
2020-05-08 23:29:43 +03:00 |
|
aap
|
10cade9f60
|
Merge branch 'master' of github.com:GTAmodding/re3
|
2020-05-08 20:58:48 +02:00 |
|
aap
|
f12e76fa13
|
more small fixes
|
2020-05-08 20:58:40 +02:00 |
|
aap
|
08de6d487a
|
anims streaming
|
2020-05-08 20:56:42 +02: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 |
|
Sergeanur
|
1ef8d61f36
|
Merge branch 'master' into miami
|
2020-05-08 17:49:19 +03:00 |
|
Nikolay Korolev
|
756e4dd068
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-08 17:06:25 +03:00 |
|
Nikolay Korolev
|
6065f5e52b
|
fix
|
2020-05-08 17:05:54 +03:00 |
|
aap
|
2eee4c5176
|
most of animation system done; little stuff here and there
|
2020-05-08 15:59:57 +02:00 |
|
Nikolay Korolev
|
c11a20cb4f
|
zone info commands + fix
|
2020-05-08 16:16:46 +03:00 |
|
Sergeanur
|
e0b3418e65
|
Fix water UV on high FPS and inverted free camera
|
2020-05-08 14:34:21 +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
|
a8f1505517
|
small fixes
|
2020-05-07 21:56:09 +02:00 |
|
aap
|
c715569d1d
|
CBaseModelInfo done
|
2020-05-07 21:55:54 +02: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 |
|
aap
|
3ae10c93ac
|
Merge branch 'master' of github.com:GTAmodding/re3
|
2020-05-07 17:31:32 +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
|
8bb22b2ad8
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-07 14:41:43 +02:00 |
|
aap
|
6a7d08ecc2
|
some quick cosmetic fixes
|
2020-05-07 14:41:35 +02:00 |
|
Sergeanur
|
f13c4e6aca
|
Merge branch 'master' into miami
|
2020-05-07 14:49:29 +03:00 |
|
Sergeanur
|
0b848bc147
|
Fix looping collision sound
|
2020-05-07 14:48:53 +03:00 |
|
aap
|
54662674e6
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-07 13:38:22 +02:00 |
|
aap
|
dbbf390983
|
use water color and new water texture
|
2020-05-07 13:38:14 +02:00 |
|
Sergeanur
|
7dc649ede6
|
Merge branch 'master' into miami
|
2020-05-07 14:32:41 +03:00 |
|
Sergeanur
|
1ac6bea590
|
Fix GetDistanceSquared
|
2020-05-07 14:32:00 +03:00 |
|
Sergeanur
|
ed1bb7236f
|
Fixed arguments for sound collisions
|
2020-05-07 14:10:56 +03:00 |
|
aap
|
5c30b3a188
|
got rid of superfluous enum; update librw
|
2020-05-07 12:48:57 +02:00 |
|
aap
|
f5c0bf3b60
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-07 12:48:57 +02:00 |
|
aap
|
152c7c452c
|
few changes for vehicle model info
|
2020-05-07 12:48:09 +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
|
aff89c6f5c
|
typo
|
2020-05-07 11:47:08 +02: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 |
|
Fire-Head
|
875c77e8b1
|
oal update
|
2020-05-07 10:13:59 +03:00 |
|
Fire-Head
|
12a3499ca3
|
oal wav/mp3 stream update
|
2020-05-07 09:26:16 +03: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
|
3931dc795f
|
waterlevel with offset (from Fire_Head)
|
2020-05-06 23:13:12 +02: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
|
53107d3b71
|
added flag
|
2020-05-06 19:24:33 +03:00 |
|
Nikolay Korolev
|
0930d70134
|
IsStatic
|
2020-05-06 19:20:45 +03:00 |
|
Nikolay Korolev
|
a24b65cbde
|
IsStatic
|
2020-05-06 19:17:47 +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 |
|
aap
|
a76b88da08
|
fixed object collision stuff at least somewhat
|
2020-05-06 17:17:07 +02:00 |
|
aap
|
c11912a8ec
|
sorted out object collision enums
|
2020-05-06 17:14:34 +02:00 |
|
aap
|
aa12251c6b
|
Merge branch 'master' of github.com:GTAmodding/re3
|
2020-05-06 17:13:53 +02:00 |
|
aap
|
a2b89c6a18
|
sorted out object collision enums
|
2020-05-06 17:13:46 +02:00 |
|
Sergeanur
|
d015e09c92
|
Merge branch 'master' into miami
|
2020-05-06 18:03:36 +03:00 |
|
Sergeanur
|
b633288d1b
|
Merge remote-tracking branch 'origin/master'
|
2020-05-06 18:02:16 +03:00 |
|
Sergeanur
|
daa3b20477
|
Fix cAudioManager::ProcessActiveQueues loop
|
2020-05-06 18:01:52 +03:00 |
|
aap
|
224727c14d
|
got rid of superfluous enum
|
2020-05-06 16:58:57 +02:00 |
|
aap
|
b4bbd91921
|
got rid of superfluous enum
|
2020-05-06 16:56:59 +02:00 |
|
Nikolay Korolev
|
bd4d5d7c47
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 16:55:45 +03:00 |
|
Nikolay Korolev
|
15520fe77d
|
fix memory corruption
|
2020-05-06 16:55:04 +03:00 |
|
Nikolay Korolev
|
3b08efa2ad
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 16:46:33 +03:00 |
|
Sergeanur
|
bb55430f75
|
Merge remote-tracking branch 'origin/master' into miami
|
2020-05-06 16:44:30 +03:00 |
|
aap
|
13522259b8
|
fix for radar
|
2020-05-06 15:41:40 +02:00 |
|
Nikolay Korolev
|
88076a0050
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 15:45:13 +03:00 |
|
aap
|
25a4091fa8
|
setting some areas so objects dont disappear
|
2020-05-06 14:43:23 +02:00 |
|
Nikolay Korolev
|
4d06271a29
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 15:30:56 +03:00 |
|
aap
|
600cbee7d4
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-06 14:28:05 +02:00 |
|
aap
|
13c24a310d
|
little cworld bugfix
|
2020-05-06 14:27:57 +02:00 |
|
aap
|
7c356b08e6
|
little cworld bugfix
|
2020-05-06 14:27:41 +02:00 |
|
Nikolay Korolev
|
8c036ec671
|
sync with master
|
2020-05-06 14:42:41 +03:00 |
|
Sergeanur
|
c0488d9ecf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/User.cpp
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/entities/Entity.cpp
|
2020-05-06 14:10:52 +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
|
98177f27ba
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 11:38:02 +03:00 |
|
aap
|
edd9301d7f
|
reverting fuckup
|
2020-05-06 09:59:04 +02:00 |
|
aap
|
8e84728f41
|
Merge branch 'master' of github.com:GTAmodding/re3
|
2020-05-06 09:24:18 +02:00 |
|
aap
|
bb0541404d
|
updated librw
|
2020-05-06 09:24:12 +02:00 |
|
aap
|
ed021431e9
|
updated librw
|
2020-05-06 09:23:31 +02:00 |
|
aap
|
31f9bb566b
|
implemented most of timecycle and mblur
|
2020-05-06 00:53:26 +02:00 |
|
Nikolay Korolev
|
a7036475c3
|
not needed
|
2020-05-06 01:16:54 +03: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
|
7428590457
|
some miami limits
|
2020-05-05 18:31:53 +02: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
|
0163a7bc46
|
Remove ColStore
|
2020-05-05 18:13:46 +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
|
5580eb21a4
|
ModeInfoType -> ModelInfoType
|
2020-05-05 15:13:09 +03:00 |
|
Sergeanur
|
4cc1bb92e7
|
Make CBaseModelInfo fields protected
|
2020-05-05 15:06:55 +03:00 |
|
aap
|
fd462c9b55
|
implemented most of streamed collisions and big buildings
|
2020-05-05 14:00:20 +02: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 |
|
Fire-Head
|
73c809f616
|
bb std::string
|
2020-05-04 22:02:54 +03:00 |
|
Fire-Head
|
6382b6d2fc
|
fix typo
|
2020-05-04 21:32:42 +03:00 |
|
Fire-Head
|
0abd0c659b
|
openal-soft added
|
2020-05-04 21:06:14 +03:00 |
|
Fire-Head
|
8aac6060d3
|
oal upd
|
2020-05-04 20:33:48 +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
|
3554ec58bb
|
Merge pull request #507 from aap/master
implemented most of vice city path system, conditionals for train, bridge, cullzones
|
2020-05-04 19:51:56 +03:00 |
|
Nikolay Korolev
|
11c7050dfb
|
deny coach in crusher
|
2020-05-04 15:02:46 +03:00 |
|
Nikolay Korolev
|
20ffccbe2a
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-04 14:58:12 +03:00 |
|
Nikolay Korolev
|
d1a46c35ce
|
fixed spawn bug
|
2020-05-04 14:57:49 +03:00 |
|
aap
|
f027c3afed
|
fixed fog color for librw
|
2020-05-04 13:41:17 +02:00 |
|
aap
|
a073dda5ec
|
GTA_ZONECULL define
|
2020-05-03 17:44:10 +02: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 |
|