ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,268 Commits 9 Branches 28 Tags
fc670cecf2ac052dfd38e124d4ea45a15b68fa8a
Commit Graph
595 Commits
Author SHA1 Message Date
hiker 342cb82653 Merge branch 'new_register_screen' 2015-01-12 12:19:56 +11:00
hiker 7bd1126df8 Improve flow from register screen back to user screen. Now password 
and online user name do not need to be added again.
 2015-01-12 09:41:34 +11:00
hiker 5ccedfc349 Use tabs in register screen (work in progress). 2015-01-09 09:42:18 +11:00
hiker b0879514fb Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-08 13:33:16 +11:00
hiker 520625adae Removed 'sign' (in/out), use 'log' (in/out) instead. 2015-01-08 13:32:50 +11:00
Marianne Gagnon 91b4c6e08a Apply modified version of pull request #1881, fixing #1859 2015-01-07 19:53:25 -05:00
konstin 531b94a0ac cleaning up and adding radius and energy sliders 2014-12-30 18:47:25 +01:00
GunChleoc ed56858321 Fixed a typo. 2014-12-23 16:21:47 +01:00
Deve 2995051f7c Merge pull request #1779 from math07/working 
When entering gp_name, display buttons vertically to allows gamepad
 2014-12-15 12:17:00 +01:00
hiker 3fa8625c78 Fixed incorrect icon name. 2014-12-15 17:10:34 +11:00
Mathieu Laprise 15927f319c When entering gp_name, display buttons vertically to allows gamepad selection 2014-12-12 20:19:27 -05:00
hiker ba990318d1 Merge remote-tracking branch 'origin/master' into new_server 2014-12-13 10:49:45 +11:00
Marianne Gagnon 9b3b99610a MInor GUI XML cleanup 2014-12-11 19:39:30 -05:00
Marianne Gagnon 7cc28a9755 Revert "Friends Search bar goes off the bottom of the screen #1762" 
This reverts commit f98a169e9c.
 2014-12-10 21:04:57 -05:00
hiker 83f49ec319 Merge remote-tracking branch 'origin/master' into new_server 
Conflicts:
	src/online/http_request.cpp
 2014-12-10 11:25:16 +11:00
Mathieu Laprise f98a169e9c Friends Search bar goes off the bottom of the screen #1762 2014-12-06 17:28:02 -05:00
Mathieu Laprise 107e434fe9 Missing button in grand prix editor name dialog #1765 2014-12-06 15:14:27 -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 645f01a508 Removed 'can use existing stkaddons' account from message. 2014-12-04 16:24:14 +11:00
hiker ea3a433147 Fix #1620 (Player's achievements can only be seen when logged in). 2014-11-25 17:12:47 +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
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
Flakebi 4ab84a6b83 Unify I18N attributes in screens 2014-11-17 00:08:47 +01:00
Marianne Gagnon d8b0f79428 Tweak register script so that the "Online" checkbox is closer to the text 2014-11-15 18:38:51 -05:00
hiker 753c3d7168 Fixed #1638 (text overflows behind buttons) - partially by removing 
the confirmation field for the emal address.
 2014-11-13 22:42:32 +11:00
Flakebi 9dd86c8332 Don't handicap AIs 2014-11-04 23:57:33 +01:00
Flakebi 5a84b471e4 Add 'handicapped' to player name 2014-11-04 23:36:16 +01:00
hiker dec5ac8aa2 Fixed several xml errors (unclosed <space> tags). 2014-11-03 15:25:39 +11:00
hiker 62b81b3e9a Shortened labels to fit on smaller screens. 2014-11-03 08:23:35 +11:00
Flakebi 9ca1c03480 Applying merges correctly is difficult... 2014-10-31 18:54:52 +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 690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
hiker f7893afbef Adjusted button position, thanks to auria. 2014-10-24 11:16:08 +11:00
hiker 1920703f09 Converted label to button, just for tests. 2014-10-24 10:34:10 +11: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 c012e98f9b Allow disabling of hw stats collection. 2014-10-22 08:20:26 +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
Marianne Gagnon c95e90b925 Tweak checkbox position on login screen 2014-10-17 19:24:21 -04: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
auriamg 3061123e3e Merge pull request #1606 from Flakebi/fix 
Fix some more bugs
 2014-10-08 18:18:37 -04:00
hiker 4ff00018b4 Fixed alignment of password field. 2014-10-08 08:25:00 +11:00
Flakebi 0193c4c7a5 Fix #1170 Add "Don't Assign" option when configuring inputs 2014-10-07 00:06:15 +02:00
hiker 6f5b7aa4ae Tried a different layout for the checkboxes (sorry, but I didn't like the 
previous approach at all). Only disadvantage now (I can think of) is that
the width of the lables is now hard coded to 40% of the screen.
 2014-10-06 07:48:15 +11:00
Flakebi dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
 2014-10-05 12:10:39 +02:00
Marianne Gagnon 83b25768cc tweak players screen, checkbox placement was weird 2014-10-04 19:44:04 -04:00
hiker de9a1f51a7 Removed empty 'online overview' page, show the achievements page instead. 2014-10-02 07:59:24 +10:00
Flakebi 47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
hiker a593c81a64 Some improvement for #1505, but still wip. 2014-09-26 16:33:47 +10:00
hiker 2d7b8228e9 Fix #1565: Added better instructions for account creation screen (and also made the 
instructions actually visible).
 2014-09-26 08:57:52 +10:00
Flakebi 2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00