Commit Graph

138 Commits

Author SHA1 Message Date
unitraxx
2428a5f3b0 CurrentUser is now linked to a profile. Thread safeness obsolete, so removed. User class deleted. Adapted hilnius' code to conform.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 22:59: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
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
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
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
yasin-ghannam
c22941d354 Initial Score display. (Using only the first two karts)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13142 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 04:26:23 +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
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
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
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
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
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
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
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
9ddeac772a Likewise for userconfigparams
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 13:32:02 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:47:39 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 22:04:35 +00:00
funto66
6fa3ae7642 Some work on soccer setup screen + cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 12:54:31 +00:00
hikerstk
49f54f2aee Added different impulse in case of a kart-track collision
(just acting along the normal). This solves some of the odd
behaviour with the previous implementation if the kart is
off track. The new way is now the default, but the 'push
towards driveline' can be set in stk_config.xml.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11923 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-11 21:56:54 +00:00
hikerstk
ecd569b093 1) Fixed crash: hovering on top of random kart in the kart selection screen
would crash since getItemModel was not static (and no ItemManager instance
   exists at that time).
2) Items are now also stored in quad-based containers, which will allow the
   AI to better find 'interesting' items.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11511 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-16 22:02:41 +00:00
hikerstk
e2caea1c05 Refactored ItemManager to use static components to load
the default item meshes. An instance of it is now only
created when a race is started (and deleted once the
race is finished). This makes the race-specific 
initialisation and cleanup better to understand. Also
added singleton access to the one instance of ItemManager.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11498 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-09 06:37:29 +00:00
auria
dae00f0828 Add first version on intro cutscene. Still incomplete but goes somewhere :) Ask me for the menu patch if you want to look at it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-05 00:27:34 +00:00
auria
553385fe9d Start work to allow showing worlds without kart, for cutscenes. Does not work yet but getting closer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-31 01:32:27 +00:00
hikerstk
5963f31079 Removed physics.hpp #include from world.hpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11213 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 07:07:15 +00:00
hikerstk
eca5b3e570 Refactored handling of kart animations: instead of
using a fixed object in the kart, now each animation
(rescue, explosion, canon) has its own object and 
implementation using a common interface. This
simplifies AbstractKartInterface, and makes it
easier to add new functionailty. 
Instead of using: kart->rescue(...),  or kart->explode(...)
you use new ExplosionAnimation(kart, ...) etc. Memory
handling is done by the object (and abstract kart).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 22:57:41 +00:00
hikerstk
53b3c78598 1) Added first version of 'cannon' (flying the kart to a specific
location) support. ATM only linear interpolation of the position
   is used (i.e. no rotation).
2) To be consistend renamed 'forceRescue' to 'rescue', 
   'handleExplosion' to 'explode' (and added shootTo for the canon).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-25 23:16:53 +00:00
hikerstk
ebbc1a71d8 Introduced an 'abstract kart' class, which is used to
de-couple kart implementation and its interface. This
significantly reduces compile time when changing kart.hpp,
but is at this stage still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-19 20:21:11 +00:00
hikerstk
629f9a27e2 Removed dependencies on controller.hpp from kart.hpp (to
reduce compile time on controller changes).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-08 22:56:33 +00:00
hikerstk
72070db1a0 Fixed memory leak: the virtual createPhysics function of
GhostKart was not called, since it was called during when
the contrsuctor of Kart was executed (at this time the
GhostKart vtable wasn't set up, so Kart::createPhysics)
was called - which resulted in a memory leak since all
physics parts of the kart were actually allocated (just
not used). To fix this, karts are not constructed in two
phases: first a constructor, followed by a call to init
(during which virtual function can be used).
Fixed several bugs were physics data for a GhostKart
were accessed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10947 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-07 02:41:41 +00:00
hikerstk
bce6113fd7 Added first version of (uncompressed) replays - atm only
kart positions and rotations are saved.
To save a replay, press ctrl-F10 which will create a file
in the stk config dir 'trackname'.replay .
To replay, use --ghost command line, and select the
track with the same name (at this stage the replay is
loaded even if number of laps and difficulty is different).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10897 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-27 05:52:17 +00:00
hikerstk
613173ff3d Set the world kart id in the constructor of karts, and not
later in a separate call.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-02 05:21:14 +00:00
hikerstk
d06acf1f7b 1) Added an (additional) impulse to push karts away from each other.
This impulse does not cause any rotation of the kart, it just pushes
the kart orthogonal to its velocity.
2) The rotational velocity is set to 0 in case of a collision, hopefully
avoiding the problem that karts will rotate as result of a collision.
3) A collision pair now stores the exact collision point for both bodies
(which is then used to determine the side in which the impulse to be
applied).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-14 21:02:15 +00:00
hikerstk
dde603030c Missing file in previous commit (unused network code, but
it wouldn't compile without this).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-12 05:43:57 +00:00