Sergeanur a481b900b9 Merge branch 'miami' into lcs ... # Conflicts: # src/control/CarCtrl.cpp # src/modelinfo/MloModelInfo.cpp # src/modelinfo/MloModelInfo.h # src/renderer/Renderer.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h		2021-07-31 20:43:52 +03:00
..
animation	Wait states ported (scripted animations)	2021-06-24 21:42:10 +03:00
audio	Merge branch 'miami' into lcs	2021-07-31 20:43:52 +03:00
buildings	Pool fixes + peds not forming circle fix	2021-03-06 19:28:59 +03:00
collision	Merge branch 'miami' into lcs	2021-07-03 16:39:22 +03:00
control	Merge branch 'miami' into lcs	2021-07-31 20:43:52 +03:00
core	Merge branch 'miami' into lcs	2021-07-31 20:43:52 +03:00
entities	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
extras	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
fakerw	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00
leeds	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
math	CEntity done; C(Vu)Vector fixes and cleanup	2021-06-24 21:45:21 +03:00
modelinfo	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
objects	Merge branch 'miami' into lcs	2021-07-12 04:13:22 +03:00
peds	Merge branch 'miami' into lcs	2021-07-31 20:43:52 +03:00
renderer	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
rw	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
save	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-07-25 21:44:31 +03:00
skel	fix	2021-07-27 22:18:24 +03:00
text	Merge branch 'miami' into lcs	2021-02-26 11:07:32 +02:00
vehicles	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
weapons	Merge branch 'miami' into lcs	2021-07-27 20:58:17 +03:00
CMakeLists.txt	Merge remote-tracking branch 'origin/miami' into lcs	2021-06-26 14:27:54 +03:00