Commit Graph

9646 Commits

Author SHA1 Message Date
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
aa5c5a9f6b Ok client-side everything now works perfect for addon voting. Be sure to use the new config file and change to server_addons=http://downloads.tuxfamily.org/stkaddons/assets-uni/xml if you want to test
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 00:42:35 +00:00
unitraxx
c111165703 Halfway friends list fetching. (Yeah it's quite a mess atm.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 00:19:11 +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
hilnius
d265c7e7be adding code to synchronize also hits on bananas
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13433 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 12:48:16 +00:00
hilnius
372689f0bb fixing multiple bugs in item selection events protocol
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 12:32:38 +00:00
hilnius
367892e055 working powerup synchronization (not tested but should work ;p)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:46:15 +00:00
hilnius
7bf6b3cc25 removing a mistake that was making karts not do item checks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:38:57 +00:00
unitraxx
bf5eccf4ed Some nice optimization update to the rating widget. The calculation of the stars was quite weird?
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13426 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:17:00 +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
hilnius
149875d83c moving some code to make the server execute it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:59:19 +00:00
hilnius
67c2cb2395 fixing a problem in the server lobby room protocol (that bug had been introduced some revisions ago
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:44:25 +00:00
hilnius
46c994f6fb fixing a problem in the server lobby room protocol (that bug had been introduced some revisions ago
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:42:41 +00:00
hilnius
9e77350108 adding small debug info
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13420 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:16:27 +00:00
hilnius
9151770aa0 fillig the GameEventsProtocol with events that concern powerup collect
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:10:33 +00:00
yasin-ghannam
a3be77aa30 added above team leader's head a red/blue ball to indicate team.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13418 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 03:30:42 +00:00
hikerstk
72a2b69695 1) Moved header and source file into the same folder for VS.
2) Fixed using/building WIIUSE on VS when created from cmake.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13417 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-05 06:10:31 +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
757d9e3683 Some general dialog improvements
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-04 13:33:14 +00:00
unitraxx
63e927b277 Responsibility shifting for the deactivated case
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-03 01:58:29 +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
curaga
a3bfed004e When you click the video slider, the slider text needs updating
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13410 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 14:18:11 +00:00
curaga
144c5cc0b4 The custom gfx tooltip must be updated when the slider is
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 14:17:34 +00:00
unitraxx
6198c43728 Awesome rating bar widget is awesome
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 02:25:58 +00:00
unitraxx
ed689232e0 Quick commit to save my progress as my internet connection is clearly unstable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 01:28:50 +00:00
hilnius
9ec58bbcb1 working karts online selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 23:28:21 +00:00
hilnius
55bd9e18fd lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:55:09 +00:00
hilnius
b394bd9295 lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13403 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:49:57 +00:00
hilnius
a51f7bfb74 modify the race_id management to ensure that we always have ids between 0 and the number of players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 11:51:23 +00:00
hikerstk
3187937496 Simplified #includes, and changed order to follow our style guide.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13401 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:11:10 +00:00
hikerstk
f9fa721a22 Minor bugfix: if an invalid kart name was specified on the
command line, it was not ignored (as stated), it would
result in STK aborting. Now this is just ignored.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:06:09 +00:00
hikerstk
5efa7c8ad2 Removed apparently unnecessary #include <io.h>, since
it will actually include io.h from wiiuse, not the
internal one from VS (which results in some warnings
about RAD_TO_DEGREE already defined).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:02:44 +00:00
unitraxx
f4c7cf439e Fixed a small issue. The main issue is still the bad allignment of the widget though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:04:51 +00:00
hilnius
057c8f46be adding things in order to be able to leave the world at the end of a network race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:03:07 +00:00
unitraxx
a4c5c4b8ec Some advancements with the addon voting
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:02:35 +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
samuncle
db1a05cb87 A better texture for the dress and gloves
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13393 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 17:38:05 +00:00
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
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
hikerstk
57183584ff Fixed VS compilation, and sorted includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 13:04:29 +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
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
hilnius
bcd15a8851 now network GUI interacts properly with the server, can go up to the selection (still cannot ask for selection)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 23:43:28 +00:00
hilnius
840faec44b missing include
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 15:30:17 +00:00
hilnius
8a79bbadfd better control of events to leave the server properly if the user is in the kart selection phase and decides to leave
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13382 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 15:27:25 +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