Commit Graph

138 Commits

Author SHA1 Message Date
auria
0c945d61d3 Made World derive from 'Clock' (now 'TimedRace') simplifying a lot of things, especially the race end process
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-04 17:32:40 +00:00
hikerstk
f055a2c6bd 1) LAN mode now supports GP and restarting/setting up
new game etc.
2) Fixed non network end-of-game handling.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-02 00:27:39 +00:00
hikerstk
fb2900f05b Bugfix: GP information wasn't properly sent from server to client.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-01 12:37:20 +00:00
hikerstk
1809dd1da1 Synchronised race results menu, single races in LAN
mode can now be restarted (GP and FTL modes are still 
to be done).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-29 02:29:33 +00:00
auria
0ece64bc05 split major and minor modes, started some more encapsulationa round that
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-22 00:55:27 +00:00
auria
cc61f53ff8 more cleanup, replaced World global variable with singleton-like implementation, removed lots of includes to world.hpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-21 16:07:56 +00:00
hikerstk
c0226902a7 Bugfix: debug code was still left in (which removed the first kart).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-19 02:28:27 +00:00
hikerstk
1ee4c7976a Bugfix: Compiler optimisations on certain compilers could cause the
networked version to fail (indication: warning message "warning:
dereferencing type-punned pointer will break strict-aliasing rules").


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-14 15:01:14 +00:00
hikerstk
8a4a939980 1) Character selection is now synchronsied between all clients and server (i.e.
a character can only be selected once, and is then not available for other
   players anymore).
2) Fixed restart race (which would finish the race after about 11 seconds)
3) Moved widget related classes into gui dir.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-13 07:09:36 +00:00
hikerstk
15b9ca64c6 1) Fixed 'install' and 'dist-*' make targets.
2) Removed unused files.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-10 00:26:04 +00:00
hikerstk
a29ed474f4 Disabled karts on clients that are not available (i.e. do not exist
on all clients).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2259 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-09 13:44:17 +00:00
hikerstk
efa41d9d84 Fixed non-network mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-09 04:35:35 +00:00
hikerstk
e4c646c0c5 Make sure that only karts available on all clients can be selected.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-09 04:20:24 +00:00
hikerstk
10915df3bb Bugfix: Fixed deadlock occurring when the server reaches the character
selection screen before a client has selected the number of players.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2252 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-08 10:45:20 +00:00
hikerstk
1c97237940 Added missing file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2250 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 16:12:40 +00:00
hikerstk
48271241ee 1) Bugfix: incorrect conflict resolution in kart.hpp.
2) Added track synchronisation between clients and server.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 15:31:28 +00:00
hikerstk
864a3a72aa Added support for moving physics in network play, fixed incorrect path in VS project file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 15:10:59 +00:00
hikerstk
8519f9dbe3 1) Added enet sources.
2) Updated STK sources to unconditionally compile for enet.
3) Updated VS project file for enet.
4) enet support for automake.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2246 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 15:04:43 +00:00
hikerstk
22c1c92bf8 Fixed projectiles for network play.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2245 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:56:17 +00:00
hikerstk
9a17f748f1 1) Cleaned up all _WINSOCKAPI_ defines.
2) Improved kart_control to serialise/deserialise itself.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2244 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:55:05 +00:00
hikerstk
2455bdc32d 1) Synchronised herrings.
2) Fixed no-network play.
3) Fixed display of 'loading'/'synchronising' message.
4) Added missing files from previous commit.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:45:43 +00:00
hikerstk
ecac04b1bc Replaced kart update message with race_state (which gets send
from the server to the clients). Started to implement synchronising
of herrings and projectiles.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2242 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:42:37 +00:00
hikerstk
de72e53199 Bugfix for optimised compilations (at least with g++).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2241 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:39:34 +00:00
hikerstk
da69106378 Very first alpha version of network multiplayer.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2240 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:34:04 +00:00
hikerstk
545a2703b5 1) Synchronised random-karts across the network.
2) Fixed non-network game play.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2239 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:24:40 +00:00
hikerstk
db75ee21f0 Added missing values to race info message, fixed state machine.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2238 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:13:04 +00:00
hikerstk
bb894b414d Several compile time bug fixes for linux, removed warnings,
fixed = vs == bug in network_manager.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2237 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:12:14 +00:00
hikerstk
9191f89333 Added most of the messages, menu's are mostly synchronised now.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:09:52 +00:00
hikerstk
3ccd8500de 1) Added kart_packet files to Makefile.am
2) Improvements to network managers (finite state machine) and to the network GUI.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2235 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:05:48 +00:00
hikerstk
ed1d4b0192 1) Added missing files from previous commit.
2) Added kart_packet classes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2234 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:02:31 +00:00
hikerstk
afbd02d824 Added network GUI, some improvements to network manager state,
server address and port are now saved in the user configuration.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2233 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 14:00:47 +00:00
hikerstk
fd93bfef1a Beginning of finite state machine for network manager.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:58:37 +00:00
hikerstk
94a1882435 Minor linux bugfixes and ignore of automatically created Makefile.in.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:55:38 +00:00
hikerstk
171a051b1b Added dummy network kart objects.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2230 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:54:42 +00:00
hikerstk
ee0bb967c3 Added handling of local/global player and player ids.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:51:44 +00:00
hikerstk
ea579a3f62 Bugfix: non-network mode crashed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:44:55 +00:00
hikerstk
15c834e849 Fixed linux compilation problems.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2227 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:44:10 +00:00
hikerstk
44f5691bab Moved network related code into network subdir.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-07 13:38:46 +00:00