Commit Graph

22 Commits

Author SHA1 Message Date
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
6eb8f6ae5a Add cutscene borders switch to the menu 2020-07-11 12:04:26 +03:00
aap
60f736f20f FOV fix 2020-06-21 14:52:44 +02:00
aap
98baa36f1a FOV fix 2020-06-21 14:50:00 +02:00
eray orçunus
4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03: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
eray orçunus
5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
aap
90e093cd47 and of course the last commit didnt fix everything 2019-07-10 17:34:11 +02:00
aap
12af85ca3d cleaned up patching of virtual functions; started CAutomobile 2019-07-08 08:46:42 +02:00
_AG
69b5c9f1e0 Update Frontend. 2019-07-03 17:30:26 +02:00
aap
25865e68c4 cleaned up to be closer to original game 2019-07-03 13:13:55 +02:00
aap
e8215cf560
Revert "Implemented frontend inputs." 2019-07-02 22:05:11 +02:00
_AG
6c693e3bbf Implemented frontend inputs.
Fixed #66 and few other stuff.
2019-07-02 14:36:40 +02:00
aap
5a93f67c88 CHud cleanup: fixes and cosmetic treatment 2019-06-28 13:28:42 +02:00
_AG
2ce7bcc405 Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h. 2019-06-20 02:32:36 +02:00
aap
2a207af49a some cleanup 2019-06-16 19:06:01 +02:00
_AG
b83a0d469a Updates Draw.cpp, MusicManager.cpp. 2019-06-16 00:24:13 +02:00
_AG
92cc1cf3af New updates for Hud.cpp and more. 2019-06-15 01:34:36 +02: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
aap
852d8298b1 added CMBlur 2019-05-30 13:35:13 +02:00
aap
600bf03514 first commit 2019-05-15 16:52:37 +02:00