hiker
0b691ba3e8
Merge remote-tracking branch 'origin/master'
2014-10-13 16:40:53 +11:00
hiker
e5315c7583
Merge branch 'marcoll-master'
2014-10-13 16:38:30 +11:00
Marianne Gagnon
2b90cb2a69
Use case-insensitive comparison for animated textures, for some reason
2014-10-12 20:12:40 -04:00
hiker
c5434aa845
Merge branch 'master' of https://github.com/marcoll/stk-code into marcoll-master
2014-10-13 09:55:25 +11:00
hiker
bfe84612fa
Let all SFX commands be handled by the sfx manager thread (otherwise
...
events could be handled in the wrong order, e.g. a delete from the
main thread before the play in the manager thread, resulting in a crash).
Should fix #1511 and #1604 .
2014-10-13 08:26:45 +11:00
Marc Coll Carrillo
f0429ce95e
Use length limit for dynamic ribbon labels in the GP editor
2014-10-11 10:50:06 +02:00
hiker
216575a732
Started to let all sfx related command be executed from the sfx manager
...
to avoid race condition and crashes.
2014-10-11 11:55:02 +11:00
Marc Coll Carrillo
c159f1fca2
Merge remote-tracking branch 'upstream/master'
2014-10-10 22:39:55 +02:00
hiker
4dc817890b
Reverted 77bd4140a8 (which caused
...
crash and other sfx to be played only once).
2014-10-10 23:50:27 +11:00
Arthur-D
8d6daf8e14
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-10 13:18:00 +02:00
hiker
77bd4140a8
Replaced more getStatus() functions.
2014-10-10 16:48:21 +11:00
hiker
61068c7278
Replaces sfx->getStatus with isPlaying() functi n which is faster
...
(for #1511 ).
2014-10-10 16:45:29 +11:00
hiker
6dc18a3557
Change "Cancel" to 'Exit game' and make the back arrow invisible if
...
the login screen is shown before the race start.
2014-10-10 16:19:25 +11:00
hiker
8d587ab8f1
Fixed windows compilation.
2014-10-10 09:54:57 +11:00
hiker
a5ad78654e
Remove data after "-" when using uname (which could theoretically be
...
used to identify a system).
2014-10-10 09:40:19 +11:00
hiker
3877bf1dab
Added support for detecting BSD versions; added uname based fallback
...
on linux in case /etc/*release does not find valid info.
2014-10-10 09:21:15 +11:00
hiker
5d019e3537
Don't show a password entry field for the currently logged in user.
2014-10-10 07:57:10 +11:00
hiker
f39e2d9cdf
Actually display secret achievements once they have been achieved.
2014-10-10 07:49:14 +11:00
hiker
50c21cc11e
Added secret achievement (i.e. progress not shown in list).
2014-10-09 23:32:17 +11:00
deve
08c8de1986
Fixed missing quotes
2014-10-09 07:07:16 +02:00
auriamg
3061123e3e
Merge pull request #1606 from Flakebi/fix
...
Fix some more bugs
2014-10-08 18:18:37 -04:00
Arthur-D
b711a9949a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-08 21:06:24 +02:00
deve
6a62eaec9c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-08 14:49:15 +02:00
deve
f8de826888
Fixed compiler warnings
2014-10-08 14:44:05 +02:00
hiker
8495dbfd27
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-08 23:17:04 +11:00
hiker
30413b8d6d
Fix loss of associated online user name if stk is played offline
...
(might be a fix for #1595 ).
2014-10-08 23:14:43 +11:00
deve
95483268cf
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-08 14:04:38 +02:00
deve
d5faa23e0c
Use CMAKE_CXX_FLAGS instead of add_definitions for additional flags
2014-10-08 14:03:23 +02:00
hiker
029c33c276
Avoid writing the players.xml file multiple time at the exit time.
2014-10-08 22:53:34 +11:00
hiker
bc7d8f6103
Fixed compiler warning.
2014-10-08 22:49:32 +11:00
deve
f11b482576
Use stringstream instead of visual studio specific sscanf_s
2014-10-08 07:07:27 +02:00
Vincent Lejeune
ea3cc141ff
Fix grass in azdo mode
2014-10-08 01:01:28 +02:00
Vincent Lejeune
5b2d334b8c
Grass mat should use glossmap too
2014-10-08 00:50:18 +02:00
hiker
17fd8df935
Fixed assert statement.
2014-10-08 08:25:42 +11:00
hiker
4ff00018b4
Fixed alignment of password field.
2014-10-08 08:25:00 +11:00
hiker
d5bc5ec110
Fix #1605 : crash when downloading friends and achievements at the same time.
2014-10-08 08:00:58 +11:00
Flakebi
069853b11f
Fix #1153 Cleanup logging code
2014-10-07 20:54:54 +02:00
Deve
8818892bd2
Restore saved GPs is working again.
2014-10-07 19:16:18 +02:00
Marc Coll Carrillo
9b57d76a79
Check texture cache before adding an icon button's disabled texture
2014-10-07 18:27:08 +02:00
hiker
b2e6a4387a
Fixed linux compilation.
2014-10-07 23:15:27 +11:00
deve
3855dd646a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-07 06:54:42 +02:00
hiker
ed7a114f5f
Fix #1583 : flushing entries from the online profile cache would
...
make friend lists of other progiles incomplete. Also increased cache
size to 100.
2014-10-07 16:52:18 +11:00
deve
6b43e2dd6f
Don't allow too long GP names.
2014-10-07 06:54:02 +02:00
hiker
6a47c157d2
Removed "" around linux version number in hardware report,
...
compiler warning and windows line endings.
2014-10-07 15:42:22 +11:00
Flakebi
0193c4c7a5
Fix #1170 Add "Don't Assign" option when configuring inputs
2014-10-07 00:06:15 +02:00
Vincent Lejeune
9de7d11ee4
Fix bloom effect on mesa
2014-10-07 00:00:16 +02:00
Vincent Lejeune
20ea7ca271
GI use sun color value
2014-10-06 22:51:41 +02:00
Arthur-D
8e38f4ca30
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-06 22:39:48 +02:00
Deve
a4ac9f95c2
Use length limit for text only if it's needed.
...
This check is IMO not needed at all because translators will see if text fit in available area or not. But anyway this length should be large enough.
2014-10-06 21:57:25 +02:00
vlj
f828edb445
Fix crash with plunger
2014-10-06 20:51:04 +02:00
