Sergeanur c53b23cff0 Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/core/Radar.h # src/core/World.cpp # src/core/config.h # src/entities/Entity.cpp # src/modelinfo/ModelIndices.h # src/modelinfo/PedModelInfo.cpp # src/peds/Population.cpp # src/render/Clouds.cpp # src/render/Hud.cpp # src/vehicles/HandlingMgr.h		2020-05-20 14:39:36 +03:00
..
animation	only one sunbathe anim group	2020-05-18 22:25:06 +02:00
audio	Merge remote-tracking branch 'origin/master' into miami	2020-05-20 14:39:36 +03:00
control	Merge remote-tracking branch 'origin/master' into miami	2020-05-20 14:39:36 +03:00
core	Merge pull request #569 from aap/miami	2020-05-20 12:41:12 +02:00
entities	Merge pull request #569 from aap/miami	2020-05-20 12:41:12 +02:00
extras	Linux build support	2020-05-11 21:00:55 +03:00
fakerw	fixes for 64 bit build	2020-05-16 14:34:51 +02:00
math	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-14 22:29:23 +03:00
modelinfo	Merge pull request #569 from aap/miami	2020-05-20 12:41:12 +02:00
objects	CEntity and friends	2020-05-19 20:56:42 +02:00
peds	Merge pull request #569 from aap/miami	2020-05-20 12:41:12 +02:00
render	Merge pull request #569 from aap/miami	2020-05-20 12:41:12 +02:00
rw	Merge branch 'master' into miami	2020-05-16 17:09:13 +03:00
save	Merge branch 'master' into miami	2020-05-13 00:55:52 +03:00
skel	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02:00
text	CText	2020-05-18 01:28:40 +03:00
vehicles	Merge remote-tracking branch 'origin/master' into miami	2020-05-20 14:39:36 +03:00
weapons	Melee weapons(half-working), Ped and Hud bits	2020-05-19 17:43:16 +03:00