Sergeanur 4b8d6a3223 Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssocGroup.cpp # src/animation/AnimBlendAssociation.cpp # src/animation/AnimManager.cpp # src/core/Streaming.cpp		2020-05-09 02:56:53 +03:00
..
animation	Merge branch 'master' into miami	2020-05-09 02:56:53 +03:00
audio	Merge branch 'master' into miami	2020-05-07 14:49:29 +03:00
control	fix	2020-05-08 18:50:16 +03:00
core	Merge branch 'master' into miami	2020-05-09 02:56:53 +03:00
entities	sync with upstream	2020-05-07 16:59:40 +03:00
extras	implemented debugmenu shutdown	2020-05-01 17:31:29 +02:00
fakerw	got rid of superfluous enum; update librw	2020-05-07 12:48:57 +02:00
math	implemented most of streamed collisions and big buildings	2020-05-05 13:02:42 +02:00
modelinfo	small fixes	2020-05-07 21:56:09 +02:00
objects	car control and friends	2020-05-07 16:57:49 +03:00
peds	sync with upstream	2020-05-07 23:22:15 +03:00
render	Merge branch 'master' into miami	2020-05-09 02:56:53 +03:00
rw	implemented most of timecycle and mblur	2020-05-06 00:53:26 +02:00
save	cleaned up MIAMI ifdefs	2020-05-05 18:06:38 +02:00
skel	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
text	Fix CMessages::InsertStringInString	2020-05-03 01:40:37 +03:00
vehicles	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
weapons	IsStatic	2020-05-06 19:17:47 +03:00