hiker
383cbef14d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-17 12:04:04 +11:00
hiker
c7f37297b1
Fixed potential deadlock (if a sfx is not found in the queue, which shouldn't
...
happen); stop sounds which are deleted only once, slightly reduce size of
locked region.
2014-10-17 12:02:23 +11:00
hiker
813edc7ddf
Remove SFX_INITIAL state.
2014-10-17 12:00:00 +11:00
Marianne Gagnon
1bd9fc0423
Fix mesh tangents caching
2014-10-16 18:40:49 -04:00
Marianne Gagnon
bf5c77d061
Merge branch 'master' into TangentsCaching
2014-10-16 18:20:23 -04:00
hiker
a40d6d8a00
Removed isPlaying function, and use getStatus instead.
2014-10-17 08:27:40 +11:00
Deve
3499975b03
Move track name to center.
...
It allows a bit longer track names and looks better.
2014-10-16 19:33:54 +02:00
hiker
3d15f13c74
iFixed #1624 (though it is a bit of a hack).
2014-10-16 23:45:09 +11:00
hiker
6dc36b6096
Merge branch 'quizywiz-master'
2014-10-16 22:51:18 +11:00
hiker
31c4b2c475
Merge branch 'master' of https://github.com/quizywiz/stk-code into quizywiz-master
2014-10-16 22:47:46 +11:00
hiker
014bc73940
Don't create a sound effect for AIs if its volume is set to 0.
2014-10-16 21:46:31 +11:00
Deve
9921c742e3
Merge pull request #1621 from marcoll/master
...
Use length limit for dynamic ribbon labels in the GP editor
2014-10-16 08:30:34 +02:00
hiker
662200371a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-16 17:17:26 +11:00
hiker
4bb1091f3e
Moved sfx thread update to happen after graphics code is finished.
...
This improves performance since threads in graphics code do not
compete with threads in sfx handling anymore.
2014-10-16 17:11:15 +11:00
hiker
e4e0724cb9
Removed unnecessary stop of music (music will stop anyway once the
...
buffer is finished, but if music is completely threaded it might
just keep on playing).
2014-10-16 17:03:13 +11:00
hiker
a18766e3e6
Handle looping in sfx thread.
2014-10-16 16:57:12 +11:00
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
Arthur-D
c45f6a1133
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-14 23:21:58 +02: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
Arthur-D
8d6daf8e14
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-10 13:18:00 +02:00
