ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,935 Commits 9 Branches 28 Tags
Commit Graph

112 Commits

Author SHA1 Message Date
Marianne Gagnon
5d5460d845 Add way to test intro cutscene easily; do not throttle sound effects on cutscenes 2014-11-22 18:21:31 -05:00
hiker
690ad4ce95 Fixed sfx direction. 2014-10-21 22:07:22 +11:00
hiker
8d9f1aa002 Renamed SoundToggled to toggleSound. 2014-10-21 08:48:21 +11:00
hiker
65b7589849 Make sure the sfx are resumed before calling onSOundEnbaledBack(). 2014-10-21 08:31:10 +11:00
hiker
c7d7e17ff9 Handle setMasterVolume in sfx thread. 2014-10-21 08:28:41 +11:00
hiker
8b7bf28e0f Fixed #1147 - sounds should stopped when they are disabled in option screen. 
Fixed by explicitely stopping all non-looped sfx.
 2014-10-20 22:37:19 +11:00
hiker
3082267eb4 Properly test for sfx disabled, and only schedule events if sfx 
are enabled. Fixes #1629.
 2014-10-18 12:11:02 +11:00
hiker
19f9afb67f Manually keep track of the duration each sfx has been played (instead 
of relying on the world clock, which can run backwards, e.g. in
FTL mode). Fixes #1624.
 2014-10-18 11:46:22 +11:00
hiker
7103ea8e88 Throttle sfx command if the queue should get too long (might need some 
tuning). Non-essential sfx (positioning, speed, looping, and play)
are discarded.
 2014-10-17 16:53:44 +11:00
hiker
403702d6bb Handle pauseAll and resumeAll completely in thread now. Avoids a crash 
(caused by pauseAll trying to pause a sfx that is still in the list of
all sfx, but has a delete command already queued up).
 2014-10-17 16:26:15 +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
a40d6d8a00 Removed isPlaying function, and use getStatus instead. 2014-10-17 08:27:40 +11:00
hiker
a18766e3e6 Handle looping in sfx thread. 2014-10-16 16:57:12 +11:00
hiker
c61b7d632d Fix stk hanging on exit. 2014-10-16 12:48:48 +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
bba7156aff Handle the setting of the listener position in the sfx thread. 2014-10-15 23:42:59 +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
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
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +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
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
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
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
hiker
99fd49bdc0 Run SFX in a separate thread (for #1511). 2014-09-22 17:04:14 +10:00
hiker
c147dacbc2 Queue up sfx instead of starting them immediately. Preparation for 
threading the sfx manager.
 2014-09-18 11:43:26 +10:00
hiker
64fc2dd968 Added comments. 2014-09-18 07:55:24 +10:00
hiker
8c3beef69b Removed unnecessary static variable. 2014-09-18 07:48:31 +10:00
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces" 
This reverts commit 65e2dcf2f09e979b39f8d115da7d17dabac0b957.
 2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
KroArtem
66c5d4a645 removed unused functions 2014-03-16 15:28:46 +04:00
auria
6b7e33a267 Convert a bunch of prints to our logging system, it's long overdue we fix that 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14874 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-01 19:11:01 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed 
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories 
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 23:48:47 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this 
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:27:55 +00:00
hilnius
ea2b52a663 merging hilnius's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 18:03:11 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-29 22:04:35 +00:00
hikerstk
a6223250db Fixed #943 - replaced printf with Log - thanks to pkucoin. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-23 11:06:50 +00:00
auria
78d964b79d try to fix sound leaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12222 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-09 23:30:26 +00:00
hikerstk
fe6294d0d4 Fixed two uninitialised variables, removed unnecessary #include. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-20 02:57:21 +00:00
auria
65d897915a Manually implement muting sounds when too far since OpenAL doesn't seem to have that feature, and use it to finally make the spaceship sound in the intro work 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-07-22 20:05:38 +00:00
auria
9f909b4c26 undo my attempts at configuring the attenuation model per-source, after closer inspection OpenAL doesn't support what I was trying to do :( 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-07-22 19:20:41 +00:00
auria
1574ff472d Add specifying SFX rolloff type 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-06-30 18:49:35 +00:00
auria
62d76f1405 Apply patch by riebl : fix possible crash when OpenAL was disabled 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10932 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-06 16:33:06 +00:00
auria
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-06 18:43:36 +00:00
auria
9afdcfaf50 Apply patch that is a bit similar to what xapantu did, but in a IMHO more modular way 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-11-27 01:14:16 +00:00
auria
d8815794b9 Fixed a lot of old logging code left from before the log level was a bit mask. We don't have too many log bits so atm they are classified a lot in 'misc' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-07-15 23:39:09 +00:00
auria
6e4cee9341 Includes cleanup; especially avoid including in headers, creating implicit dependencies and horrible chains of recursive includes. Avoid iostream when possible because this header is not small 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8749 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-05-29 19:52:24 +00:00