Sergeanur 88b6168f1c Merge branch 'master' into miami ... # Conflicts: # premake5.lua # src/control/Script.cpp # src/core/SurfaceTable.cpp # src/core/config.h # src/entities/Physical.cpp # src/entities/Physical.h # src/objects/Object.h # src/skel/skeleton.h # src/vehicles/Vehicle.h		2020-05-23 21:14:16 +03:00
..
animation	only one sunbathe anim group	2020-05-18 22:25:06 +02:00
audio	Merge branch 'master' into miami	2020-05-23 21:14:16 +03:00
control	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00
core	Merge branch 'master' into miami	2020-05-23 21:14:16 +03:00
entities	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-22 23:58:59 +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	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00
objects	fixes for CPhysical and friends	2020-05-22 14:34:44 +02:00
peds	Cleanup and one needed function	2020-05-23 18:04:33 +03:00
render	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00
rw	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +03:00
save	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +03:00
skel	Merge branch 'master' into miami	2020-05-23 21:14:16 +03:00
text	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +03:00
vehicles	Merge branch 'master' into miami	2020-05-23 21:14:16 +03:00
weapons	Cleanup and one needed function	2020-05-23 18:04:33 +03:00