Commit Graph

5 Commits

Author SHA1 Message Date
Sergeanur
c53b23cff0 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
2020-05-20 14:39:36 +03:00
Sergeanur
e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
Sergeanur
37480fb617 Fix compilation errors 2020-05-17 00:33:52 +03:00
Sergeanur
4ff0697b4d More small audio fixes 2020-05-16 21:00:27 +03:00
Sergeanur
13a0bf1c43 Move sound processors to AudioLogic.cpp, plus small fixes 2020-05-16 20:29:13 +03:00