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

13485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Flakebi
f27597c450 Revert "Fix incorrect alignment in spinner widgets" 
This reverts commit 4cb8be6ab4.
 2014-10-26 18:02:28 +01:00
Flakebi
46f3fa5f74 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/options_ui.stkgui
	src/graphics/stkmesh.cpp
	src/states_screens/options_screen_ui.cpp
 2014-10-26 17:47:29 +01:00
Flakebi
4cb8be6ab4 Fix incorrect alignment in spinner widgets 2014-10-26 17:10:28 +01:00
Flakebi
690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
Arthur-D
ef2cf3b17d Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome. 2014-10-26 15:34:51 +01:00
Arthur-D
4ed59d8a4d Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-10-26 14:10:31 +01:00
hiker
d63a5dba45 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-25 10:36:19 +11:00
hiker
d8cb6e1069 Moved #include to the top. 2014-10-25 10:32:28 +11:00
Marianne Gagnon
047c6fc760 Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
hiker
759182bb68 Used SDL's joystick name detection on windows. 2014-10-25 10:18:27 +11:00
hiker
1cd5ffd484 Fixed compiler warning. 2014-10-24 21:48:14 +11:00
hiker
6893e94e71 Replaced irrXML usage with out XMLNode. 2014-10-24 21:47:50 +11:00
hiker
2d5af3bee8 Change the text of the login name dynamically (i.e. from local 
name to online name).
 2014-10-24 16:52:37 +11:00
hiker
d1f68ca480 Go to the user screen when clicking on the user button. 2014-10-24 14:00:51 +11:00
hiker
f7893afbef Adjusted button position, thanks to auria. 2014-10-24 11:16:08 +11:00
hiker
b5db6f3270 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-24 10:35:55 +11:00
hiker
8bc6aa91bb Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-24 10:34:59 +11:00
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