214 Commits

Author SHA1 Message Date
hiker
eea9d6dbd8 Added FIXME and some comments so that we can look at this
strange call again when more networking code is added.
2014-06-02 16:30:53 +10:00
hiker
827286105e Fix #1347. 2014-06-02 15:54:23 +10:00
Marc Coll Carrillo
82cc7af4f6 Avoid the use of the new GP editor as a cheating aid 2014-04-13 21:34:28 +02:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
Marianne Gagnon
fb90388e10 Apply patch by Marc Coll to improve upon his work on GP progress display 2014-03-28 19:16:56 -04:00
Marianne Gagnon
348a20288f Apply patch by Marc Coll to have better progress reports during long GPs, thanks! 2014-03-26 20:14:29 -04:00
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files
(to reduce the amount of recompilation when user_config.hpp is changed).
2014-02-26 12:52:16 +11:00
hiker
97be85777d Started to move current player info from unlock manager into
player_manager.
2014-02-09 23:22:45 +11:00
hiker
5474b5528f Removed unnecessary parameter from onUpdate calls. 2014-01-22 07:43:17 +11:00
vincentlj
6697a2d7af Another batch of conversion to draw2DImage
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:19:47 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 23:48:47 +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
c5b8732087 Probably biggest commit (in terms of number of files) ever -
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 11:43:21 +00:00
deveee
b357de50c2 Stop finish sound while exit from race result gui
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14288 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 19:05:03 +00:00
deveee
612d53bfe7 Use smaller distance between rows if there is no place for all entries.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-18 07:33:18 +00:00
deveee
3da81e3c8d Minor improvements in race result screen - soccer mode
- move displaySoccerResult() from displayOneEntry loop
 - don't display more results than it fits in table
 - also set max number of goals to 10. playing game to 30 goals doesn't have sense and it's hard to display 30 entries in a half of 800x600 screen.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-17 20:15:12 +00:00
deveee
a0ea14b20c Minor changes in race result gui - soccer mode.
On some resolutions longer (translated) title was drawn on ball image.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-17 11:24:50 +00:00
deveee
c452bf9d97 Tabs into spaces
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 20:25:30 +00:00
deveee
b16973dd8f Read localized names of the karts in race result gui - soccer mode.
Also use one standard color for both cases when red and blue team wins. It looks IMO better, I hope it's not a problem for others.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14254 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 20:19:49 +00:00
deveee
a7d62553f1 Fixed crash in new race result gui in soccer mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 19:40:10 +00:00
yasin-ghannam
1d1b5c20c5 Soccer fixes. Icon fetching and placement.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 13:27:42 +00:00
yasin-ghannam
70ef7966e1 Modified Soccer Mode results screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 00:23:20 +00:00
deveee
829656d1d7 Move getting team icons to avoid getting it in every refresh.
I'm not sure where it should be to keep order.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 10:15:29 +00:00
deveee
d4a224cd4e Place team icon in the same position as kart icon in soccer mode result race.
Visually now everything looks good for me :-P

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 20:09:21 +00:00
deveee
402799a460 Draw team icon in race result
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 13:34:23 +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
deveee
ecc27f9d03 First version of race result gui in soccer mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 19:20:08 +00:00
hilnius
71fb252654 removed some useless files + improvements in end-race GUI interaction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-29 17:57:56 +00:00
hilnius
93ec81f309 now to know the public ip address, the GetPublicAddress protocol uses randomly selected STUN servers from the UserConfig file. If the server doesn't answer after two seconds, the protocol will reset and pick a random server again.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:14:52 +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
hikerstk
f3e9520339 Renamed 'back to track selectin' to 'back to challenge selection',
which (imho) describes a bit better where this goes to. Removed
"Setup New race" when selecting a challenge from the overworld, since
it is confusing to come from the overworld and end up on the game
mode selection screen.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12774 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 06:53:01 +00:00
auria
61bcdffb64 Show confir dialog before aborting GP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12492 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 00:20:40 +00:00
auria
5446021d08 Fix build in previous build
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 23:00:59 +00:00
auria
9d09e69b69 Add check to not crash when a kart has a null icon
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 20:28:47 +00:00
hikerstk
9c0e002f0a Fixed 'No newline at end of file' warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12362 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-15 06:28:41 +00:00
auria
4838a1eb2f Clear AI-override when appropriate, fixing #829
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12198 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-07 00:24:20 +00:00
hikerstk
6ebf8b6565 Added Fort Magma to last Grand Prix once the game
is completely unlocked (before only 4 tracks will
be in the last GP).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12095 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-27 12:09:16 +00:00
auria
9c59842db9 Show what was unlocked
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-27 00:41:38 +00:00
auria
6aa15502a4 Fix going back to overworld if needed when aborting GP from race over screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-20 01:01:53 +00:00
hikerstk
8d05b69494 Fixed crash at end of a demo-mode race (for one frame the
race result gui is active while there is no world).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11961 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-16 12:51:26 +00:00
hikerstk
e6ce0c80ac iFixed #747: missing points in FTL GP.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11925 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-12 06:26:37 +00:00
auria
40dc6ceba8 try to fix crash in outro cutscene
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11914 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-11 00:15:03 +00:00
auria
d9fd492d50 Play some music on feature unlocked screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-29 23:07:22 +00:00
auria
7195131d14 Apply patch by Steel to make sure giving up a race can't give you a highscore or challenge
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11762 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-25 23:17:10 +00:00
hikerstk
3a6133f6d6 Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-21 22:49:08 +00:00
auria
c174368274 Apply patch by Steel_ to display hgihscores at the end of a race, thanks\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11725 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-20 19:01:45 +00:00
auria
30d75a957a Improve Nolok'as special abilities a little, and switch to the end cutscene after beating him, then after that go to credits. This gives a reasonable ending i think :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11580 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-09-14 00:03:38 +00:00
hikerstk
c15528f903 First version of demo mode. Use --demo-mode T to start
a demo after T seconds of idle time, --demo-tracks a,b,c
to specify a list of tracks to use for demo mode, --demo-karts
to specify the number of karts.
This is WIP, esp. it crashes if ESC is pressed during a race
(other keys will successfully return to main menu).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 00:10:33 +00:00
auria
6f58350098 Return to overworld when exiting a race if race was started from overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 15:42:44 +00:00