Commit Graph

13445 Commits

Author SHA1 Message Date
hiker
4edcf6169b Removed debug code. 2014-10-16 12:55:59 +11:00
hiker
c61b7d632d Fix stk hanging on exit. 2014-10-16 12:48:48 +11:00
hiker
8a89ce5161 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-16 12:47:45 +11:00
hiker
1f87dbb94e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-16 09:12:19 +11:00
hiker
0cccb5f1d5 Fixed typo. 2014-10-16 09:11:56 +11:00
hiker
140ea5ed84 Update comments. 2014-10-16 08:21:26 +11:00
hiker
aae834ba4b Run the music manager from the sfx thread. 2014-10-16 08:13:55 +11:00
hiker
09f8ffb16e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-16 07:40:43 +11:00
hiker
bba7156aff Handle the setting of the listener position in the sfx thread. 2014-10-15 23:42:59 +11:00
hiker
7e4e857b41 Improve situation of #1624 - it should only happen now if you pause the
game in the first one or two seconds after start (still wip).
2014-10-15 23:38:13 +11:00
Marianne Gagnon
3fe2870c39 Cleaner fix for #1626, closes #1626 2014-10-14 20:03:50 -04:00
Marianne Gagnon
514d0c4dfe Work around #1626 2014-10-14 19:59:42 -04:00
hiker
607e94ea84 Fixed #1622 (missing password field in login screen). 2014-10-15 08:20:06 +11:00
hiker
eec19b0703 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-15 07:56:50 +11:00
hiker
8fcc373b2a Add volume, speed, and position settings to be done by the sfx
thread. Removed more unnecessary error checks (which mostly flood
stdout with 'not playing ...' messages), and renamed volume, position
and speed to setVolume, setPosition and setSpeed.
2014-10-15 07:55:18 +11:00
quizywiz
6dd9feff36 escape or back on friends profile takes you to your profile
Also, fixed bug where user info dialog was accessing m_enter_profile
after it was deleted
2014-10-14 12:07:08 +05:30
hiker
c18579d86a Fixed compiler warning. 2014-10-14 09:57:53 +11:00
hiker
22633aa363 Avoid calling querying the openal status in getStatus (which causes
a slowdown of sfx).
2014-10-14 09:01:26 +11:00
hiker
d753fab7db Removed debug output. 2014-10-14 09:01:13 +11:00
hiker
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +11:00
Marc Coll Carrillo
26b286ab9c Merge remote-tracking branch 'upstream/master' 2014-10-13 18:00:59 +02:00
hiker
5cf7b0dca9 Added computation of the duration of a sound buffer (unused atm). 2014-10-13 22:06:05 +11:00
hiker
f84e773738 Removed status check when queueing sfx, to get more consistent
runtime behaviour.
2014-10-13 22:04:46 +11:00
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
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
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