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

9385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
auria
79d4c5e52e minor tweak to checklines 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13387 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 01:45:02 +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
curaga
c6f22508e1 irr: RTT flipping workaround 
Didn't find the cause of this bug, but merely a workaround that only works for STK.

Still, that's two days of searching, cutting my losses.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13379 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-29 14:40:13 +00:00
unitraxx
8c1d84ce74 Some fixes to my GUI Engine additions, so that they are compatible with the rest of the game. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13377 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 19:31:17 +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
6699284237 Some preparations to make the merge with the addons' network manager go smoothly. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 14:11:20 +00:00
hikerstk
eed1c88b4c Merged r13349 from trunk, which fixes creation VS project files from cmake. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13371 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 05:24:59 +00:00
hikerstk
151535cc79 Fixed VS compilation errors and warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13370 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 05:22:02 +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
samuncle
f09344fca6 Small correction to the animation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13353 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 16:20:59 +00:00
unitraxx
328e186014 Small bug fix + removing the private user state getter 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 14:53:25 +00:00
unitraxx
ea11bfa725 CurrentUser doesn't use acquire and releqse anymore. Mutexes added to the members. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 14:01:20 +00:00
samuncle
b40b4d8652 Small correction for SSAO tests 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13350 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 12:26:24 +00:00
hikerstk
12deb466be Fixed several problems when createing VS project files with cmake: 
1) gcc flags were used, and -Wall for irrlicht caused 1000's of
   useless warning messages.
2) Force static build of irrlicht.
3) Remove unnecessary dist target (which is unix only).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 07:19:30 +00:00
hikerstk
2d504379ca Removed reference to logging stderr (which is not done anymore). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 07:13:36 +00:00
hikerstk
6c210a8c09 Added assert to Log::fail so that a debugger breakpoint can 
be triggered. Added Log:: calls to string_utils.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 07:12:49 +00:00
unitraxx
261957bf72 acquire/release approach removed for ServersManager. Added MutexLocker to synchronised.hpp. CurrentUser will folow after sleepy times. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 02:22:53 +00:00
hikerstk
bb249d1681 Made lock/unlock const. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13341 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 01:10:16 +00:00
auria
dfb9de9733 Apply parts of patch by Deveee to better indicate new nitro consumption rules, with additions by myself for the race GUI 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-24 23:14:22 +00:00
unitraxx
aba6b9f0e6 add a synchronousRequest option to the HTTPManager 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13336 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-24 13:08:45 +00:00
unitraxx
0979eb009c WillemS had a compilation error concerning the namespace os of irrlicht. Tried a fix, waiting for confirmation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13335 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-24 12:53:19 +00:00
unitraxx
85579c3d9b Client-side code related to previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13334 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 23:54:55 +00:00
auria
27a1509532 Allow navigating with TAB in menus 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13332 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 22:53:21 +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
hikerstk
f6685af2e1 Added support for looped jumping animation; renamed 
begin/end_jump to jump_start/end to be more consistent.
Added a test loop to Sara's animation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 22:11:12 +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
curaga
8c406172cf Remove kart selection flicker 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 18:53:12 +00:00
curaga
0157e83fe9 Much nicer kart selection light 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13327 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 17:06:51 +00:00
unitraxx
cdab5caf35 Replaced all non-related GUI code actions done after a reply to request callbacks. Servers manager now allows getting by ID and sort index. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 16:34:38 +00:00
unitraxx
182cd15477 Fixed the bug in rejoining a lobby. Added a lot of mutex stuff, which wasn't actually related to the problem at all. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 01:37:49 +00:00
hikerstk
729fb64cb0 Added support for animations without a loop part (esp. jump). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13321 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 22:04:33 +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
bf2d907ccf small fixes to let server joining work. (temporary version though.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 00:23:42 +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
c2159306e8 Some documentation and thread-safeness. ___Remind me to ask some questions about mutex___! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 20:26:27 +00:00
unitraxx
8360c06b15 Deprecated old internet access method. Adapted my servers_manager and users to the new system. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 17:41:02 +00:00
unitraxx
af12be28fa Login dialog can't be closed now during a sign in request. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 15:25:17 +00:00
unitraxx
1cdad60b17 Another enhancement for my HTTPManager which needed a lot of changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 15:21:48 +00:00
unitraxx
dea145952b Apparently the onEscapePressed callback for a dialog didn't operate as advertised. I fiex. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 15:19:15 +00:00
unitraxx
3a630d4985 Some memory management 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13303 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 01:17:00 +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
eafcbc7103 Client side checking for the client and deactivating actions during sign in request. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 15:52:59 +00:00
unitraxx
4a96c67697 Added method to check if a widget is active or not 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 15:46:25 +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
ac40b8111b Decent killing of the network singleton and thread. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 02:14:36 +00:00