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

9722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hilnius
ad18d9299d fixing last issues with the inherited kart selection screen : the screen is now deleted when back is pressed, and re-instantiated when it's loaded again. If not, there was a problem with two screens instantiating the same '.stkgui' file. The screen is not deleted when the user clicks a kart (eg when starting normal game) to allow a working popScreen() 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-29 12:42:21 +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
hilnius
79c5fc03e9 moving class declarations of objects used by the KartSelectionScreen to kart_selection.hpp 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 12:28:26 +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
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