Sergeanur 1d2d5fe6ae Merge branch 'master' into miami ... # Conflicts: # src/render/MBlur.cpp # src/render/MBlur.h		2020-06-30 07:45:54 +03:00
..
animation	Merge remote-tracking branch 'origin/master' into miami	2020-06-29 12:56:50 +03:00
audio	Merge remote-tracking branch 'origin/master' into miami	2020-06-29 12:56:50 +03:00
control	Merge remote-tracking branch 'origin/master' into miami	2020-06-29 12:56:50 +03:00
core	Restore original code of CControllerState::CheckForInput	2020-06-30 07:44:51 +03:00
entities	renamed 2dfx shadowRange to Size	2020-06-28 12:08:46 +02:00
extras	frontend options fix	2020-05-29 20:29:18 +03:00
fakerw	CCamera done	2020-06-20 14:54:11 +02:00
math	Merge branch 'master' into miami	2020-06-07 04:15:10 +03:00
modelinfo	Merge branch 'miami' into miami	2020-06-16 23:02:21 +03:00
objects	fixes for CPhysical and friends	2020-05-22 14:34:44 +02:00
peds	Merge pull request #638 from erorcun/miami	2020-06-25 15:15:01 +02:00
render	Merge branch 'master' into miami	2020-06-30 07:45:54 +03:00
rw	Revert "FONT_BANK renamed to FONT_STANDARD"	2020-06-07 05:03:06 +03:00
save	Merge remote-tracking branch 'origin/master' into miami	2020-06-29 12:56:50 +03:00
skel	Fix glfw.cpp	2020-06-29 16:24:40 +02:00
text	Merge remote-tracking branch 'origin/master' into miami	2020-06-29 12:56:50 +03:00
vehicles	CWanted, anim fix, ped objs renaming, remove III beta features	2020-06-22 04:20:56 +03:00
weapons	CWanted, anim fix, ped objs renaming, remove III beta features	2020-06-22 04:20:56 +03:00