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

742 Commits

Author SHA1 Message Date
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
hiker
836b9fae9c Improved layout of login screen. 2014-01-22 16:20:45 +11:00
hiker
f0365fc7a0 Removed old login dialog. Fixed tabs in login screen that 
were not properly focused.
 2014-01-21 17:14:23 +11:00
hiker
260f4f148d Reworked the login and register dialog to be a screen - still 
work in progress (and guest login does not work yet).
 2014-01-20 21:39:59 +11:00
deveee
8b76971a54 Minor changes in soccer setup gui 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 17:44:09 +00:00
deveee
1a2d26b894 - Fixed crash when goal is scored after time limit 
- Set time max value to 15 - playing one game 45 minutes doesn't have a sense
- Remember time value in user config
- Little beter look of soccer setup
- Set goal-limit mode as default

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-21 17:04:46 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories 
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 23:48:47 +00:00
funto66
2c1853e54d Remove some more useless autotools files 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-16 23:21:37 +00:00
deveee
ec13bcf802 Merge branch 'hilnius' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:55 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:02:06 +00:00
hikerstk
63d5961dd0 Merged with trunk, part 3. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:39:40 +00:00
auria
e5fbd5d1fb First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 19:05:44 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-30 21:33:06 +00:00
hikerstk
26744f16d1 Removed minimal race gui. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-28 06:06:45 +00:00
deveee
195daa8794 Avoid to run Easter Egg mode as Grand Prix. 
I added new files to avoid a mess.
Proposed for 0.8.1

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-20 18:29:10 +00:00
auria
f8feba2337 new icon by totoplus 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14483 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-19 23:48:30 +00:00
yasin-ghannam
6de5854ef8 Fix Soccer Setup Screen Check box placement. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14473 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-18 02:15:05 +00:00
yasin-ghannam
287ff4c8ee Added time limited-match instead of only goal-limited ones. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-18 01:58:10 +00:00
hikerstk
8eaea2b1ba Fixed typo in string, updated pot file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-30 02:59:43 +00:00
auria
42cf2c292a Update egg hunt name/description and update .pot file with all latest strings 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-29 23:59:04 +00:00
hikerstk
07ac18dbe2 Added description for soccer and easter egg mode (I hope to replace 
the bunny with easter eggs, so I mentioned eggs there ;)  ).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-29 01:46:33 +00:00
deveee
6e62e2fe52 Set max number of goals in better place ;-p 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14279 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-18 11:35:34 +00:00
hilnius
c9cb74a9e5 fixing bugs, adding comments, structures and functions for the map vote system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 18:18:50 +00:00
auria
35518d6526 Update ingame documentation for new bubblegum. Update translation files, fixing invalid XML files 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 00:42:01 +00:00
auria
9301bb41d6 Fixed missing padding issue since skin was modified 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-16 00:16:28 +00:00
hilnius
0ce03186ee merging uni's branch and fixing compilation problems 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:12:54 +00:00
hilnius
262f70205c merging trunk and fixing compilation issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:05:34 +00:00
unitraxx
99e7b565bc Password changing done! (and some other small fixes) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-14 01:07:22 +00:00
unitraxx
503e261a36 A new tab/screen for account settings 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-13 23:02:56 +00:00
unitraxx
cbca9404e3 Big ass commit regarding achievement viewing of other people via their profile. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-10 20:41:57 +00:00
unitraxx
f38106ce77 Achievements looking good. Only server syncing and server-side need to be done. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-06 00:06:59 +00:00
magned
e06bdc4e0e Added new icon for 'Expert' difficulty, and renamed 'Iron Man' difficulty to another stolen name. ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 00:24:45 +00:00
hilnius
8233b8067d merging uni's and trunk branches. Not everything tested right now 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-27 01:02:41 +00:00
unitraxx
bfc32bdd14 Remove friend and cancel request added in the client. Server-side still need to be implemented. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-23 00:49:46 +00:00
unitraxx
ed7b4b875a Some dialog queue improvement. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-22 16:57:04 +00:00
unitraxx
ff877b60ca And you now get immediate notifications for new friend requests! (easily extendable for future personal message notifications) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-22 01:22:09 +00:00
hilnius
8e7338a13e game no longer crashes at the end of the race, the end of race sequence seems ok for 1 player at least 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13532 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-21 19:04:46 +00:00
hilnius
92667d4bba fixing skin little error with some links to glass remaining 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13528 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-21 00:31:39 +00:00
unitraxx
8e6495139e Related to previous commit. Changes to the modal dialog core. (Not 100% sure if every dialog still works.) Some core changes to profile, profile manager, and the related callbacks for friending. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13520 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-20 17:36:20 +00:00
unitraxx
70bb8df317 Start of the GUI additions. Need some refactoring first. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13501 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-18 14:54:41 +00:00
unitraxx
66c9c1fac7 More info shown now in the friendslist. Client now knows when a friend request is pending etc. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-17 21:39:51 +00:00
unitraxx
05a495810e Some general useability improvements 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-17 00:27:35 +00:00
unitraxx
0f0caf5f35 Lots of changes. When you click a user name now (in friends-list or search result), you get a pop-up, where you can click to join and watch the profile. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-17 00:11:03 +00:00
unitraxx
8e530bd505 Small additions from the lost commit. (Also pushed the search files to the server, which apparently I didn't) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-16 15:55:43 +00:00
unitraxx
c15f5537d4 Textbox border change. GUI changes accordingly. Checkbox in login dialog isn't properly aligned though. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 01:24:49 +00:00
unitraxx
2711744ed8 merge with trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 00:20:28 +00:00
auria
614e7893c0 Improve layout so that buttons are contained within the allocated space. Delete old glass skin. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-13 00:17:31 +00:00
unitraxx
c1e36b02de User searching! Very close to adding friends now ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-12 23:58:22 +00:00
unitraxx
c687151d11 Stable version of profile where your friends are actually showed with their username in a small list. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13459 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-11 19:47:25 +00:00
unitraxx
098b191e9e see previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-11 17:24:36 +00:00
auria
d3e6569a54 merge soccer branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-09 23:48:13 +00:00
unitraxx
b0ff13299c GUI work for profiles. A common inherited base screen for the different tabs. Friends screen added. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-07 15:03:33 +00:00
unitraxx
366ae7009d Lots of stuff. Mutex optimization. Addon voting. Some profile stuff continued. Progress+++ 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-06 22:45:33 +00:00
unitraxx
856a21a47e start of profiles 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13416 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-05 02:03:33 +00:00
unitraxx
40de2f62ae More rating bar and addon voting geniousness (server-side still needs update) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13412 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-03 01:54:39 +00:00
unitraxx
9a4c93f2de Implemented a callback listener for the login dialog. Added a vote dialog for addons. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13395 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 20:47:06 +00:00
hilnius
ea2b52a663 merging hilnius's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 18:03:11 +00:00
unitraxx
8656a12d12 Undoing last commit which was not what I wanted after all. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 22:05:06 +00:00
unitraxx
75e286932f An attempt to merge with hilnius' branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 21:39:27 +00:00
unitraxx
1d90f554e8 Merging with trunk, aesthetic changes, and added virtual keyword to the destructor of Track_object.hpp because of errors. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 17:27:06 +00:00
unitraxx
4091c4c965 Recovery dialog finally added. Some additional GUI changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-27 20:55:10 +00:00
unitraxx
7bd614ab12 Registration process fine-tuned. Using icons now and the asynchronous layer. Still TODO : activation and recovery. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 22:29:05 +00:00
unitraxx
a632aca9c9 Some "create server" improvements in both screen and flow. Creating one doesn't actually let you join the server, but pops up the server info dialog of it, which gives you the option to join. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13329 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 20:58:24 +00:00
unitraxx
311fb7bf4b Fixed reloading bug in server selection 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 20:00:08 +00:00
unitraxx
20e6fe74b2 server creating and joining. (server side code not complete) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13313 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 23:30:04 +00:00
unitraxx
e84159f0c9 Made a response queue for the http manager. Adapted everything to use it. Enhanced registration process. Loading messages use the global timer. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 00:47:48 +00:00
unitraxx
e065870037 Server joining and creating is now asynchronous. Enhanced LabelWidget to use (error) colors. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 14:21:17 +00:00
unitraxx
ad198a6e70 Temporary commit so that I can easily revert if shit goes down. And it will go down. Thread callbacks madness! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-19 21:20:32 +00:00
unitraxx
ecaa073eb5 Made the few buttons there are in lobby, do something. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-15 01:32:09 +00:00
unitraxx
ec34fcafa7 Stay signed in works now (with checkbox in sign in dialog.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-13 22:25:17 +00:00
unitraxx
200127102d Big commit related to server joining. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13196 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-12 23:12:31 +00:00
unitraxx
8dd9314eaf server fetching and selection 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-12 01:07:26 +00:00
yasin-ghannam
085080e95e Team Identifiers(Needs adding hatOffsets to kart models) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13176 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-11 00:57:13 +00:00
yasin-ghannam
d16a5a0552 Team indicators added. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13167 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 22:49:51 +00:00
samuncle
5e70f409af Add indicator for team (soccer mode) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13163 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 20:50:15 +00:00
unitraxx
2bf2ed0002 Start of creating servers 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 00:45:31 +00:00
unitraxx
4208a28f7d Merge and lobby GUI tweaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13100 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 01:28:31 +00:00
auria
68c2ee3479 Remove useless center from box image so that GUI skin is freer to stretch it as needed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13099 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 01:20:36 +00:00
auria
900d495ee9 Make GUI lists just use box, to make them in line with the latest changes that borders should be inside width/height 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 01:05:08 +00:00
unitraxx
bf13bed7a2 Merge with trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13097 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 00:38:39 +00:00
unitraxx
83b270cccd Lobby settings screen. Quick draft that will be used to test the server functionality. (Looks ugly now, need to merge with trunk again.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13096 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 23:26:44 +00:00
auria
c39795b445 add close button on track info dialog, as requested on forum 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 01:10:49 +00:00