Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
This commit is contained in:
Sergeanur 2020-05-13 00:19:21 +03:00
commit 33dfaf7da1
56 changed files with 1418 additions and 385 deletions

View file

@ -1,6 +1,10 @@
#include "common.h"
#if defined _WIN32 && !defined __MINGW32__
#include "ctype.h"
#else
#include <cwctype>
#endif
#include "General.h"
#include "RwHelper.h"