Merge branch 'master' into upstream-merge-29105

This commit is contained in:
LetterJay
2017-09-02 07:11:32 -05:00
committed by GitHub
1577 changed files with 55829 additions and 215217 deletions
+2 -2
View File
@@ -52,7 +52,7 @@
#define AI_CAMERA_LUMINOSITY 5
#define AI_VOX 1 // Comment out if you don't want VOX to be enabled and have players download the voice sounds.
//Additional code for the above flags.
//Additional code for the above flags_1.
#ifdef TESTING
#warn compiling in TESTING mode. testing() debug messages will be visible.
#endif
@@ -69,7 +69,7 @@
#error You need version 511 or higher
#endif
//Update this whenever the db schema changes
//Update this whenever the db schema changes
//make sure you add an update to the schema_version stable in the db changelog
#define DB_MAJOR_VERSION 3
#define DB_MINOR_VERSION 1