Daniel Butum
cc4903737c
Add QtCreator project file to gitignore
2015-02-12 10:43:55 +02:00
hiker
4e88cb6753
Fixed #1978 (by removing unnecessary stopMusic in World, which actually
...
stops the menu music, not the tutorial music. It's unnecessary since
startMusic (main menu) later will first stop currently running music.
2015-02-12 16:56:25 +11:00
hiker
93c5012f57
Fixed incorrect label 'debug' for verbose messages and vice versa.
2015-02-12 16:49:16 +11:00
hiker
f589b2063e
Fix crash when going story mode while music is disabled.
2015-02-12 13:19:58 +11:00
hiker
c675b6f38c
Avoid warning at runtime about missing texture.
2015-02-12 13:00:12 +11:00
hiker
2d5f78974a
Merge pull request #1975 from Flakebi/sound
...
Set correct volume for last lap music
2015-02-12 08:02:10 +11:00
hiker
57414348fa
Merge pull request #1976 from Flakebi/nographics
...
Fix crash with --nographics
2015-02-12 08:00:18 +11:00
hiker
72ce6c8bf6
Fixed race over music not playing when sfx are disabled.
2015-02-12 07:57:51 +11:00
hiker
33f87e28f7
Prevent flooding of terminal with "music not playing" messages, added
...
debug error check.
2015-02-12 07:57:25 +11:00
Flakebi
d4f982d7dd
Fix crash with --nographics
2015-02-11 20:52:05 +01:00
Marianne Gagnon
2ba46cff9e
Merge remote-tracking branch 'Flakebi/skidding-light'
2015-02-10 20:09:03 -05:00
hiker
98195c4079
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-02-11 09:18:20 +11:00
hiker
f57ad3c1ed
Try to fix #1972 (things went wrong when stk tried to delete uninitialised
...
sound sources).
2015-02-11 09:16:48 +11:00
Vincent Lejeune
401187dcf0
Try to fix 1937
2015-02-10 22:38:15 +01:00
hiker
a598b0ed1a
Fix after-race sfx which wasn't playing anymore (caused by quick sound
...
effects not having update() called, which is necessary to detect if they
have stopped playing).
2015-02-11 08:06:28 +11:00
Flakebi
91d042da31
Set correct volume for last lap music
2015-02-10 16:52:50 +01:00
hiker
84a84b6776
Try to fix playing without music.
2015-02-10 17:31:35 +11:00
hiker
7d0875878b
Simplified startMusic call.
2015-02-10 17:27:07 +11:00
hiker
ec598d6f41
Start music properly in thread, avoid starting track music more than once.
2015-02-10 17:07:46 +11:00
hiker
2106e0caaf
Merge branch 'minor-fixes' of https://github.com/Flakebi/stk-code into Flakebi-minor-fixes
2015-02-10 15:41:28 +11:00
hiker
8ade65791e
Merge branch 'Flakebi-rename-h'
2015-02-10 11:38:05 +11:00
hiker
325d1a11c1
Merge branch 'rename-h' of https://github.com/Flakebi/stk-code into Flakebi-rename-h
2015-02-10 11:34:21 +11:00
hiker
95ecd0eed1
Let the audio thread run 'all the time' by sending itself an
...
update package after the queue is empty.
2015-02-10 09:22:23 +11:00
hiker
58f0ce412e
Removed unnecessary m_adjusted_gain variable and resetTempVolume
...
function. Fixed that music volume in race could not be changed.
2015-02-10 08:32:05 +11:00
Flakebi
604e712b81
Apply konstin's idea which makes it much shorter
2015-02-09 22:28:47 +01:00
Flakebi
683f42527e
Add light effect when skidding
2015-02-09 15:18:53 +01:00
Flakebi
f86a92286c
Set the music before updating to fix -N too
2015-02-09 01:56:56 +01:00
Flakebi
4abe3ce327
Make music and sound work with fast starts, fixes #1291
2015-02-09 01:22:47 +01:00
Flakebi
d5cbf4fc6b
Math works better with brackets
2015-02-09 01:22:47 +01:00
auria
13bfee5ce1
Do not output line numbers for strings that come from XML, since XML comments are extracted from a fake .h ffile and their location in that intermediary file has no use
2015-02-08 18:17:05 -05:00
auria
671e3829a4
Do not extract strings from wip-tracks. Fixes #1967
2015-02-08 18:05:42 -05:00
hiker
70ed2b47d0
Fix #1962 .
2015-02-09 08:22:35 +11:00
hiker
08493448be
Merge branch 'Flakebi-clang-fix'
2015-02-08 22:24:05 +11:00
hiker
ca2b5335dc
Removed hopefully unnecessary string copy.
2015-02-08 22:22:06 +11:00
hiker
33cb6d9356
Merge branch 'clang-fix' of https://github.com/Flakebi/stk-code into Flakebi-clang-fix
2015-02-08 22:12:39 +11:00
hiker
43aadcef34
Follow coding style for #includes.
2015-02-08 22:12:08 +11:00
Marianne Gagnon
758eb6e003
Use label with word_wrap instead of list for terms. See #1812
2015-02-06 20:11:15 -05:00
Vincent Lejeune
13393ef04b
Fix 1808
2015-02-07 01:55:14 +01:00
Flakebi
d56472c224
Rename some .h files to .hpp
2015-02-05 21:32:17 +01:00
Flakebi
31d4c34fbb
Improve clang bugfix
2015-02-05 15:18:57 +01:00
hiker
2d4200c754
Removed rather embarrassing left-over debug code.
2015-02-05 18:29:05 +11:00
hiker
0ab3d12eab
Fixed invalid name openal error when setting the volume of fast
...
music (apparently caused by trying to set the music of the actually
freeded normal music just before).
2015-02-05 15:22:20 +11:00
hiker
5f59985ef1
Added documentation about which asset version is used for which
...
STK version.
2015-02-05 13:59:16 +11:00
Flakebi
38f0e31a48
Fix clang build, freeing memory too early
2015-02-05 02:58:55 +01:00
Marianne Gagnon
ecad7c2996
Mark some emitters as important so that they are never disabled by options, fixes #1808
2015-02-04 20:13:06 -05:00
auriamg
f4909d7c46
Merge pull request #1957 from Flakebi/highscore
...
Improve the layout of the race result screen
2015-02-04 18:50:54 -05:00
hiker
1e994748cc
Properly handle volume setting from sfx thread, removed MusicManager
...
from friends of MusicInformation to enforce this. Added error checks
to properly detect location of warning when faster music is plaued
(still under investigation).
2015-02-05 09:22:13 +11:00
Flakebi
1aa6f7c173
Improve the layout of the race result screen
2015-02-04 14:42:10 +01:00
hiker
ddc60f98a1
Removed unnecesary #include.
2015-02-04 18:18:37 +11:00
hiker
eb37092643
Moved all remaining music commands to be handled by sfx thread.
2015-02-04 17:08:22 +11:00
