Commit Graph

9641 Commits

Author SHA1 Message Date
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
hikerstk
cea8482845 Merged r13349 from trunk, which fixes creation of VS project files with cmake.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13369 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 02:03:06 +00:00
hikerstk
5efcb986e4 Fixed VS compilation (mostly by including winsock2.h before libcurl).
Also replaced binary numbers (non-standard) with hex numbers, and a few
minor cosmetic changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 01:28:14 +00:00
hilnius
f3b03488c4 as always had forgotten to add the new files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13364 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:34 +00:00
hilnius
b737ad753a adding a way to have a network kart selection screen inheriting the normal kart_selection_screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:03 +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
hikerstk
6441c4548c Fixed typo(??) in list of sources.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 23:49:08 +00:00
hilnius
0f469cd3d9 fixing server joining issues
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 23:47:43 +00:00
hilnius
8c6c1d2c4d adding forgotten files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 13:02:35 +00:00
hilnius
3e0fcb6d00 adding possibility for the server to decide when to start the selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 12:49:05 +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
hilnius
d95065b685 quick join now works.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:40:52 +00:00
yasin-ghannam
a908f4d3f9 Game ends when goal target is reached.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:25:35 +00:00
hilnius
87e9deea78 established back login from command line
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13343 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:21:03 +00:00
hilnius
cc2a967969 adding back some things in uni's code that i had removed for debugging
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:14:22 +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
hilnius
1ebfd0ada4 fixed server connection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13340 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:07:42 +00:00
hilnius
ddc9e8d5ba update
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 00:26:44 +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
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
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
yasin-ghannam
b53e0c4fe3 Slight modification to score display.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 23:07:45 +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
yasin-ghannam
2ac90980d6 Hat offsets added to kart.xml for all karts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 18:02:33 +00:00
yasin-ghannam
88b6b4b5c4 Kart positions fixed. Karts on the same team appear on the same side.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 17:50:39 +00:00
hilnius
66b4724a76 fix a bug that appeared when starting a normal race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 09:38:04 +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
hilnius
84a2df059b adding rotations to the kart updates protocol
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:34:16 +00:00