Sergeanur
|
7d8ffa9ebd
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
|
2020-08-07 12:34:41 +03:00 |
|
aap
|
abb640c6b6
|
VU0 collision
|
2020-08-03 17:32:06 +02:00 |
|
aap
|
c0eb3d10e2
|
CCollision done and fixes
|
2020-07-27 15:43:03 +02:00 |
|
aap
|
6b7a8f96a6
|
CCollision done and fixes
|
2020-07-27 15:38:46 +02:00 |
|
aap
|
2e8048d0fe
|
collision fixes
|
2020-07-27 15:38:12 +02:00 |
|
Sergeanur
|
d0f5464200
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
|
2020-07-13 18:10:17 +03:00 |
|
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
Sergeanur
|
cf69f22a0c
|
Remove island loading
|
2020-07-09 19:18:42 +03:00 |
|
eray orçunus
|
0625954bb7
|
Ducking, shooting vehicle occupants and weapon fixes
|
2020-06-20 16:23:32 +03:00 |
|
eray orçunus
|
db6110e996
|
Peds, mission switcher & fixes
|
2020-06-14 22:57:26 +03:00 |
|
aap
|
7e5dde1f1a
|
eSurfaceType
|
2020-05-26 11:37:46 +02:00 |
|
aap
|
d8528ebbbe
|
eSurfaceType
|
2020-05-26 11:34:20 +02:00 |
|
aap
|
7bf8337854
|
CVehicle
|
2020-05-25 18:33:34 +02: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
|
f1c1f56b12
|
CSphere and CBox for CColModel
|
2020-05-06 17:56:38 +02:00 |
|
aap
|
e81652c2fc
|
cleaned up MIAMI ifdefs
|
2020-05-05 18:06:38 +02: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 |
|
aap
|
b44df26d3e
|
implemented most of streamed collisions and big buildings
|
2020-05-05 13:02:42 +02:00 |
|
Filip Gawin
|
370c4e48cd
|
Try to build with mingw
|
2020-04-20 18:18:46 +02:00 |
|
Sergeanur
|
599164006a
|
Remove patches
|
2020-04-17 16:31:11 +03:00 |
|
eray orçunus
|
4da1879975
|
Many fixes and cleanup
|
2020-04-15 19:19:45 +03:00 |
|
aap
|
f192d7052e
|
finished CCollision
|
2020-04-06 20:32:44 +02:00 |
|
aap
|
739e80614d
|
remove include <new> from common.h
|
2020-03-28 09:37:04 +01:00 |
|
Nikolay Korolev
|
fbe09534d9
|
fix typo
|
2019-09-14 20:58:09 +03:00 |
|
Nikolay Korolev
|
a3aea359b2
|
DragCarToPoint
|
2019-09-12 13:11:13 +03:00 |
|
Nikolay Korolev
|
d3ddfd8e40
|
fixed collision
|
2019-08-03 21:43:07 +03:00 |
|
aap
|
5f6b235301
|
implemented CTrain
|
2019-07-31 14:33:27 +02:00 |
|
aap
|
9a50a59a3c
|
CAutomobile::FireTruckControl and HydraulicControl
|
2019-07-26 14:27:13 +02:00 |
|
aap
|
60045ec6cd
|
couple of fixes
|
2019-07-20 14:39:38 +02:00 |
|
aap
|
0ad39c020c
|
implemented col line rendering
|
2019-07-19 13:58:19 +02:00 |
|
aap
|
90e093cd47
|
and of course the last commit didnt fix everything
|
2019-07-10 17:34:11 +02:00 |
|
aap
|
4a36d64f15
|
added wrappers around math functions
|
2019-07-10 17:18:26 +02:00 |
|
aap
|
74fcbc8c0a
|
more CAutomobile
|
2019-07-09 09:57:44 +02:00 |
|
aap
|
53023eb65b
|
the great reorganization
|
2019-07-07 13:09:11 +02:00 |
|