Merge branch 'master' into bHaptics

This commit is contained in:
Simon 2021-03-21 12:17:34 +00:00
commit cea3d0b39d
2 changed files with 2 additions and 1 deletions

View file

@ -4,6 +4,7 @@
android:versionCode="21"
android:versionName="1.2.0" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>

View file

@ -41,7 +41,7 @@ If you have questions concerning this license or the applicable additional terms
#define GAME_NAME "Doom3Quest" // appears on window titles and errors
#endif
#define ENGINE_VERSION "Doom3Quest 1.1.4" // printed in console
#define ENGINE_VERSION "Doom3Quest 1.1.5" // printed in console
#ifdef ID_REPRODUCIBLE_BUILD
// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__