Sergeanur a3322f17d5 Merge branch 'master' into miami ... # Conflicts: # src/animation/CutsceneMgr.cpp # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/core/ControllerConfig.cpp # src/core/ControllerConfig.h # src/core/Streaming.cpp # src/peds/PedChat.cpp # src/render/Weather.cpp # src/rw/TexRead.cpp # src/vehicles/Automobile.cpp # src/vehicles/Boat.cpp		2020-08-24 21:59:32 +03:00
..
eax	Move sdk and eax	2020-08-02 19:36:50 +03:00
oal	Merge remote-tracking branch 'origin/master' into miami	2020-08-07 12:34:41 +03:00
audio_enums.h	Stats(except displaying), PlayerInfo, marker fix	2020-08-14 01:14:04 +03:00
AudioCollision.cpp	eSurfaceType	2020-05-26 11:37:46 +02:00
AudioCollision.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
AudioLogic.cpp	changed a sound enum	2020-08-20 13:21:08 +02:00
AudioManager.cpp	Fix OneShotPriority overflow	2020-07-18 14:15:06 +03:00
AudioManager.h	Merge branch 'master' into miami	2020-07-16 23:03:31 +03:00
AudioSamples.h	ps2 audio banks	2020-06-06 03:45:24 +03:00
AudioScriptObject.cpp	Fix cAudioScriptObject	2020-08-20 14:47:53 +03:00
AudioScriptObject.h	Fix cAudioScriptObject	2020-08-20 14:47:53 +03:00
DMAudio.cpp	Merge branch 'master' into miami	2020-08-24 21:59:32 +03:00
DMAudio.h	Noskillx's PR + fix .set loading	2020-07-06 19:26:41 +03:00
MusicManager.cpp	VC fighting, Peds, many fixes including ghost bikes	2020-07-09 17:01:07 +03:00
MusicManager.h	Support of original mp3/wav/adf	2020-05-27 03:29:54 +03:00
PoliceRadio.cpp	Very basic compatibility with original sfx.raw/sdt	2020-05-26 18:25:34 +03:00
PoliceRadio.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
sampman.h	Merge branch 'master' into miami	2020-08-02 19:49:12 +03:00
sampman_miles.cpp	Merge branch 'master' into miami	2020-07-17 13:53:11 +03:00
sampman_null.cpp	game logic	2020-05-31 20:59:01 +03:00
sampman_oal.cpp	Merge remote-tracking branch 'origin/master' into miami	2020-08-10 19:15:51 +03:00
soundlist.h	changed a sound enum	2020-08-20 13:21:08 +02:00