Commit Graph

147 Commits

Author SHA1 Message Date
Marianne Gagnon
2252495fdc Scripting refactor : add new property animator helper, transfer light animations to this new animator class. Can be used in the future to animate more properties 2015-12-05 19:42:06 -05:00
Marianne Gagnon
63ab79ff8d Fix string on GP result screen, fixes #2295 2015-08-25 21:28:09 -04:00
hiker
b18d0275fd Display a finish (survival) time in FTL result screen. 2015-07-29 17:27:43 +10:00
hiker
d27ba5f6fe Fix #2249 (show points and points increasing in a FTL GP). 2015-07-29 08:58:42 +10:00
hiker
6ada5a0666 Revert "Properly ignore the leader in the ftl scoreboard"
(this patch only fixed the problem that happens when a non-leader
is number one. By now the code has fixed that it is guaranteed
that the leader is always number one, so this patch is not
necessary anymore, and it complicates the loop).

This reverts commit e9d78326fb.

Conflicts:

	src/states_screens/race_result_gui.cpp
2015-07-29 08:12:23 +10:00
hiker
5efb44a430 Fixed scores in FTL GPs. All score handling is now done by the World,
not race manager (which removes if tests).
2015-07-28 09:39:00 +10:00
hiker
5c66273712 Fixed compiler warning. 2015-07-27 16:41:46 +10:00
hiker
d9e806f610 Changed unsigned int to int (dest_pos can become negative, and
while de-facto it still works with unsigned, it's just bad style :) ).
2015-07-26 00:32:11 +10:00
hiker
a9aa37ea97 Minor code style fixes. 2015-07-26 00:31:15 +10:00
hiker
c8909b9197 Fixed missing display of points for non-winners in a FTL GP (partly fix
for #2249).
2015-07-26 00:30:09 +10:00
hiker
76a779fc1c Merge branch 'ftl-scoreboard' of https://github.com/Flakebi/stk-code into Flakebi-ftl-scoreboard 2015-07-25 12:17:02 +10:00
Marianne Gagnon
aacf1293da Eliminated karts in GPs get 0 points. Fixes #2177 2015-07-23 20:01:54 -04:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Flakebi
e9d78326fb Properly ignore the leader in the ftl scoreboard 2015-03-29 04:16:24 +02:00
hiker
72ce6c8bf6 Fixed race over music not playing when sfx are disabled. 2015-02-12 07:57:51 +11:00
Flakebi
1aa6f7c173 Improve the layout of the race result screen 2015-02-04 14:42:10 +01:00
Deve
85800f48e6 Disable saving GPs on abort for now because it requires proper implementation.
m_next_track should have higher value in this case because race is already finished.
2015-01-07 21:24:52 +01:00
Marianne Gagnon
c87531fc1b Disable auto-exit-on-animation-over for feature unlocked screen, should fix #1819 2015-01-05 19:36:04 -05:00
Marianne Gagnon
0af3f3de83 Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes 2014-12-15 21:34:22 -05:00
Marianne Gagnon
229a43a692 Preserve "startedFromOverworld" flag value properly. Fixes #1683 2014-11-17 19:07:37 -05:00
Marianne Gagnon
2c8f86fabd Intro cutscene fixes 2014-11-05 18:13:47 -05:00
konstin
4647a50acb Save GP on abort 2014-10-20 23:46:25 +02:00
Vincent Lejeune
95cf6c5f4a Put 2d function in their own header 2014-10-18 18:16:50 +02:00
hiker
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +11:00
hiker
aa64f31f83 Added Screen::push() function to shorten the calls to pushScreen(). 2014-09-23 16:43:50 +10:00
hiker
c28728d903 Removed more compiler warnings for 64 bit windows compilation. 2014-09-23 16:23:22 +10:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
hiker
32707b8f88 Changed m_grand_prix of RaceManager to be an object (and not a pointer to
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
2014-07-08 13:20:53 +10:00
Marianne Gagnon
b9c45b7e0f Undo dubious code that causes crashes 2014-06-17 18:14:24 -04:00
Marianne Gagnon
61d6caa521 Work on feature unlocked scene 2014-06-07 19:51:34 -04:00
Marianne Gagnon
be5577045d Work on new feature unlocked cutscene, starting to work correctly, more testing (and art work) needed 2014-06-05 20:06:27 -04:00
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