Deve
|
856ee103cf
|
Merge remote-tracking branch 'origin/master'
|
2014-09-24 18:12:20 +02:00 |
|
Deve
|
c6cb84a1be
|
Find best fit resolution only in fullscreen mode.
|
2014-09-24 18:04:14 +02:00 |
|
hiker
|
203d987127
|
Fix compiler warnings.
|
2014-09-24 23:31:41 +10:00 |
|
Deve
|
b524f72bb5
|
Revert "Small correction in dynamic ribbon to avoid some weird behaviour in the GP editor"
This reverts commit 6b42f1b7b7.
|
2014-09-24 06:39:46 +02:00 |
|
hiker
|
8db34bed3c
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-09-24 10:58:55 +10:00 |
|
hiker
|
044972be2a
|
Activate HW reporting.
|
2014-09-24 10:58:34 +10:00 |
|
Marianne Gagnon
|
6695238284
|
Fix loading normal maps (new XML syntax)
|
2014-09-23 20:11:03 -04:00 |
|
Marianne Gagnon
|
8a0fb9c187
|
Disable old hack that causes more trouble than it's worth
|
2014-09-23 19:57:09 -04:00 |
|
vlj
|
562fe802f6
|
Fix stk text billboard orientation
|
2014-09-24 01:37:31 +02:00 |
|
vlj
|
58e1b73752
|
Fix bloom computation
|
2014-09-24 01:19:37 +02:00 |
|
hiker
|
538694c1d1
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-09-24 08:52:31 +10:00 |
|
hiker
|
9e34a2912c
|
Fix linux compilation.
|
2014-09-24 08:52:06 +10:00 |
|
Marianne Gagnon
|
544d3afa23
|
Fix another bug found while reviewing previous pull request
|
2014-09-23 18:46:48 -04:00 |
|
vlj
|
de4c1c880b
|
Use lesser rtt size for diffuse/specular
|
2014-09-24 00:46:48 +02:00 |
|
auriamg
|
a8f6b78524
|
Merge pull request #1561 from marcoll/master
Some minor corrections
|
2014-09-23 18:46:30 -04:00 |
|
Marianne Gagnon
|
6df86551eb
|
Remove unused code
|
2014-09-23 18:40:07 -04:00 |
|
vlj
|
dc6f989b13
|
Do not use matrix inversion for culling
|
2014-09-24 00:24:53 +02:00 |
|
hiker
|
12c1183c86
|
Fixed #1560.
|
2014-09-24 08:12:08 +10:00 |
|
hiker
|
3054ffe146
|
Fix #1554 (don't display server related screens on GUI for 0.8.2).
|
2014-09-24 07:58:28 +10:00 |
|
Marc Coll Carrillo
|
9c56d66c2d
|
Minor corrections (a couple of warnings, unused headers...)
|
2014-09-23 22:23:24 +02:00 |
|
Marc Coll Carrillo
|
6b42f1b7b7
|
Small correction in dynamic ribbon to avoid some weird behaviour in the GP editor
|
2014-09-23 22:19:25 +02:00 |
|
vlj
|
342184204b
|
Simplify #includes
|
2014-09-23 19:31:12 +02:00 |
|
vlj
|
fffd61fffb
|
Simplify #includes
|
2014-09-23 19:25:04 +02:00 |
|
vlj
|
bf62d28070
|
Simplify #includes
|
2014-09-23 19:21:51 +02:00 |
|
vlj
|
a246887a29
|
Simplify #include s
|
2014-09-23 19:17:33 +02:00 |
|
vlj
|
abffec69af
|
Simplify #include s
|
2014-09-23 19:12:00 +02:00 |
|
deve
|
1fad8fd994
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-09-23 15:48:59 +02:00 |
|
deve
|
227b6aee22
|
Avoid to update ribbon widget too many times.
It fixes displaying screenshots in GP editor after switching between category tabs.
|
2014-09-23 15:41:31 +02:00 |
|
hiker
|
06523a62c3
|
Fixed typo, renamed file to have proper extension.
|
2014-09-23 22:58:08 +10:00 |
|
hiker
|
3d4f054df8
|
Fix pre cmake 3.0 usage.
|
2014-09-23 21:01:04 +10:00 |
|
hiker
|
7c3d49e631
|
Accidentally committed file.
|
2014-09-23 20:51:20 +10:00 |
|
hiker
|
85ebcf1434
|
Fix VS 2013 compilation.
|
2014-09-23 20:50:50 +10:00 |
|
hiker
|
53f05e868d
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-09-23 20:18:09 +10:00 |
|
Deve
|
cfa4d455b0
|
Merge pull request #1547 from marcoll/master
Fix issues with the new "reverse grand prix" feature and user defined GPs
|
2014-09-23 10:59:43 +02:00 |
|
deve
|
8eb51f78b4
|
Fixed warning in cmake 3.0 and above.
If I understand correctly, the COMPILE_DEFINITIONS_DEBUG property is ignored in newer versions of cmake. I fixed it by forcing to use old method.
|
2014-09-23 09:11:39 +02:00 |
|
hiker
|
4f95aee051
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-09-23 16:45:08 +10:00 |
|
hiker
|
aa64f31f83
|
Added Screen::push() function to shorten the calls to pushScreen().
|
2014-09-23 16:43:50 +10:00 |
|
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
|
596cc44dfa
|
Fixed line endings.
|
2014-09-23 16:26:41 +10:00 |
|
hiker
|
c28728d903
|
Removed more compiler warnings for 64 bit windows compilation.
|
2014-09-23 16:23:22 +10: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 |
|