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

1530 Commits

Author SHA1 Message Date
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
curaga
c96bd8d64e Make gum_shield.frag compile 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13550 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-22 15:44:56 +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
stephenjust
2373f4f053 Add certificate file for tuxfamily - still need to make sure it's installed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13476 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-13 23:18:08 +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
samuncle
d58e16c338 A basic shader for the bubble gum shield effect 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13445 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-08 03:59:15 +00:00
hikerstk
df9d90b342 Merged bubble bum branch into trunk. The new bubble gum 
shield is still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13444 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-08 03:11:03 +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
curaga
57e692c61c lightbeam: Remove unused uniform, add some spacing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-29 14:41:13 +00:00
curaga
b4cd5e4ec9 Fix the lightbeam shader's inconsistent style 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13380 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-29 14:40:42 +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
hikerstk
2ff62c4d97 Added support for jump animation, which will triggered 
if either the estimated jump duration is long enough,
or the texture the kart was on before it jumped has
a jump property set.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-18 07:24:47 +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