Commit Graph

13760 Commits

Author SHA1 Message Date
hiker
1920703f09 Converted label to button, just for tests. 2014-10-24 10:34:10 +11:00
hiker
f6aa05ec1c Modified to trigger automatic rerun of cmake. 2014-10-24 10:30:23 +11:00
hiker
3372d06759 Removed unused files. 2014-10-24 10:22:27 +11:00
Vincent Lejeune
794ab54b7a Clamp lodval 2014-10-24 00:41:34 +02:00
hiker
b4f95d672a Started to indicate the name of the logged in user ... still work in
progress (black writing on dark grey).
2014-10-23 22:26:11 +11:00
hiker
f70687a00b Minor cosmetic changes only. 2014-10-23 22:25:23 +11:00
hiker
6e79f90166 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-23 08:34:47 +11:00
hiker
efe64f4a67 Engine is no longer disabled after a kart-kart collision. 2014-10-23 08:21:54 +11:00
hiker
2cad89ceeb iFix #1617 (no sfx on hitting the track). 2014-10-23 08:03:15 +11:00
Arthur-D
e7ef83aea8 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-10-22 22:14:20 +02:00
Vincent Lejeune
7d602225fb Use InitTexture for transparents too 2014-10-22 22:05:09 +02:00
Vincent Lejeune
d0b996ab4a Use template defined SetTexture argument sets instead of vector 2014-10-22 21:51:11 +02:00
Vincent Lejeune
9ca4d7e3e6 Improve ibl specular reflexion using mipmap chain 2014-10-22 14:49:06 +02:00
hiker
86b8036926 Fix #1631 (SFX can not be enabled in in-race game menu). 2014-10-22 17:16:39 +11:00
hiker
9e76a81bfd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-22 09:42:42 +11:00
Vincent Lejeune
bdb98d6380 remove nested np.sum 2014-10-22 00:40:58 +02:00
Vincent Lejeune
de09937f88 Algorithm for diffuse coeff implemented in py 2014-10-22 00:17:32 +02:00
hiker
69c155063a Added Yes/No dialog box, and used it for the 'allow STK to connect
to internet' question.
2014-10-22 09:15:42 +11:00
Vincent Lejeune
7d22a5961d Vectorize solid angles a little more 2014-10-21 23:37:48 +02:00
Vincent Lejeune
82610cc048 Normalize terms in computeYmlOnGrid 2014-10-21 23:32:45 +02:00
Vincent Lejeune
d9ea756b15 Add function for solid angle 2014-10-21 23:28:01 +02:00
hiker
c012e98f9b Allow disabling of hw stats collection. 2014-10-22 08:20:26 +11:00
hiker
690ad4ce95 Fixed sfx direction. 2014-10-21 22:07:22 +11:00
Marianne Gagnon
0025f908db Add cleanup post-minimap-RTT. Appears to fix #1470 . Hard to know for sure since this bug is random :( 2014-10-20 20:38:37 -04:00
hiker
d3ba39b130 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-21 09:49:21 +11:00
Vincent Lejeune
2e27d8724a Add a script that computes IBL factors 2014-10-21 00:35:25 +02:00
hiker
98a10d5614 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-21 08:49:03 +11:00
hiker
8d9f1aa002 Renamed SoundToggled to toggleSound. 2014-10-21 08:48:21 +11:00
Deve
04933af4b0 Redrawing GP info screen is not needed now. 2014-10-20 23:46:25 +02:00
Deve
321f0e7078 Remove saved GP when we start new race.
Avoid a crash. Saved GP was deleted, but was not NULL. And in other place we have if(m_saved_gp != NULL) check, which was true for deleted object.
2014-10-20 23:46:25 +02:00
konstin
4647a50acb Save GP on abort 2014-10-20 23:46:25 +02:00
konstin
f65ad8f84f Save GP reverse Type; close #1137 2014-10-20 23:46:25 +02:00
konstin
035fc599ee fix ordering of the karts and maybe some more 2014-10-20 23:46:25 +02:00
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