Sergeanur fb03ee45b5 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES ... # Conflicts: # src/core/config.h		2021-06-24 21:45:21 +03:00
..
animation	Wait states ported (scripted animations)	2021-06-24 21:42:10 +03:00
audio	Increase the number of audio channels to PS2 count and some small audio fixes	2021-06-24 21:45:18 +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-05-18 08:12:47 +03:00
control	Use bool8 in audio code	2021-06-24 21:44:36 +03:00
core	Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES	2021-06-24 21:45:21 +03:00
entities	Merge branch 'miami' into lcs	2021-05-18 08:12:47 +03:00
extras	Merge remote-tracking branch 'origin/miami' into lcs	2021-04-09 04:31:46 +03: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	Merge branch 'miami' into lcs	2021-05-10 09:13:51 +03:00
modelinfo	sync	2021-01-31 01:38:43 +03:00
objects	Use bool8 in audio code	2021-06-24 21:44:36 +03:00
peds	some fixes for CPed	2021-06-24 21:44:40 +03:00
render	Use bool8 in audio code	2021-06-24 21:44:36 +03:00
rw	Merge branch 'miami' into lcs	2021-05-18 08:12:47 +03:00
save	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00
skel	Merge branch 'miami' into lcs	2021-02-26 11:07:32 +02:00
text	Merge branch 'miami' into lcs	2021-02-26 11:07:32 +02:00
vehicles	Use bool8 in audio code	2021-06-24 21:44:36 +03:00
weapons	Use bool8 in audio code	2021-06-24 21:44:36 +03:00
CMakeLists.txt	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00