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

351 Commits

Author SHA1 Message Date
hikerstk
f7cf407208 Deallocated http manager earlier (in case that it is using a command 
which needs any of the objects that have been deleted while cleaning up).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14644 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 13:12:45 +00:00
deveee
ec13bcf802 Merge branch 'hilnius' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:55 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this 
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:27:55 +00:00
hikerstk
c0783283e0 Fixed VS compilation (without WIN32_LEAN_AND_MEAN 
VS defines MAX_PRIORITY as a macro).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14384 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-04 09:58:24 +00:00
hikerstk
41804c99da Fixed windows compilation (without WIN32_LEAN_AND_MEAN 
windows will define a macro MAX_PRIORITY, which clashes
with the constant of the same name in http_manaher).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-21 04:29:40 +00:00
hilnius
a637ce6e36 some buxfixes + implementation of the max player count 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 20:56:39 +00:00
hilnius
0ce03186ee merging uni's branch and fixing compilation problems 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:12:54 +00:00
hilnius
262f70205c merging trunk and fixing compilation issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:05:34 +00:00
unitraxx
c775662e4a fix rfc for achievements when no default profile is selected 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-14 22:52:21 +00:00
unitraxx
2c1d02095a Changes to HTTPManager and it's clean-up sequence. Main thread now "joins" the network thread and thus waits for all the requests to be done. (Remember me to start a discussion on the memory leak checker!) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-12 18:23:56 +00:00
hilnius
20418a82af Lot of changes to make a cleaner startup in no-graphics mode and having a clean exit with all threads being stopped etc... 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-12 15:54:32 +00:00
unitraxx
e71d99aa2d small clean up improvement 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13668 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-12 02:44:52 +00:00
unitraxx
5ba1493990 Some fixes in the sequence of quiting STK. Though the thread still gets killed before the request is done. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13667 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-12 02:29:05 +00:00
unitraxx
cbca9404e3 Big ass commit regarding achievement viewing of other people via their profile. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-10 20:41:57 +00:00
unitraxx
c67c5a6fb1 Achievements progress now actually gets saved.. how cool is that? 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-05 23:20:39 +00:00
unitraxx
03be63ea5b Even more achievements stuff. Unlock manager is a mess! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13630 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-04 19:44:10 +00:00
unitraxx
91e77a14c3 Lots of additions to achievements! core almost done. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-02 20:53:55 +00:00
curaga
fe9d2ec86c Mark the main clean function static 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 11:39:40 +00:00
unitraxx
7e8d167a89 Decent clean-up when closing STK. Send a message to the server if still signed in. (Server-code will not be pushed immediately, so testers might experience errors.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-28 22:45:11 +00:00
hikerstk
298bd078fb Applied Deve's patch for #1042 - thanks! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-28 13:58:45 +00:00
curaga
97232fe314 Invalid params should go to console 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-28 13:51:12 +00:00
hilnius
98f3b20bcb merging uni's branch and trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 12:35:23 +00:00
unitraxx
2711744ed8 merge with trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 00:20:28 +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
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
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
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
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
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
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
hilnius
75e75c43ee adding a workaround to be able to start a network client from a server (with --no-graphics option) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-16 22:27:28 +00:00
hilnius
0625379706 slight modification in the synchronization protocol to handle correctly multiple clients on the server (token management was not working). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13257 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-15 23:28:20 +00:00
hilnius
c1534075d3 adding a protocol to synchronize client/servers and a little bit of code to test it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13208 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-13 23:12:53 +00:00
hilnius
212b77fef3 adding features in the client lobby room protocol, separating client and server lobby room protocols in their own files to have clearer code 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13162 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 20:15:17 +00:00
hilnius
60e4a2bb5e adding possibilities to connect directly with command-line options, adding console entry for the client server manager' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13144 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 12:42:44 +00:00
hilnius
f56f1ec3b1 weird commit number 2 to fix issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 14:36:39 +00:00
hilnius
1e94193b8b splitting --no-graphics option into --no-graphics and --with-profile options 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13118 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 22:55:21 +00:00
hilnius
9aa25a4e97 Modifications in protocols to use the http connector and xml to get information from the database. Correcting the --server option which wasn't working. Now launching supertuxkart --server will connect the user 'server':'serverpass' and start automatically a ServerLobbyRoomProtocol that listens to incoming peer connections. 
Improvement of logging. Some were fatal whereas they shouldn't.
Improvement of the protocol system. There were mutex permanent locking.
Protocols that do not use http are now non-blocking (except maybe one).
A user can 'quick join' the server by logging then pressing the 'quick play' button in the online panel.
Improvement of packet serialization/unserialization
Added a ping protocol to ping peers as long as they don't respond


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 19:49:51 +00:00
hilnius
ed6e4ebfb4 correcting the ai kart bug due to the former networking removal 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 12:01:29 +00:00
hilnius
2a0a9a3617 merging uni's and hilnius's branches in networking 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 17:24:20 +00:00
hilnius
253a3ec1e8 cleaning destructors, using log:: instead of printf or std::cout, cleaning more paths, removed useless fnctions 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13076 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 16:59:30 +00:00
hilnius
613e97d0d6 breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 22:57:18 +00:00
curaga
454fef7fe4 Fix crash when closing window in the middle of a race 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12911 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-21 08:19:17 +00:00
auria
485551aa89 Apply patch by KroArtem to fix minor issues : unused variables and other minor warnings from cppcheck, crash when launching from terminal with AI karts in a mode where AI is not supported 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-09 20:04:07 +00:00
curaga
a6a2ec66d4 Make fatal fatal 
Removes a lot of duplicated code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12827 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-31 14:09:39 +00:00
curaga
ef9a1e78eb Only the GL driver is supported. 
DX hasn't worked in months, SW are not worth their LOC, and NULL is pointless with 
--no-graphics.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12825 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-31 14:07:43 +00:00
hikerstk
366f8cd6b1 Cosmetic changes only. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12824 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-31 06:26:47 +00:00