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
..
CutsceneObject.cpp	Merge branch 'miami' into lcs	2021-01-13 14:56:25 +02:00
CutsceneObject.h	miami shadows	2020-07-29 12:17:53 +03:00
DummyObject.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
DummyObject.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
Object.cpp	Merge pull request #869 from Nick007J/miami	2020-12-09 09:55:50 +01:00
Object.h	sync	2021-01-18 22:20:44 +03:00
ObjectData.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
ObjectData.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
ParticleObject.cpp	lcs pobj	2021-01-22 02:59:08 +03:00
ParticleObject.h	Update ParticleObject.h	2021-01-22 03:10:19 +03:00
Projectile.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
Projectile.h	pragma twice	2020-11-16 15:05:29 +02:00
Stinger.cpp	Fix sniper and water creatures bug, mark some files	2020-10-09 12:24:21 +03:00
Stinger.h	Enable Stinger	2020-09-01 21:10:35 +03:00