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

723 Commits

Author SHA1 Message Date
Benau
e296ebe4af Use white-black ball in minimap 2016-01-15 19:52:49 +08:00
hiker
b8ed2025ed Merge remote-tracking branch 'origin/master' into refactor_networking 2016-01-06 17:53:45 +11:00
Benau
629f090646 More battle mode improvements 
1. Fix text overflow in arena menu

2. Try to make battle AI avoiding eating banana
 2015-12-29 08:27:24 +08:00
Benau
94c5ba4193 Add more arena info in track screen 2015-12-24 07:53:49 +08:00
hiker
da2671c6ee An 'authorised' client can now tell the server to select karts. 2015-11-23 08:08:23 +11:00
hiker
815d663ee3 Revert "Removed unnecessary stkgui file." - it was the wrong file :P 
This reverts commit e804fc281a.
 2015-11-21 12:21:16 +11:00
hiker
e804fc281a Removed unnecessary stkgui file. 2015-11-21 12:15:02 +11:00
Marianne Gagnon
366a458a6b Remove a few unused files, see #2066 2015-10-22 19:13:41 -04:00
hiker
f0c04a8bef Started to support LAN servers in the GUI (wip). 2015-10-10 12:13:32 +11:00
hiker
d687d17bfe Added (atm not working) LAN server menu entries. 2015-10-09 09:36:08 +11:00
hiker
00e7c35484 Match one more .stkgui and .cpp file name. 2015-10-07 16:37:42 +11:00
hiker
d391727879 Match more .stkgui and .cpp file names. 2015-10-07 16:33:01 +11:00
hiker
3aadc019a3 Made more .stkgui name correspond to the c++ file name. 2015-10-07 12:33:36 +11:00
hiker
ccf8fd4e68 Renamed stkgui so that .cpp and .stkgui file names are identical. 2015-10-07 08:11:57 +11:00
Marianne Gagnon
0a1053b3e4 Update translations, remove unused GUI file that generated unused strings 2015-08-28 20:09:06 -04:00
Marianne Gagnon
e0dd736a7c Main menu : prevent text on mouse over from overflowing the bounds of the screen. FIxes #2163 2015-07-25 19:55:17 -04:00
Marianne Gagnon
64adbb4238 Remove anchor as weapon from help menu, fixes #2173 2015-06-23 18:32:38 -04:00
hiker
d4f3fc88d6 Merged pull requests #2191. 2015-06-02 14:50:32 +10:00
Marianne Gagnon
080936f144 Work on scripting 2015-05-17 19:27:25 -04:00
Marianne Gagnon
66db970564 Add context to help translators 2015-04-07 19:32:55 -04:00
hiker
3f76b0c68d Used better icon for achievements in tabs. 2015-04-02 10:46:30 +11:00
Marianne Gagnon
e3c408fc0e Implement interface to allow disabling IBL 2015-02-22 18:25:59 -05:00
hiker
7f90d151c4 Use "Local Name" to fix #1977. 2015-02-17 17:15:25 +11:00
hiker
aae307c8b6 Fixed #1985 (improve message for per-player handicaps). 2015-02-16 09:35:49 +11:00
Marianne Gagnon
758eb6e003 Use label with word_wrap instead of list for terms. See #1812 2015-02-06 20:11:15 -05:00
hiker
5f4ce613c0 Updated help text for new register screen layout. 2015-01-16 11:54:59 +11:00
auriamg
c5cf42755f Merge pull request #1882 from math07/working 
Make note spinner values of addons search bar readable in low resolution
 2015-01-14 19:28:53 -05:00
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
Mathieu Laprise
765484efd9 Make note spinner values of addons search bar readable in low resolutions 2015-01-05 19:04:01 -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
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
hiker
4b507a4eda Made more space for credits that span more than one line. 
Siwtch left and right side of the top screen.
 2014-08-25 11:12:00 +10:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
hiker
0de942b5f3 Alpha version of a track info screen (instead of a dialog). 2014-08-25 10:40:37 +10: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
Marianne Gagnon
583d65d988 Update video settings dialog 2014-04-18 18:16:27 -04:00
Marianne Gagnon
70cb9cec59 Update graphics options screen 2014-04-14 19:32:44 -04:00
Marianne Gagnon
9993e31601 First pass to update video options menu 2014-04-14 19:05:33 -04:00
Marianne Gagnon
348a20288f Apply patch by Marc Coll to have better progress reports during long GPs, thanks! 2014-03-26 20:14:29 -04:00
Marianne Gagnon
5750b860c9 Add missing icon 2014-03-22 19:49:48 -04:00
Marianne Gagnon
2f2547420d Apply Marc Coll's Grand Prix editor, thanks! There will be refinements to come for sure, but this is a very nice start 2014-03-20 21:13:05 -04:00
Sachith Hasaranga Seneviratne
fa72b7716e Fixed bug #1056 Addons search last updated option text is cropped 
changed addons_screen.stkgui to ensure the filterdate spinner had adequate space.

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
 2014-01-30 12:56:54 +05:30