Commit Graph

530 Commits

Author SHA1 Message Date
Flakebi
a84c5d596c Fix focus crash in kart selection screen 2014-09-02 03:43:08 +02:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
44add00944 Rename icons to more generic names 2014-09-01 22:21:17 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Marianne Gagnon
83a1acc961 Merge branch 'save_gp' 2014-08-16 15:42:46 -04:00
hiker
11f3c1fc11 Added the recovery dialog back in :) 2014-08-11 22:39:08 +10:00
Marianne Gagnon
2c1feb5f06 Improve debug values popup 2014-08-10 19:09:44 -04:00
vlj
768d51d0c3 Add sliders to change ssao parameters. 2014-08-09 19:22:30 +02:00
konstin
c59f243550 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-08-09 17:06:16 +02:00
Marianne Gagnon
346faff845 Clean up video settings dialog. Not a bad attempt vlj but not quite there ;) 2014-08-03 19:57:33 -04:00
vlj
c0e554de30 Remove UBO settings in the options 2014-08-04 01:50:04 +02:00
Flakebi
bc458c42d3 Apply per-player difficulty 2014-07-30 22:26:59 +02:00
konstin
fb50c9c338 moving the button to xml 2014-07-30 14:58:53 +02:00
Marianne Gagnon
939e5d9fff Rework graphics settings popup to make it clear which options require the advanced pipeline 2014-07-21 19:48:17 -04:00
Marianne Gagnon
ed97fca7b3 Ease debugging GPWin/GPLose/FeatureUnlocked scenes 2014-07-08 20:37:39 -04:00
Flakebi
e16a7de617 Change xml style of screens and fix some issues with screens 2014-06-19 09:49:36 +02:00
Arthur-D
cad6d5b3ae Set player icons as 128x128 instead of 160x120 so the image ratio is correct. 2014-06-04 14:55:13 +02:00
hiker
0358e55e2e Added 'back' button to user screen. 2014-06-02 08:21:36 +10:00
Marianne Gagnon
5e132f7410 Add GI to video options 2014-05-30 19:49:21 -04:00
hiker
36d705f021 Added 'always-show-login-screen' option, moved 'remember-password'
option from UI-options to UserScreen.
2014-05-27 15:36:44 +10:00
hiker
6ca40916f7 Used proper icons for user screen. 2014-05-24 11:22:12 +10:00
hiker
cf297c67b4 Fixed heading. 2014-05-17 11:40:16 +10:00
hiker
71603816fa Merge remote-tracking branch 'origin/master' into new_login 2014-05-16 14:21:13 +10:00
hiker
0459c33f66 Added a tabbed version of the user screen, and integrated it into
the option menu of STK.
2014-05-15 22:59:21 +10:00
Marianne Gagnon
aae7d01e57 Try to make the custom GUI settings popup work on any resolution 2014-05-14 19:29:39 -04:00
hiker
71d4e380b3 Disabled guest account. 2014-05-15 08:56:46 +10:00
hiker
ce52bf90e4 Merge branch 'new_login' of github.com:supertuxkart/stk-code into new_login 2014-05-14 14:10:10 +10:00
hiker
d9daf928e5 Merge remote branch 'origin/master' into new_login 2014-05-14 14:06:06 +10:00
hiker
8d4b33f221 Removed tabs, and use a separate screen instead. Some more refactoring
to make remember-me a global setting.
2014-05-08 22:17:15 +10:00
hiker
6fb9832fc2 Added box around screen, hide 'guest' if no online login is requested. 2014-05-07 17:10:02 +10:00
hiker
83c29b0778 Instead of individual 'remember-me' settings, use one global setting. 2014-05-07 16:39:09 +10:00
hiker
737c8a9983 Added 'delete player' functionality. 2014-05-06 16:52:36 +10:00
hiker
d847e8de00 Renamed StoryModeLobby to UserScreen. 2014-05-05 21:17:46 +10:00
hiker
6010831654 Removed original login screen, made the new login screen a tab.
Removed guest tab (and started to use a checkbox for that for now).
Work in progress.
2014-05-05 20:46:48 +10:00
hiker
00cf9a3dbe Merge remote branch 'origin/master' into new_login 2014-05-05 09:20:37 +10:00
Guillaume P
a863757365 Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
Conflicts:
	data/gui/custom_video_settings.stkgui
	src/states_screens/dialogs/custom_video_settings.cpp
2014-05-03 10:32:47 +02:00
Marianne Gagnon
423a833bb8 Add DOF checkbox to the graphics options 2014-05-02 19:02:58 -04:00
Guillaume P
14508bc2ac Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 2014-05-02 19:18:58 +02:00
hiker
d7219f3a2d Added 'ok' button to 'new player' dialog. I can't seem to get them next
to each other, so for now they are just on top of each other.
2014-04-30 16:57:22 +10:00
hiker
af9fb24d2e Handle disabled internet (and provide a message to the user if he
tries to login with internet disabled).
2014-04-30 16:37:05 +10:00
hiker
5124ba2bed Merge remote-tracking branch 'origin/master' into new_login 2014-04-30 11:28:13 +10:00
hiker
ecef685b32 Adding new players now works. 2014-04-30 07:54:49 +10:00
hiker
812da3e0c0 Some work on new login screen, though wip atm. 2014-04-29 09:02:44 +10:00
Guillaume P
03fbdc260d Add a new option for high-definition textures. 2014-04-28 18:42:23 +02:00
hiker
2f17264f39 Very eary first version of a new login screen. 2014-04-28 16:41:47 +10:00
Daniel Butum
a769563878 Fix back button size in guest login screen 2014-04-26 14:03:14 +03:00
hiker
370e2e4935 Merge remote-tracking branch 'origin/master' into new_login 2014-04-24 12:26:29 +10:00
Marianne Gagnon
2e53328847 Add debug sliders for vlj 2014-04-23 19:03:23 -04:00
hiker
d7684668db Fixed comments. 2014-04-24 08:16:19 +10:00
Marianne Gagnon
8e579d4874 Add UBOs flag to graphics options 2014-04-19 20:23:49 -04:00