Sergeanur afa4fa6510 Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/soundlist.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/peds/Ped.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Vehicle.h		2020-06-06 08:42:58 +03:00
..
animation	Bike riding anims, SA bike/heli cam	2020-06-05 23:13:34 +03:00
audio	Merge branch 'master' into miami	2020-06-06 08:42:58 +03:00
control	Bike riding anims, SA bike/heli cam	2020-06-05 23:13:34 +03:00
core	Merge branch 'master' into miami	2020-06-06 08:42:58 +03:00
entities	forgot to delete debug code	2020-06-04 17:49:27 +02:00
extras	frontend options fix	2020-05-29 20:29:18 +03:00
fakerw	librw update	2020-05-27 20:42:15 +02:00
math	minor stuff	2020-06-04 17:39:26 +02:00
modelinfo	some orig chearts	2020-06-03 14:48:26 -07:00
objects	CPhysical	2020-05-22 14:27:16 +02:00
peds	Merge branch 'master' into miami	2020-06-06 08:42:58 +03:00
render	Peds, eSound and PedState enum, fixes	2020-06-03 17:01:11 +03:00
rw	hanim fix	2020-06-01 20:32:43 +02:00
save	Merge remote-tracking branch 'origin/master' into miami	2020-06-03 01:24:08 +03:00
skel	Merge remote-tracking branch 'origin/master' into miami	2020-06-03 01:24:08 +03:00
text	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +03:00
vehicles	Merge branch 'master' into miami	2020-06-06 08:42:58 +03:00
weapons	Peds, eSound and PedState enum, fixes	2020-06-03 17:01:11 +03:00