Sergeanur 92679555b9 Merge branch 'miami' into lcs ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/MusicManager.cpp		2021-07-28 09:42:24 +03:00
..
animation	Wait states ported (scripted animations)	2021-06-24 21:42:10 +03:00
audio	Merge branch 'miami' into lcs	2021-07-28 09:42:24 +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 pull request #1255 from Nick007J/lcs	2021-07-27 20:59:08 +03:00
core	fix	2021-07-27 22:27:13 +03:00
entities	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-07-12 10:32:01 +03:00
extras	Merge remote-tracking branch 'origin/miami' into lcs	2021-07-15 19:11:32 +02:00
fakerw	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00
leeds	CSimpleModelInfo	2021-01-24 13:47:33 +01:00
math	CEntity done; C(Vu)Vector fixes and cleanup	2021-06-24 21:45:21 +03:00
modelinfo	Law enforcers and generic female ped comments	2021-07-25 22:16:02 +03:00
objects	Merge branch 'miami' into lcs	2021-07-12 04:13:22 +03:00
peds	Merge branch 'miami' into lcs	2021-07-27 20:58:17 +03:00
renderer	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-07-25 21:44:31 +03:00
rw	Make colors in texture conversion dialog more LCSy.	2021-06-25 22:45:21 +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	fix	2021-07-17 15:49:28 +03: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