|
|
7bd6c70318
|
just in case
|
2020-05-17 22:17:43 +03:00 |
|
|
|
d5d2f6a822
|
sync with upstream
|
2020-05-17 21:48:21 +03:00 |
|
|
|
3cc20d7962
|
sync with upstream
|
2020-05-17 21:48:12 +03:00 |
|
|
|
a5b84eb9fe
|
full script basic support
|
2020-05-17 21:43:11 +03:00 |
|
|
|
8a7210cad1
|
Merge pull request #555 from erorcun/miami
Weapon fixes and thingies
|
2020-05-17 20:20:14 +02:00 |
|
|
|
84f8312b86
|
Weapon fixes and thingies
|
2020-05-17 21:01:52 +03:00 |
|
|
|
72ccf9a0db
|
revert accidental commit; also update librw
|
2020-05-17 14:21:09 +02:00 |
|
|
|
b587d835e8
|
more script stuff
|
2020-05-16 23:06:33 +03:00 |
|
|
|
e3291b0cb1
|
gangs, script and replay fixes
|
2020-05-16 17:00:40 +03:00 |
|
|
|
c54d3ba2ab
|
fixes for 64 bit build
|
2020-05-16 14:34:51 +02:00 |
|
|
|
4defd8b75c
|
minimal weather stuff + multiple bugfixes
|
2020-05-16 13:31:23 +03:00 |
|
|
|
76dd769085
|
Merge branch 'master' into miami
|
2020-05-16 05:07:39 +03:00 |
|
|
|
ec1b91e527
|
Remove unused audio enum
|
2020-05-16 05:06:51 +03:00 |
|
|
|
acd1ea9909
|
Weapon layer in Peds
|
2020-05-15 21:21:25 +03:00 |
|
|
|
24875f34d0
|
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
|
2020-05-14 17:05:42 +03:00 |
|
|
|
b01987719e
|
fixed script error
|
2020-05-14 15:26:59 +03:00 |
|
|
|
1237941180
|
fixed traffic lights
|
2020-05-13 17:33:50 +03:00 |
|
|
|
509d57edcb
|
car control and cranes fixes
|
2020-05-13 13:29:17 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
|
|
615bd1e878
|
garages fix
|
2020-05-12 20:22:35 +03:00 |
|
|
|
ca6ed7f00f
|
fix garages
|
2020-05-12 16:21:00 +03:00 |
|
|
|
4b566c26a3
|
fix garages
|
2020-05-12 14:08:42 +03:00 |
|
|
|
1afe36d0d0
|
fix garages
|
2020-05-12 14:07:47 +03:00 |
|
|
|
3e64274f6b
|
more script
|
2020-05-12 01:59:35 +03:00 |
|
|
|
9b23e33c36
|
sync with upstream
|
2020-05-11 21:21:09 +03:00 |
|
|
|
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 |
|
|
|
8fae2dcc26
|
garages + script
|
2020-05-11 21:04:35 +03:00 |
|
|
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
|
|
2f979a8cde
|
some changes
|
2020-05-11 01:00:41 +03:00 |
|
|
|
bd302ecca1
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-10 22:05:45 +06:00 |
|
|
|
c798e1bacd
|
Fixed typos and made all assert functions optional
|
2020-05-10 21:49:33 +06:00 |
|
|
|
5b605c1271
|
some fixes and cosmetic changes
|
2020-05-10 17:09:57 +02:00 |
|
|
|
00cdcef36a
|
some updates for script
|
2020-05-10 17:54:13 +03:00 |
|
|
|
af6e132b37
|
defined out asserts.
|
2020-05-10 19:54:37 +06:00 |
|
|
|
61eb361d26
|
script changes
|
2020-05-10 15:23:56 +03:00 |
|
|
|
a827f0dd55
|
sync with upstream
|
2020-05-10 12:26:32 +03:00 |
|
|
|
2f7d2fa3ad
|
more car control
|
2020-05-10 12:25:30 +03:00 |
|
|
|
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 |
|
|
|
d9a3533438
|
Small unification
|
2020-05-10 01:14:00 +03:00 |
|
|
|
9fce6c4ed3
|
car control fixes
|
2020-05-09 22:24:31 +03:00 |
|
|
|
3de003a8e7
|
new curves + boat fix
|
2020-05-09 22:11:40 +03:00 |
|
|
|
609caad7a4
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-09 20:21:36 +03:00 |
|
|
|
a55e738dfa
|
ccarctrl big fix
|
2020-05-09 20:21:13 +03:00 |
|
|
|
97d5698e0c
|
peds starting to work
|
2020-05-09 17:05:26 +02:00 |
|
|
|
989ded6052
|
removed cutscene heads
|
2020-05-09 13:00:39 +02:00 |
|
|
|
e30b538cd3
|
fix
|
2020-05-09 00:07:35 +03:00 |
|
|
|
46d891b745
|
fix
|
2020-05-09 00:00:06 +03:00 |
|
|
|
7e753c2596
|
CCarCtrl::GenerateOneRandomCar
|
2020-05-08 23:29:43 +03:00 |
|
