Sergeanur
|
509ca11d76
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/GameLogic.cpp
# src/control/PathFind.cpp
# src/control/RoadBlocks.cpp
# src/control/Script.cpp
# src/control/Script.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/core/TempColModels.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.h
# src/render/Skidmarks.h
# src/render/WaterLevel.cpp
# src/save/GenericGameStorage.h
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/DamageManager.cpp
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
|
2020-06-03 01:24:08 +03:00 |
|
aap
|
7c7727e7da
|
fixed timebar toggle
|
2020-06-01 13:21:19 +02:00 |
|
rollschuh2282
|
2d5f7d92e5
|
Add files via upload
|
2020-05-29 12:04:20 +02:00 |
|
Fire-Head
|
63d0bdc863
|
VC Water
|
2020-05-27 21:50:01 +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 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
aap
|
3931dc795f
|
waterlevel with offset (from Fire_Head)
|
2020-05-06 23:13:12 +02:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
Fire-Head
|
a4922d5cb7
|
rem refs
|
2020-04-17 08:54:14 +03:00 |
|
Sergeanur
|
6ff06ff7c6
|
Partial CBoat
|
2020-01-24 10:41:40 +02:00 |
|
aap
|
ae69aaf5ce
|
implemented cBuoyancy
|
2019-07-23 22:55:23 +02:00 |
|
Fire-Head
|
d8dd649617
|
fixfixfix
|
2019-07-11 03:44:54 +03:00 |
|
Fire-Head
|
3225fe3b92
|
Merge branch 'master' of github.com:Fire-Head/re3
# Conflicts:
# src/render/WaterLevel.cpp
# src/render/WaterLevel.h
|
2019-07-11 03:40:15 +03:00 |
|
Fire-Head
|
565f36f4e3
|
waterupd
|
2019-07-11 03:39:20 +03:00 |
|
Fire-Head
|
b902abd984
|
water fix
|
2019-07-11 03:37:57 +03:00 |
|
Fire-Head
|
aed8218ef1
|
WaterLevel done
|
2019-07-11 03:33:28 +03:00 |
|
Fire-Head
|
a644c4e9ce
|
WaterLevel done
|
2019-07-11 03:22:01 +03:00 |
|
aap
|
188aab4196
|
implemented some higher level functions; added lots of stubs; switched top and bottom in CRect
|
2019-05-30 21:24:47 +02:00 |
|