Sergeanur cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs ... # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp		2021-01-22 15:04:09 +02:00
..
BaseModelInfo.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
BaseModelInfo.h	fix CreateInstance virtual overload order	2021-01-12 23:33:44 +01:00
ClumpModelInfo.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
ClumpModelInfo.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
ModelIndices.cpp	start using CMemoryHeap	2020-11-26 17:39:59 +01:00
ModelIndices.h	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-01-21 23:19:12 +03:00
ModelInfo.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
ModelInfo.h	Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes	2020-09-30 02:41:42 +03:00
PedModelInfo.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
PedModelInfo.h	Reorganize CPed functions into their original cpp files	2020-11-20 01:18:37 +02:00
SimpleModelInfo.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
SimpleModelInfo.h	fixed review stuff	2020-12-19 14:33:22 +03:00
TimeModelInfo.cpp	Use original names	2021-01-08 21:53:11 +02:00
TimeModelInfo.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
VehicleModelInfo.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
VehicleModelInfo.h	initial work on vehicles	2021-01-18 10:59:19 +01:00
WeaponModelInfo.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
WeaponModelInfo.h	Partial Pickups	2020-10-17 08:23:01 +03:00