Sergeanur 0aa7f13c32 Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h		2020-05-11 21:07:12 +03:00
..
oal	oal wav/mp3 stream update	2020-05-07 09:26:16 +03:00
audio_enums.h	cMusicManager	2020-02-07 02:30:00 +02:00
AudioCollision.cpp	Fix looping collision sound	2020-05-07 14:48:53 +03:00
AudioCollision.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
AudioManager.cpp	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
AudioManager.h	Merge pull request #509 from Fire-Head/master	2020-05-11 03:23:36 +03:00
AudioSamples.h	Implement ProcessGarages + small cleanup	2020-03-22 17:30:54 +01:00
AudioScriptObject.cpp	Remove patches	2020-04-17 16:31:11 +03:00
AudioScriptObject.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
DMAudio.cpp	fix typo	2020-05-04 21:32:42 +03:00
DMAudio.h	Merge pull request #509 from Fire-Head/master	2020-05-11 03:23:36 +03:00
MusicManager.cpp	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
MusicManager.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
PoliceRadio.cpp	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
PoliceRadio.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
sampman.h	oal upd	2020-05-04 20:33:48 +03:00
sampman_miles.cpp	oal upd	2020-05-04 20:33:48 +03:00
sampman_oal.cpp	oal update	2020-05-07 10:13:59 +03:00
soundlist.h	A bit more audio cleanup	2020-05-02 17:10:51 +03:00