Sergeanur 0d20f1c364 Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp		2020-10-18 17:15:49 +03:00
..
eax	Move sdk and eax	2020-08-02 19:36:50 +03:00
oal	SampleManager	2020-10-12 20:22:39 +03:00
audio_enums.h	Renaming audio enum entries to something more like original	2020-09-19 15:55:27 +03:00
AudioCollision.cpp	some style and bug fixes, updated sfx enum, and implemented processVehicleEngine	2020-09-21 01:55:22 +03:00
AudioCollision.h	rewieved some audio functions	2020-10-02 03:55:26 +03:00
AudioLogic.cpp	Merge branch 'master' into miami	2020-10-18 17:15:49 +03:00
AudioManager.cpp	SampleManager	2020-10-12 20:22:39 +03:00
AudioManager.h	SampleManager	2020-10-12 20:22:39 +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 VC/TextFinish	2020-10-11 10:34:47 +03:00
DMAudio.h	cMusicManager, cDMAudio, radio position save/load, a few commands implemented	2020-09-09 19:37:44 +03:00
MusicManager.cpp	Fix Audio	2020-10-05 13:59:40 +03:00
MusicManager.h	Fix build (renamed var name in definiton file)	2020-09-19 20:45:57 +02:00
PoliceRadio.cpp	Mark audio code which is the same in re3 as done	2020-09-30 18:14:50 +02:00
PoliceRadio.h	rewieved some audio functions	2020-10-02 03:55:26 +03:00
sampman.h	SampleManager	2020-10-12 20:22:39 +03:00
sampman_miles.cpp	Update sampman_miles.cpp	2020-10-12 20:51:52 +03:00
sampman_null.cpp	Merge remote-tracking branch 'origin/master' into miami	2020-09-30 02:25:30 +03:00
sampman_oal.cpp	SampleManager	2020-10-12 20:22:39 +03:00
soundlist.h	cMusicManager, cDMAudio, radio position save/load, a few commands implemented	2020-09-09 19:37:44 +03:00