Commit Graph

9580 Commits

Author SHA1 Message Date
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
auria
f198e93d0a Bugfix: in some cases, like after tutorial, game would play at wrong difficulty
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13117 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:52:01 +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
auria
66b96868ee Fix some cases of input getting stuck during tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13115 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:07:59 +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
unitraxx
2bf2ed0002 Start of creating servers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 00:45:31 +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
hilnius
7a174fd122 cleaning the includes to meet stk's standard
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13075 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 13:19:32 +00:00
hikerstk
464daa8ac7 Updated VS project files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13074 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 02:49:34 +00:00
samuncle
bb64fec5d0 A new shader to make beautifull lightbeams
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13073 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 02:32:11 +00:00
auria
eecf0b67f6 merge minimal race GUI into normal race GUI. Slight changes but in the same spirit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 01:38:13 +00:00
auria
c39795b445 add close button on track info dialog, as requested on forum
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 01:10:49 +00:00
samuncle
a976338797 New shoes for Sara
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13069 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:38:34 +00:00
auria
ad6b60520c Apply patch by xenux to improve the reload button
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:32:26 +00:00
samuncle
c213a9b3ae New nolok logo thanks to Totoplus62
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13067 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:29:27 +00:00
auria
7e2548ff28 Fix misleading comment
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 23:22:06 +00:00
hikerstk
59c1fccef2 Created branch to synchronise work on soccer mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 23:02:14 +00:00
hilnius
91b85accf7 starting branch to merge network and lobby
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 22:58:13 +00:00
hilnius
1f42aaedb5 removing hilnius-testing branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13062 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 13:43:13 +00:00
auria
4c3ebfc99f Forgot other skins in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13061 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 02:01:23 +00:00
auria
ef148dd8cc Rework how <box> tags work in STKGUI files for finer control over layout. Adapt existing layouts accordingly.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 02:00:08 +00:00
auria
056a62227f Strings update
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 01:07:00 +00:00
unitraxx
b52c905f9e Beginning of networking lobby.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 00:12:00 +00:00
samuncle
e3aac6f554 Bugs correction (missing textures)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13056 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-02 07:16:14 +00:00