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

9346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hilnius
ae2e656059 updating hilnius branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13151 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 17:37:45 +00:00
hilnius
7cf9cfa8d9 branch was too much full of bugs 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13148 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 14:21:50 +00:00
hilnius
a55016301e fixing segfault issues when trying to exit, the protocol update thread is now launched by the protocol manager (and not the network manager) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 14:07:28 +00:00
hilnius
4bd4386208 fixing a crash due to gui modal dialog 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 13:14:48 +00:00
hilnius
008c2d57b2 fixing a crash due to gui modal dialog 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 13:14:48 +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
unitraxx
bd3ee05f10 Small fix to comply with changed server-code. (Not tested - though is relatively small change.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13141 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 02:04:35 +00:00
hikerstk
49631c0027 Updated VS 9 project file, and fixed compilation problems. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13139 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 01:22:58 +00:00
hilnius
587fcdec32 correcting little bugs in the lobby room protocol 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13133 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 22:53:50 +00:00
hilnius
dc4a32c204 correcting some bug in message exchanging 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13132 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 22:47:24 +00:00
hilnius
b1f823ea71 hmmm that's so good ! working connection, better protocols, fixed ALL the endianness problems (sure this time :p) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13131 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 22:06:57 +00:00
hilnius
0ee94ed9ed adding console entry for server, server stopping features (unregistering from database), now server_conn can use back the lock that was here 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13129 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 21:04:23 +00:00
hilnius
7476d2a3ca after more little-big endian issues, people can now connect 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 16:50:20 +00:00
hilnius
136b9d2b15 little-big endian issue failed before 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 16:02:08 +00:00
hilnius
39436d464c little-big endian issue 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13126 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 15:57:46 +00:00
hilnius
ac6534615c fixing a ENet connection issue 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13125 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 15:47:28 +00:00
hilnius
4a93c84adb server-client connection should work now 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13124 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 15:34:12 +00:00
hilnius
293e53bbd1 supposedly working server-client connection 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 15:03:36 +00:00
hilnius
ff28a8b7f0 finalizing weird commits 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 14:40:28 +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
c3bf8a0358 weird commit number 2 to fix issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 14:36:39 +00:00
hilnius
fd0e627906 weird commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-08 14:06:23 +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
acf1ff548a fixing a segfault caused by mipmaps in --no-graphics mode and adding a connect to peer protocol (for the server) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 22:23:13 +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
711ba681f1 protocol 'specification' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13104 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 14:32:44 +00:00
unitraxx
3ef2c4772a Merge my branch with networking branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13103 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 14:10:32 +00:00
hilnius
2f7bcd60bb starting a merge 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13102 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 13:03:14 +00:00
hilnius
e0e64680a5 merging trunk and networking. 'data/gui/menu_story_focus.png' has its networking version kept (dunno why the two files were different, they seemed same to me) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13101 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 11:48:23 +00:00
unitraxx
4208a28f7d Merge and lobby GUI tweaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13100 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 01:28:31 +00:00
auria
68c2ee3479 Remove useless center from box image so that GUI skin is freer to stretch it as needed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13099 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 01:20:36 +00:00
auria
900d495ee9 Make GUI lists just use box, to make them in line with the latest changes that borders should be inside width/height 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 01:05:08 +00:00
unitraxx
bf13bed7a2 Merge with trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13097 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-06 00:38:39 +00:00
unitraxx
83b270cccd Lobby settings screen. Quick draft that will be used to test the server functionality. (Looks ugly now, need to merge with trunk again.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13096 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 23:26:44 +00:00
unitraxx
8617e0e15c Key navigation now works perfect. (Had to be changed due to the fix Auria provided for the GUI Engine) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13095 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 23:23:28 +00:00
auria
88c1a3b56c Prevent double ribbon events when using mouse on a ribbon that's in a dialog 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13094 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 22:55:12 +00:00
auria
2719079977 Improve upon previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13093 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 22:41:25 +00:00
auria
d5168a6f4f Fix textbox glitch : you could still type in the box after it lost its focus 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 22:37:52 +00:00
samuncle
e25dd45d48 Add more details 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13090 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 22:28:07 +00:00
hilnius
78b9a7d6a7 adding a new string class to easily format packets. added features in the lobby protocol 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13089 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 16:16:02 +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
auria
8e2ccb7762 Fix restarting tutorial 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13086 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 00:02:50 +00:00
auria
af09c253a7 Return to overworld after tutorial if it was started from there 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13085 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 23:56:24 +00:00
hilnius
6b35cbb8fd adding connection stuff in the lobby protocol, and a xls file in doc/ to describe the protocol 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13084 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 22:49:45 +00:00
samuncle
2374a88c56 Add a texture for hotpants instead vertex color 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13082 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 22:37:20 +00:00
hilnius
01ceeaa23a Adding the base class that will contain all information about all players, correcting events passing inside the protocols manager 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13081 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 20:36:50 +00:00
curaga
e3ebbbbb04 sfx mgr: Remove unused function declaration 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13079 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 19:31:19 +00:00
mbjornstk
b9499ce46a Update build. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13078 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 18:57:23 +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