Sergeanur 4141caa4d6 Merge branch 'miami' into lcs ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/sampman.h # src/audio/sampman_miles.cpp # src/core/Radar.cpp # src/core/config.h		2021-08-12 16:04:25 +03:00
..
animation	tiny diff fixes	2021-07-11 03:26:21 +02:00
audio	Merge branch 'miami' into lcs	2021-08-12 16:04:25 +03:00
buildings	Pool fixes	2021-06-26 00:27:20 +03:00
collision	Merge branch 'miami' into lcs	2021-08-11 09:36:58 +03:00
control	Merge remote-tracking branch 'origin/miami' into lcs	2021-08-12 11:43:17 +03:00
core	Merge branch 'miami' into lcs	2021-08-12 16:04:25 +03:00
entities	lcs specific hack	2021-08-07 20:03:45 +03:00
extras	merge	2021-08-08 13:38:21 +03:00
fakerw	Merge branch 'miami' into lcs	2021-08-11 09:36:58 +03: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	CVehicle done	2021-08-04 13:56:29 +02:00
objects	Merge branch 'miami' into lcs	2021-07-12 04:13:22 +03:00
peds	Merge remote-tracking branch 'aap/lcs' into lcs	2021-08-12 11:45:25 +03:00
renderer	Merge branch 'miami' into lcs	2021-08-11 09:36:58 +03:00
rw	Merge remote-tracking branch 'aap/lcs' into lcs	2021-08-12 11:45:25 +03:00
save	Merge branch 'miami' into lcs	2021-08-11 09:36:58 +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	Merge remote-tracking branch 'aap/lcs' into lcs	2021-08-12 11:45:25 +03:00
weapons	merge	2021-08-08 15:46:47 +03:00
CMakeLists.txt	fix the fix (and another fix)	2021-07-11 03:34:43 +02:00