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

13877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
konstin
ae24c6b40f only one saved GP per GP-ident 
Conflicts:
	src/graphics/glwrap.cpp
 2014-10-20 23:46:25 +02: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
a09c1346b7 Fixed sound objects. 2014-10-21 08:21:58 +11:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch... 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
 2014-10-20 22:36:54 +02:00
Flakebi
71b8ba4d43 Merge branch 'master' into perPlayerDifficulties 
Conflicts:
	src/guiengine/widget.hpp
	src/guiengine/widgets/progress_bar_widget.cpp
 2014-10-20 22:27:34 +02:00
hiker
9dff5a7990 Fix potential memory overwrite in soccer mode when using one player 
only (artist debug mode).
 2014-10-20 23:01:31 +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
07c37539fd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-20 09:43:40 +11:00
hiker
36ea7f30bf Only restart sfx if they were really paused. 2014-10-20 09:43:05 +11:00
Vincent Lejeune
f3dd009376 Try to fix model loader hpp 2014-10-19 18:44:08 +02:00
Vincent Lejeune
4ee0e24ff7 Try to fix travis build. 2014-10-19 16:40:27 +02:00
Vincent Lejeune
b13e6931ce Revert "Try to fix travis build." 
This reverts commit 3ea954cc73.
 2014-10-19 16:39:39 +02:00
hiker
3ea954cc73 Try to fix travis build. 2014-10-20 00:48:15 +11:00
hiker
11dbb6f062 Fixed some warnings printed when sfx are disabled. 2014-10-20 00:05:48 +11:00
Marianne Gagnon
9b46cdc981 Refactor library nodes to be proper TrackObjects, allows animating them with curves 2014-10-18 19:11:24 -04:00
Vincent Lejeune
e23aba65f4 Move shader load code to shader.cpp instead of glwrap.hpp 2014-10-18 23:53:16 +02:00
Vincent Lejeune
80c7c5e49b Remove unused functions 2014-10-18 18:29:37 +02:00
Vincent Lejeune
95cf6c5f4a Put 2d function in their own header 2014-10-18 18:16:50 +02:00
Vincent Lejeune
5efea6fd1a Factorise attribute binding function 2014-10-18 17:59:30 +02:00
hiker
c40a8eb377 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-18 23:44:11 +11:00
hiker
650b541def Try to fix #1622 (can't login due to a missing password entry field). 2014-10-18 23:43:27 +11:00
Vincent Lejeune
e165398fdd Fix texture 2014-10-18 04:10:59 +02: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
df5635e90f Fixed typo in warning message. 2014-10-18 12:10:27 +11:00
hiker
02435e4977 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-18 11:47:20 +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
Marianne Gagnon
acc90fd03c Don't let irrlicht process tab events. FIxes #1619, fixes #1225, fixed #1454 2014-10-17 19:39:38 -04:00
Marianne Gagnon
c95e90b925 Tweak checkbox position on login screen 2014-10-17 19:24:21 -04:00
Vincent Lejeune
2f45266c6f Fix position of speedmeter 
Only need to get the texture
 2014-10-17 18:51:41 +02:00
Vincent Lejeune
ce7f017adf Some fixes 2014-10-17 18:43:39 +02:00
Vincent Lejeune
f67f207d4b Start fixing speedmeter 2014-10-17 18:19:23 +02:00
hiker
3694758f56 Removed debug output. 
Conflicts:
	src/audio/sfx_manager.cpp
 2014-10-17 16:54:44 +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
0a39842b04 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:49:14 +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
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