diff --git a/.gitmodules b/.gitmodules index ab6c9a6..bc77b0e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,4 +7,4 @@ branch = tf15-client [submodule "particleman"] path = particleman - url = https://github.com/Velaron/OpenHL-Particleman + url = https://github.com/Velaron/particleman diff --git a/android/build.gradle b/android/build.gradle index 559c428..721b527 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' + classpath 'com.android.tools.build:gradle:7.1.1' } } diff --git a/common/gameinfo.h b/common/gameinfo.h index aacc74d..7341b47 100644 --- a/common/gameinfo.h +++ b/common/gameinfo.h @@ -18,6 +18,7 @@ GNU General Public License for more details. #define GFL_NOMODELS (1<<0) #define GFL_NOSKILLS (1<<1) +#define GFL_RENDER_PICBUTTON_TEXT (1<<2) /* ======================================================================== diff --git a/engine/menu_int.h b/engine/menu_int.h index c74ccae..9784aad 100644 --- a/engine/menu_int.h +++ b/engine/menu_int.h @@ -212,6 +212,8 @@ typedef struct ui_extendedfuncs_s { double (*pfnDoubleTime)( void ); char *(*pfnParseFile)( char *data, char *buf, const int size, unsigned int flags, int *len ); + + const char *(*pfnAdrToString)( const struct netadr_s a ); } ui_extendedfuncs_t; // deprecated export from old engine diff --git a/mainui b/mainui index affaf9d..7eab2b0 160000 --- a/mainui +++ b/mainui @@ -1 +1 @@ -Subproject commit affaf9d1614be5d9ae8c23e3cc5a1d9f34cd542e +Subproject commit 7eab2b0918e46cdfbcb890f67c08cf5d12e10f32