Sergeanur 55d30a11ec Merge branch 'miami' into lcs ... # Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioManager.h # src/control/Garages.cpp # src/control/Garages.h # src/control/Script5.cpp # src/core/config.h # utils/gxt/american.txt # utils/gxt/spanish.txt		2021-07-12 04:13:22 +03:00
..
CutsceneObject.cpp	Merge branch 'miami' into lcs	2021-01-13 14:56:25 +02:00
CutsceneObject.h	CEntity done; C(Vu)Vector fixes and cleanup	2021-06-24 21:45:21 +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	rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)	2021-06-28 13:57:05 +02:00
Object.h	Pool fixes + peds not forming circle fix	2021-06-24 21:34:28 +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	Merge branch 'miami' into lcs	2021-07-12 04:13:22 +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	rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)	2021-06-28 13:57:05 +02:00
Stinger.h	Enable Stinger	2020-09-01 21:10:35 +03:00