Merge branch 'miami' into lcs

# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
This commit is contained in:
Sergeanur 2021-01-25 19:35:03 +02:00
commit 9647901ba0
58 changed files with 565 additions and 267 deletions

View file

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "audio_enums.h"
#include "AudioCollision.h"