Sergeanur 1a42d62d3a Merge branch 'master' into miami ... # Conflicts: # premake5.lua # src/peds/Ped.cpp # src/peds/PedIK.cpp # src/peds/PedIK.h		2020-05-16 17:09:13 +03:00
..
animation	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
audio	Merge branch 'master' into miami	2020-05-16 17:09:13 +03:00
control	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
core	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
entities	Merge pull request #535 from Nick007J/miami	2020-05-11 23:28:52 +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	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
objects	Merge branch 'master' into miami	2020-05-16 05:07:39 +03:00
peds	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
render	minimal weather stuff + multiple bugfixes	2020-05-16 13:31:23 +03: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	fixed CText to be 64 bit compatible	2020-05-16 12:52:37 +02:00
vehicles	new horn	2020-05-16 14:01:32 +03:00
weapons	Weapon fixes	2020-05-16 15:07:09 +03:00