Merge branch 'master' into cmake

2022-01-11 19:19:09 +01:00
parent 4709295598 8e551bb287
commit f3bb5ccef9
955 changed files with 424454 additions and 217753 deletions
@@ -394,6 +394,7 @@ class JGE
   void SetJNIEnv(JNIEnv * env, jclass cls);
   void sendJNICommand(std::string command);
   std::string getFileSystemLocation();
+   std::string getFileUserFolderPath();
 #endif 
  
 protected:
@@ -30,6 +30,7 @@ const int kInfoMenuID = -200;
 const int kRandomPlayerMenuID = -11;
 const int kRandomAIPlayerMenuID = -12;
 const int kEvilTwinMenuID = -14;
+const int kCommanderMenuID = -33;

 class JGuiListener
 {