Commit Graph

13074 Commits

Author SHA1 Message Date
deve
667245f5aa Avoid redeclaration for mingw compiler 2014-09-23 08:38:30 +02:00
deve
d007703d6b Fixed warning when SOCKET_ERROR is already defined. 2014-09-23 08:28:39 +02:00
hiker
13cbde2e09 Added new supertuxkart.appdata file from hughsie (#1545). 2014-09-23 15:51:06 +10:00
hiker
2c80feb3b5 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-23 15:12:48 +10:00
hiker
5ec883b86a Minor code simplification. 2014-09-23 15:12:26 +10:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
hiker
9ce20435d2 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-23 09:04:14 +10:00
hiker
ea324a8252 Disable 800x600 resolution in release mode (it's useful for debugging,
so I'll keep it in debug mode).
2014-09-23 09:03:03 +10:00
hiker
29c162bdf8 Fixed compiler warnings. 2014-09-23 08:56:07 +10:00
hiker
4ff8f6dfe5 Fix release compilation. 2014-09-23 08:17:04 +10:00
Vincent Lejeune
7ac0c14869 Fix travis 2014-09-22 23:50:53 +02:00
hiker
e4f38fa244 Disable console thread from networking code - not needed atm, and
making this thread safe is not trivial.
2014-09-23 07:48:21 +10:00
Vincent Lejeune
cd4916297d Use a simpler frag shader for grass shadow 2014-09-22 23:40:38 +02:00
Vincent Lejeune
8989241846 Fix debug output error for sync object 2014-09-22 23:40:21 +02:00
Vincent Lejeune
7d0e34a8c9 Remove unecessary forced lod for shadow 2014-09-22 19:09:18 +02:00
Vincent Lejeune
8b8895c79a Remove some unused variable 2014-09-22 18:14:04 +02:00
hiker
44af65fddd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-22 23:59:58 +10:00
hiker
a550f6bf6b Try to make crash in #1529 unlikely - though it needs a proper fix still. 2014-09-22 23:57:37 +10:00
vlj
b376dcd6fe Revert "Reduce size of some rtt"
This reverts commit e08bf299be.
2014-09-22 15:30:45 +02:00
vlj
160ed179c3 Revert "Actually RH requires higher depth for alpha"
This reverts commit 9552a73ea8.
2014-09-22 15:30:37 +02:00
hiker
99fd49bdc0 Run SFX in a separate thread (for #1511). 2014-09-22 17:04:14 +10:00
hiker
2b86705dc0 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-22 16:17:26 +10:00
hiker
4cea6bd7fe Fixed #709 (Missing R with caron in title font). Thanks! 2014-09-22 15:53:40 +10:00
hiker
302470df7e Fixed #1266 (we won't need a --players command line option anyway). 2014-09-22 12:09:49 +10:00
hiker
9b0a6d2703 Allow the hw-report-server to be changed using the news.xml file. 2014-09-22 08:26:49 +10:00
hiker
b4e16e8852 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-22 07:55:06 +10:00
hiker
249c34cd0d Fixed achievement warning. 2014-09-22 07:54:34 +10:00
Vincent Lejeune
9552a73ea8 Actually RH requires higher depth for alpha 2014-09-21 19:46:36 +02:00
Vincent Lejeune
4672492269 Clean transparentmesh for non animated meshes 2014-09-21 19:35:49 +02:00
vlj
bc9345a227 Merge pull request #1553 from konstin/master
fix cleaning of transparent meshes and close #1522
2014-09-21 19:35:12 +02:00
konstin
a9bc44f7eb fix cleaning of transparent meshes and close #1522 2014-09-21 19:30:07 +02:00
Vincent Lejeune
0dc3854df1 Reorganise animated mesh cleaning 2014-09-21 19:12:24 +02:00
Vincent Lejeune
e08bf299be Reduce size of some rtt 2014-09-21 19:06:05 +02:00
Vincent Lejeune
034058f63a Fix plunger crash 2014-09-21 18:28:13 +02:00
Vincent Lejeune
4df40c3de5 Fix multiplayer in basic glsl mode 2014-09-21 18:11:44 +02:00
vlj
0b178b9c1a Remove gloss on splatting 2014-09-21 04:20:27 +02:00
Marianne Gagnon
a33e9a88fd fix spaltting 2014-09-20 22:12:17 -04:00
vlj
97ea994c6a Revert "Improve swizzle of splatting"
This reverts commit 98ca75c34d.
2014-09-21 04:10:51 +02:00
vlj
98ca75c34d Improve swizzle of splatting 2014-09-21 03:59:03 +02:00
Marianne Gagnon
5c0c158244 Make some progress on fixing splatting 2014-09-20 21:28:51 -04:00
Marianne Gagnon
90042bc9e4 Properly fix gloss maps 2014-09-20 21:23:22 -04:00
Marianne Gagnon
58e20bebd7 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-09-20 20:48:12 -04:00
Marianne Gagnon
e0e55c56c2 Fix specular 2014-09-20 20:45:58 -04:00
hiker
f31a85268e Added error message in case a not-yet-supported platform tries to report
memory or #procs.
2014-09-21 10:44:33 +10:00
hiker
b3c2909053 Fix compiler warning. 2014-09-21 10:44:15 +10:00
Vincent Lejeune
7af5e5c50c Fix text billboard crash 2014-09-20 21:17:44 +02:00
Vincent Lejeune
f30ea823e5 Factorise non instanced 2nd pass too. 2014-09-20 19:43:15 +02:00
Vincent Lejeune
5643e38886 Some factorisation for non instanced path 2014-09-20 19:28:06 +02:00
Vincent Lejeune
b3e124b93e Some fixes 2014-09-20 18:48:22 +02:00
Vincent Lejeune
7406ceb876 Additionnal factorisation 2014-09-20 18:09:48 +02:00