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

988 Commits

Author SHA1 Message Date
hiker
02f4aa3015 Fixed crash (in race). 2015-01-16 14:58:40 +11:00
Marianne Gagnon
84821ad604 Add focus callback to GUI engine 2015-01-15 20:18:31 -05:00
hiker
1eb51db5ea Added command line option for keyboard debugging. 2015-01-08 09:05:04 +11:00
Mathieu Laprise
2d0503dcfb Fix a typo regarding my latest commit on issue #1837 2014-12-28 07:58:36 -05:00
Mathieu Laprise
17113f8d0d Merge branch 'master' of https://github.com/math07/stk-code into working 2014-12-27 15:14:35 -05:00
Mathieu Laprise
7f6a1dfd56 Handle spinner custom text differently differently to fix issue #1837 problem with activation/deactivation and updategfxSlider 2014-12-27 15:10:39 -05:00
Vincent Lejeune
f644543bc1 Move all gfx related config to a separate file 2014-12-27 03:14:16 +01:00
Deve
b02812662a Fixed crash in creating user screen, which occured after rename player. 
It's a bit quick and lazy fix. Probably other variables should be cleared too.
 2014-12-23 18:32:05 +01:00
Deve
4f910713f5 Make some strings translatable 2014-12-20 14:03:11 +01:00
hiker
e3879abb5b Work around #1780 (font corruption). 2014-12-17 11:08:28 +11:00
Deve
1a4f6e51ee Fixed problem in dynamic ribbon widgets which contain animations, labels and more than one row. 
Thanks to marcoll.
 2014-12-13 12:49:07 +01:00
Marianne Gagnon
91f6fbbb43 Fix typo in previous fix, reported by Math07 2014-12-12 19:41:15 -05:00
Marianne Gagnon
0aacea1c0b Apply math07's patch for taking padding into account in height="fit", fixes #1762 2014-12-11 19:33:44 -05:00
Marianne Gagnon
f05618b3b9 Add possibility to specify non-translated texts in GUI XML files, and use it for debug strings that should not be translated 2014-12-05 19:17:52 -05:00
hiker
9dc6425242 Merge branch 'master' of https://github.com/thamlett/stk-code into thamlett-master 2014-12-03 08:05:34 +11:00
Timothy Hamlett
42d6f0480c Actually fix #1754 
Thanks to Hiker for the help!
 2014-12-01 21:48:12 -06:00
Deve
24e850db79 Delete xx 
I simply try to delete it directly on github ;)
 2014-12-01 08:10:12 +01:00
hiker
006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
hiker
6e3c766749 Minor improvements to fix for #1713. 2014-11-27 15:36:56 +11:00
hiker
7c7fb68e82 Try fixing #1713 (crash pessing ESC on login screen). 2014-11-26 23:40:50 +11:00
hiker
45b19997de Fixed compiler warning (double to float). 2014-11-26 22:27:35 +11:00
Deve
54b311f6f7 Allow to set custom ratio for images from xml file. 
It avoids crashes and memory leaks after changing resolution.
 2014-11-24 19:31:46 +01:00
auriamg
af35bce41d Merge pull request #1714 from Flakebi/fixes 
Some minor fixes
 2014-11-16 21:21:45 -05:00
Vincent Lejeune
eb2151b854 Check if ribbon is null 2014-11-17 01:11:50 +01:00
Flakebi
f1383d1a93 Deactivate some checkboxes without advanced pipeline 2014-11-17 00:08:47 +01:00
Flakebi
b8484d3576 Fix #966 Don't select a kart/keyboard configuration automatically in multiplayer 2014-11-16 22:35:03 +01:00
Vincent Lejeune
d5330a8f39 Fix VS2013 "dereferencing null ptr" static analysis error 2014-11-16 04:40:19 +01:00
hiker
11b884eea4 Made '(handicap)' prefix translate-friendlier. 2014-11-12 18:45:34 +11:00
hiker
25b4d35a65 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code 2014-11-12 15:45:03 +11:00
hiker
ba55fd61dd Disabled warning messages if the automatically created disabled 
textures are not in the texture cache.
 2014-11-10 22:26:29 +11:00
hiker
bfe7bff877 Fixed #1680 (notification shown at wrong place after changing resolution). 2014-11-10 16:32:35 +11:00
Flakebi
5a84b471e4 Add 'handicapped' to player name 2014-11-04 23:36:16 +01:00
hiker
2462aef75a Fixed compiler warnings and coding style issues. 2014-11-03 08:55:20 +11:00
Flakebi
abf7bacfea Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/graphics/stkmesh.cpp
	src/states_screens/kart_selection.cpp
 2014-10-31 16:47:34 +01:00
hiker
c72ff275ec CURRENT can not be defined as result of or-ing the values, since the 
values are not bit masks.
 2014-10-31 12:29:15 +11:00
Marianne Gagnon
09953e622e Fix crash 2014-10-28 20:09:20 -04: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
690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
Marianne Gagnon
047c6fc760 Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
hiker
1cd5ffd484 Fixed compiler warning. 2014-10-24 21:48:14 +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
Vincent Lejeune
95cf6c5f4a Put 2d function in their own header 2014-10-18 18:16:50 +02: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
3fe2870c39 Cleaner fix for #1626, closes #1626 2014-10-14 20:03:50 -04:00
Marianne Gagnon
514d0c4dfe Work around #1626 2014-10-14 19:59:42 -04:00
hiker
c5434aa845 Merge branch 'master' of https://github.com/marcoll/stk-code into marcoll-master 2014-10-13 09:55:25 +11:00
hiker
6dc18a3557 Change "Cancel" to 'Exit game' and make the back arrow invisible if 
the login screen is shown before the race start.
 2014-10-10 16:19:25 +11:00
auriamg
3061123e3e Merge pull request #1606 from Flakebi/fix 
Fix some more bugs
 2014-10-08 18:18:37 -04:00
deve
f8de826888 Fixed compiler warnings 2014-10-08 14:44:05 +02:00
Flakebi
069853b11f Fix #1153 Cleanup logging code 2014-10-07 20:54:54 +02:00