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
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
Marc Coll Carrillo
5cf3ad220f
Some improvements to the GP editor:
...
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
- allow empty GPs to be loaded by the GP manager, so that they can appear
on the GP editor (but not on the track selection screen)
- enable/disable buttons depending on the available options
- provide some feedback after pushing the "save" button
- some minor bug corrections and improvements
2014-09-13 10:40:27 +02:00
Flakebi
9c911a2891
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-09 12:07:34 +02:00
hiker
1a7b384633
Fixed typo.
2014-09-09 13:14:56 +10:00
Flakebi
5858c05e74
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-05 22:46:17 +02:00
hiker
8fd6877e92
Fixed #1486 . Made most menus more consistent (e.g. same position
...
and height for heading).
2014-09-05 08:46:06 +10:00
hiker
8ffe09de29
Combined GPInfoScreen and RandomGPInfoScreen into one class, requiring
...
only one stkgui file.
2014-09-04 16:49:15 +10:00
hiker
7c3164a9c1
Added 'reload' random GP support, fixed 'back' icon on screen.
2014-09-04 09:38:25 +10:00
Flakebi
a84c5d596c
Fix focus crash in kart selection screen
2014-09-02 03:43:08 +02:00
hiker
7dbfc151bf
Added random GP functionality into gp_info screen. Changed GPData
...
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
2014-09-02 09:32:12 +10: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
hiker
4ba8e85169
Give the race setup screen a background box and added a text for difficulty.
2014-08-29 07:42:42 +10:00
hiker
db3db6f8b5
First version of the GP info screen (instead of dialog).
2014-08-27 22:08:50 +10:00
hiker
e309008736
Use header font for title, removed second 'back' button.
2014-08-25 23:16:59 +10:00
hiker
76767141f7
Removed old track info dialog, fixed crashes in track info screen
...
(caused when making some spinners etc. visible).
2014-08-25 22:20:42 +10:00