ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,311 Commits 9 Branches 28 Tags 433 MiB
8c609c87d9
Commit Graph

18311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hiker
eea6196231 Merge branch 'buffer-log-messages' 2017-12-07 09:43:56 +11:00
hiker
ebcab8d4e0 Fixed compiler warning. 2017-12-07 09:43:27 +11:00
hiker
5b296b08f9 Merge remote-tracking branch 'origin/master' 2017-12-07 09:43:09 +11:00
hiker
2810d2ad7d Merge remote-tracking branch 'origin/master' into buffer-log-messages 2017-12-07 09:39:29 +11:00
hiker
55d0df7bad Added option to buffer log messages (which can reduce debug output 
overhead).
 2017-12-04 11:32:09 +11:00
auria.mg
1afb62c97d Bring back the ability to skip the unlock cutscense, fixes #3069 2017-12-03 18:44:50 -05:00
Benau
d9937d7b33 Fix physical object from meta library 2017-12-03 23:58:17 +08:00
hiker
7744b056ea Merge branch 'master' of github.com:supertuxkart/stk-code 2017-12-04 00:41:28 +11:00
Benau
7ab8477a53 Reserve onReset of scripting method for library nodes (unused atm) 2017-12-02 15:24:36 +08:00
Benau
3607c7d520 Adjust irrlicht CSkinnedMesh class for .spm 
The last frame in .spm is usable
 2017-12-02 15:24:05 +08:00
Benau
2161efd9c4 Allow configure animation set through scripting 2017-12-02 02:36:43 +08:00
Benau
60a3890c78 Add support for meta library objects 2017-12-01 13:59:00 +08:00
hiker
3093803762 Add support for a 'prefix' to be printed for all log messages. 2017-11-30 17:49:45 +11:00
hiker
4f5b4aed0b Change the bld directories to be looked for to all include -64; changed 
name of installer and only include 64-bit redistributable.
 2017-11-30 17:48:34 +11:00
hiker
ae57be8f3b Changed version number to be git, added 32bit to installer name, and only include 
the 32 bit redistributable.
 2017-11-30 17:47:24 +11:00
auria.mg
48aded5f6d Login screen : proper post-login redirection 2017-11-27 18:07:42 -05:00
auria.mg
579a4aa3cc Improve the way to enable/disable the networking menu, use the --online switch that previously existed 2017-11-26 21:54:48 -05:00
auria.mg
4f528c258d Disable new networking menus, will be enabled back in the networking branch 2017-11-26 21:48:45 -05:00
auria.mg
d92476ae70 First implementation prototype of the new netwoking UI, as discussed. 2017-11-25 18:51:49 -05:00
Rémi Verschelde
2a093cde0a GLEW: Update to pristine upstream 2.1.0 
Previous version was a modified GLEW 1.11.0 (2014). The STK modifications meant
to address https://sourceforge.net/p/glew/patches/40/ which is now fixed since
GLEW 2.0.0.

Here's the diff between pristine 1.11.0 and STK's version before this patch:
```diff
diff --git a/lib/glew/src/glew.c b/lib/glew/src/glew.c
index a78f14e1e..f8df0d758 100644
--- a/lib/glew/src/glew.c
+++ b/lib/glew/src/glew.c
@@ -296,30 +296,6 @@ static GLboolean _glewStrSame3 (GLubyte** a, GLuint* na, const GLubyte* b, GLuin
   return GL_FALSE;
 }

-#include <string.h>
-#include <stdlib.h>
-
-/* A simple open addressing hashset for extensions on OpenGL 3+. */
-static const char ** ext_hashset = NULL;
-size_t ext_hashset_size = 0;
-
-static unsigned hash_string(const char * key)
-{
-  unsigned hash = 0;
-  unsigned i = 0;
-  for (; i < strlen(key); ++i)
-  {
-    hash += key[i];
-    hash += (hash << 10);
-    hash ^= (hash >> 6);
-  }
-  hash += (hash << 3);
-  hash ^= (hash >> 11);
-  hash += (hash << 15);
-
-  return hash;
-}
-
 /*
  * Search for name in the extensions string. Use of strstr()
  * is not sufficient because extension names can be prefixes of
@@ -328,37 +304,14 @@ static unsigned hash_string(const char * key)
  */
 static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, const GLubyte *end)
 {
-  if (ext_hashset != NULL)
+  const GLubyte* p;
+  GLuint len = _glewStrLen((const GLubyte*)name);
+  p = start;
+  while (p < end)
   {
-    unsigned hash = hash_string(name);
-
-    /*
-     * As the hashset is bigger than the number of extensions
-     * this will eventually break.
-     */
-    while(1)
-    {
-        unsigned index = hash % ext_hashset_size;
-        if (ext_hashset[index] == NULL)
-            break;
-
-        if (!strcmp(ext_hashset[index], name))
-            return GL_TRUE;
-
-        hash++;
-    }
-  }
-  else
-  {
-    const GLubyte* p;
-    GLuint len = _glewStrLen((const GLubyte*)name);
-    p = start;
-    while (p < end)
-    {
-      GLuint n = _glewStrCLen(p, ' ');
-      if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
-      p += n+1;
-    }
+    GLuint n = _glewStrCLen(p, ' ');
+    if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
+    p += n+1;
   }
   return GL_FALSE;
 }
@@ -10099,13 +10052,9 @@ static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT)
 /* ------------------------------------------------------------------------- */

 GLboolean GLEWAPIENTRY glewGetExtension (const char* name)
-{
+{
   const GLubyte* start;
   const GLubyte* end;
-
-  if (ext_hashset != NULL)
-      return _glewSearchExtension(name, NULL, NULL);
-
   start = (const GLubyte*)glGetString(GL_EXTENSIONS);
   if (start == 0)
     return GL_FALSE;
@@ -10165,39 +10114,9 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
     GLEW_VERSION_1_2   = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_1_1   = GLEW_VERSION_1_2   == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
   }
-
-  if (major >= 3) /* glGetString method is deprecated */
-  {
-    GLint n, i;
-    glGetIntegerv(GL_NUM_EXTENSIONS, &n);
-    glGetStringi = (PFNGLGETSTRINGIPROC)glewGetProcAddress((const GLubyte*)"glGetStringi");
-
-    free(ext_hashset); /* In case we get called a second time. */
-
-    ext_hashset_size = (n * 3) / 2;
-    ext_hashset = calloc(ext_hashset_size, sizeof(const char *));
-    for (i = 0; i < n; ++i)
-    {
-      const char * extension;
-      unsigned hash;
-
-      extension = (const char *)glGetStringi(GL_EXTENSIONS, i);
-      hash = hash_string(extension);
-
-      while(ext_hashset[hash % ext_hashset_size] != NULL)
-        hash++;
-
-      ext_hashset[hash % ext_hashset_size] = extension;
-    }
-
-    extStart = 0;
-  }
-  else
-  {
-    /* query opengl extensions string */
-    extStart = glGetString(GL_EXTENSIONS);
-  }

+  /* query opengl extensions string */
+  extStart = glGetString(GL_EXTENSIONS);
   if (extStart == 0)
     extStart = (const GLubyte*)"";
   extEnd = extStart + _glewStrLen(extStart);
@@ -14064,9 +13983,6 @@ GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST)
   GLXEW_VERSION_1_2 = GL_TRUE;
   GLXEW_VERSION_1_3 = GL_TRUE;
   GLXEW_VERSION_1_4 = GL_TRUE;
-  /* Check if GLX display is available */
-  if (glXGetCurrentDisplay == NULL || glXGetCurrentDisplay() == NULL)
-    return GLEW_OK;
   /* query GLX version */
   glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
   if (major == 1 && minor <= 3)
```
 2017-11-22 12:04:46 +01:00
Rémi Verschelde
e3264d1de3 CMake: Add option to use system GLEW 2.0+ 
The option is enabled by default, but the system version will only be used
if found and newer than 2.0.0 (to ensure that https://sourceforge.net/p/glew/patches/40/
is fixed). When missing, we silently fallback to the vendored source code,
so there is no change for e.g. Windows compilation.
 2017-11-22 11:54:38 +01:00
auria.mg
c59af9136c Merge branch 'KartPerGamemode' 
# Conflicts:
#	src/states_screens/gp_info_screen.cpp
 2017-11-21 19:20:49 -05:00
Deve
4d4c514c75 Corrrect gp info screen to keep consistency with track info screen. 
Now num karts config param is updated only if spinner button or start button has been pressed.
 2017-11-15 22:11:21 +01:00
hiker
f783be4d75 Updates translations with 0.9.3 version from transifex (no author credits updated). 2017-11-15 08:11:51 +11:00
hiker
28cd15cf84 Changed installer version to git. 2017-11-14 22:43:37 +11:00
hiker
76ceea5b0f Added Benau's 64-bit installer. 2017-11-14 22:23:23 +11:00
hiker
e6897c47a0
Merge pull request #2968 from leyyin/master 
Improve windows installer script
 2017-11-14 21:55:23 +11:00
hiker
5ad0e5b93d Updated x86 redistributable to 2017 version. 2017-11-14 21:46:40 +11:00
hiker
84ccf82173 Updated script to handle existing entries without duplicating authors 
(or even worse msgids for translator credits).
 2017-11-14 17:55:07 +11:00
Deve
20ffc3a693 Avoid a crash in ghost replay screen. 
It was crashing when add-on track was uninstalled.

It only avoids a crash and it's not true fix, because replays list should be updated when add-ons have been installed/uninstalled.
 2017-11-13 22:35:18 +01:00
hiker
5b9dc6895d Fixed server-only execution. 2017-11-13 12:48:03 +11:00
Deve
a67be44422 Allow to compile STKRelease build with debug symbols. 
It may be useful for decoding backtraces from our linux static package.
 2017-11-12 23:59:12 +01:00
auria.mg
b95e0a3373 Fix #2990 2017-11-11 18:15:55 -05:00
Deve
252403c9cc Avoid semi-transparent window on some compositors 2017-11-10 22:48:48 +01:00
Deve
468c24acd3 Avoid negative AI karts number in follow the leader 2017-11-09 23:38:53 +01:00
Deve
165b2fea9c Avoid running follow the leader GP with 0 AIs 2017-11-09 23:23:05 +01:00
Benau
51a16b938f Read only 4 bytes for tangent (unused atm), remember update stk-assets 2017-11-09 12:16:30 +08:00
Ben Krajancic
53827cbe21 Fixing selection issue on end-race screen (#3008) 
* Small clarification to prevent build errors

Building outside of this directory prevents the executable from launching, this small addition can help prevent this issue from happening.

* Initial Commit

* Code cleanup

* Fix compile error

* Fix incorrect comparison

* Fix focusing erorr twice over

It may be worth making 'setfocusable' part of setvisible
 2017-11-08 19:11:29 -05:00
Deve
28f81b2a85 Allow to move installed apk to sdcard 2017-11-08 22:06:58 +01:00
Deve
3baefcd6a7 Initialize FeatureAvailable array to false for legacy pipeline. 
It has been broken in commit 271a26eaf0.

It solves some issues with etnaviv gallium driver. It may also solve a crash on old intel 965gm on windows, but I can't test it atm.
 2017-11-07 22:54:36 +01:00
Benau
046403e1df Expose race mode for scripting 2017-11-06 15:15:44 +08:00
LeMagnesium
237927e3e5 Mark "fortmagma" as locked until the door can open (#3015) 
Keep the "fortmagma" challenge marked as locked on the GUI minimap even if enough points (180+) have been gathered to unlocked it, when the door is not open yet
 2017-11-05 18:33:56 -05:00
auria.mg
158d83057c Fix FTL reset bug, fixes #3019 2017-11-05 18:22:27 -05:00
Deve
08be02af8f Fixed 64-bit dependencies. 
Thanks to qwertychouskie for finding it.
 2017-11-05 21:54:43 +01:00
Deve
2e96a29977 Ignore some configuration changes that don't matter for us. 
The "orientation" without "screenSize" was a clear bug. And now connecting external keyboard doesn't close STK for me anymore.
 2017-11-04 22:08:42 +01:00
Benau
69c86930e8 Don't raycast driveable objects that are not enabled 2017-11-05 01:32:41 +08:00
Benau
8ba0fd3569 Allow exact shape to be used with tangents mesh 2017-11-05 00:55:26 +08:00
Benau
628bc7ce50 Allow light to be disabled by scripting 2017-11-04 14:01:47 +08:00
Deve
cc970c01a5
Merge pull request #3011 from qwertychouskie/patch-3 
Prevent upgrades to 0.9.3 causing all particles to be disabled
 2017-11-04 00:00:46 +01:00
Benau
fc23874991 Clarify running commands location 2017-11-03 21:16:16 +08:00