Commit graph

17 commits

Author SHA1 Message Date
Sergeanur
ff2665942e CTempColModels stuff 2020-10-21 21:24:18 +03: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
aap
c8b93d0575 fixed bumper colmodel 2020-06-01 10:30:01 +02:00
aap
197c49d740 fixed bumper colmodel 2020-06-01 10:29:46 +02:00
aap
7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap
d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
aap
d9a8bab631 update file loader for new VC fields 2020-05-10 18:14:14 +02:00
aap
f1c1f56b12 CSphere and CBox for CColModel 2020-05-06 17:56:38 +02:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Sergeanur
5f92e74086 fixes 2019-11-11 16:04:06 +01:00
Sergeanur
5ba7a1b0c0 TempColModels 2019-11-11 16:04:06 +01:00
Sergeanur
6362ceeff3 Full CCutsceneMgr 2019-09-28 17:03:00 +03:00
eray orçunus
5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
aap
53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00
Renamed from src/TempColModels.cpp (Browse further)