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

1502 Commits

Author SHA1 Message Date
hilnius
1b5c6fd804 merging trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 17:06:15 +00:00
hilnius
a20c200b77 merging uni's branch. one bug appeared back 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 00:41:47 +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
hilnius
c5c6c6195f merging uni's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-24 15:43:54 +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
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
hilnius
ff28a8b7f0 finalizing weird commits 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 14:40:28 +00:00
hilnius
c3bf8a0358 weird commit number 2 to fix issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 14:36:39 +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
samuncle
bb64fec5d0 A new shader to make beautifull lightbeams 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13073 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 02:32:11 +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
auria
ad6b60520c Apply patch by xenux to improve the reload button 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 00:32:26 +00:00
auria
4c3ebfc99f Forgot other skins in previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13061 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-03 02:01:23 +00:00
auria
ef148dd8cc Rework how <box> tags work in STKGUI files for finer control over layout. Adapt existing layouts accordingly. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-03 02:00:08 +00:00
auria
056a62227f Strings update 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-03 01:07:00 +00:00
unitraxx
b52c905f9e Beginning of networking lobby. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-03 00:12:00 +00:00
unitraxx
74cc3d1f01 Changed the border of the story icons to the softer one. Credtis to tavariz91. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13041 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-30 15:53:23 +00:00
unitraxx
340b22ef87 [_GSoC Uni_] Added Icons suggested by the designers on the forum. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13040 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-30 15:47:39 +00:00
auria
4352ac3707 Update nitro icon in help to match new appearance 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13037 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-30 01:05:36 +00:00
unitraxx
6d37125348 [_GSoC Uni_] Merge to revision 13035 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13036 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-30 00:56:57 +00:00
auria
27642f332c Apply patch by xenux to filter addons, thanks a lot\! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-30 00:29:43 +00:00
auria
fc9515222f Tweak textboxes skin 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 23:46:51 +00:00
unitraxx
4e2ef1347a [_GSoC Uni_] Updated the interface code for the online part and some small adjustments to the underlying code. -- Ready for user testing! Can connect to the api server now. Activation not yet needed, mail addresses will not be saved, don't pick an important password. (Users will sometimes be deleted during development anyway.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 22:55:15 +00:00
funto66
e88c84d713 Fix orthographic error in French translation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13028 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 21:17:58 +00:00
unitraxx
dea6a6d721 [_GSoC Uni_] Extended ribbon_widget to only take in mind active children. Overall improvement of GUI and code organization. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 02:27:56 +00:00
auria
055fd7bca7 Add new stars 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 22:24:37 +00:00
unitraxx
f99f27cbf1 [_GSoC Uni_] Signing out. Online screen (beta) improvements. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13001 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 01:33:15 +00:00
samuncle
89d7edf985 updated material.xml to remove old textures 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 00:07:11 +00:00
samuncle
7d02d29c03 New nitro items 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12996 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 00:05:30 +00:00
hikerstk
674be5b6d0 1) Fix #1011 by re-implementing the bubblegum not as a 
damping of velocity, but as a max_speed restriction.
2) Bubblegum parameters are now fully configurable in
   stk_config.xml.
3) Apply slowdown fraction also to speed increases
   (e.g. previously a max speed of 23 with a zipper
   giving a 15  additional speed with a slowdown of
   0.3 would end up as: 23*0.3 + 15 = 21.9.
   Now it is (23+15)*0.3 = 11.4. While this was done
   mainly for bubble gums, it can affect other items
   as well.
4) Used bubblegum as one word consistenly in variable
   names and xml files.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12995 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-27 22:25:36 +00:00
unitraxx
075b3aa3c7 [GSoC Uni_] Enhanced online_screen. Let 'Sign In' and 'Register' connect to the server. Renaming GUI file. Added debug code to connector. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12991 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-27 01:38:16 +00:00