Commit Graph

118 Commits

Author SHA1 Message Date
hiker
d4f3fc88d6 Merged pull requests #2191. 2015-06-02 14:50:32 +10:00
hiker
75b24c96ad Unlock all tracks and GPs in split screen mode. 2015-04-29 08:07:06 +10:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Deve
c36ca55451 Restore tab name in tracks screen to avoid problems with gettext and to keep consistency with arenas/easter egg screens 2014-12-30 13:22:25 +01:00
Marc Coll Carrillo
00d27b3c63 Don't translate internal "nextgen" track group 2014-12-30 13:19:42 +01:00
Marc Coll Carrillo
a9193e09fd Unify random GP's ID and translatable name in a single place 2014-12-30 13:19:24 +01:00
Marc Coll Carrillo
9e6cd2a958 Fix translation problems in random GP screen 2014-12-30 13:19:10 +01:00
Deve
a4ac9f95c2 Use length limit for text only if it's needed.
This check is IMO not needed at all because translators will see if text fit in available area or not. But anyway this length should be large enough.
2014-10-06 21:57:25 +02:00
Marc Coll Carrillo
9c56d66c2d Minor corrections (a couple of warnings, unused headers...) 2014-09-23 22:23:24 +02:00
hiker
aa64f31f83 Added Screen::push() function to shorten the calls to pushScreen(). 2014-09-23 16:43:50 +10:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
Marc Coll Carrillo
5cf3ad220f Some improvements to the GP editor:
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
    - allow empty GPs to be loaded by the GP manager, so that they can appear
      on the GP editor (but not on the track selection screen)
    - enable/disable buttons depending on the available options
    - provide some feedback after pushing the "save" button
    - some minor bug corrections and improvements
2014-09-13 10:40:27 +02:00
hiker
8ffe09de29 Combined GPInfoScreen and RandomGPInfoScreen into one class, requiring
only one stkgui file.
2014-09-04 16:49:15 +10:00
hiker
709583ead5 Removed Random GP dialog. 2014-09-03 17:01:36 +10:00
hiker
7dbfc151bf Added random GP functionality into gp_info screen. Changed GPData
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
2014-09-02 09:32:12 +10:00
hiker
db3db6f8b5 First version of the GP info screen (instead of dialog). 2014-08-27 22:08:50 +10:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
konstin
98f8ddb4e9 fix path to icon 2014-06-21 17:18:01 +02:00
konstin
b7b116634d solving merge conflicts with upstream 2014-05-31 15:28:52 +02:00
konstin
2534abeed2 trying to merge upstream 2014-05-31 15:11:05 +02:00
konstin
02677b38c2 Refactoring, renaming and cleaning-up 2014-05-30 20:26:44 +02:00
hiker
dd04c11260 Sort tracks first by locked/unlocked status, then alphabetically.
Added support for special sort names for each track (e.g. 'The Island'
can be sorted as 'Island' etc).
2014-05-28 17:15:00 +10:00
hiker
726070b331 Use Log::, fix coding style issues. 2014-05-26 16:58:50 +10:00
konstin
0fdfe16a93 first try for a Random GP generator 2014-05-18 15:27:57 +02:00
konstin
53a432ea70 making the dialog work with a predefined GP 2014-05-14 21:41:12 +02:00
konstin
d997780cd7 moving the definition of the size of a GPInfoDialog to it's header 2014-05-14 19:57:13 +02:00
konstin
6f9ae6e510 get back into working state 2014-05-12 14:59:09 +02:00
konstin
82a36fe7de Finally just commenting it out (easier to manage) 2014-05-11 18:09:41 +02:00
konstin
2a01df93d2 removing duplicate code 2014-05-11 18:04:28 +02:00
konstin
eabd10127f move check for a valid number of tracks in a GP to GrandPrixData 2014-05-11 17:52:56 +02:00
konstin
57db9cf858 obvious stuff 2014-05-11 17:47:09 +02:00
konstin
3a8bba6cad remove unnecessary in tracks_screen.cpp 2014-05-11 17:42:50 +02:00
konstin
bfc68472fb remove unnecessary assertions 2014-05-11 17:30:22 +02:00
konstin
eae8183bf5 readding random gp displaying 2014-05-08 22:44:42 +02:00
konstin
73acf5e0ef Removing Random GP for pull request 2014-05-08 22:36:37 +02:00
konstin
5ea5de69cf preparing tracks_screen by adding a randon GP icon 2014-05-08 20:57:19 +02: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
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
This reverts commit 65e2dcf2f0.
2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01: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
8b7754cd4f Merge remote-tracking branch 'upstream/master' into new_login
Conflicts:
	src/challenges/game_slot.cpp
	src/states_screens/kart_selection.cpp
	src/tracks/track.cpp
2014-02-10 21:37:04 +11:00
hiker
97be85777d Started to move current player info from unlock manager into
player_manager.
2014-02-09 23:22:45 +11:00
Deve
57b38b4371 Partially fixed #1067.
beforeAddingWidget() wasn't accounting for the extra space required for the random track.
This was causing the ribbon widget in soccer mode to get drawn incorrectly.

I also changed it in easter egg and tracks screen.

Thanks to sachith500.
2014-02-03 19:29:27 +01:00
hikerstk
e6660d7c74 Improved warning messages: most warnings about textures not
found will now be prefixed with a line indicating what kart
or track it comes from. Fixed crash in referee when a texture
did not exist. Irrlicht's warnings about missing textures
while loading a mesh will be prefixed by a line about which
kart/track is missing as well.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 10:56:42 +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
curaga
1c48d76343 Some const & visibility fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12803 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 10:19:55 +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
07c74c41b5 Merge soccer mode back into trunk - but still WIP, can be disabled via a #define in race_setup_screen.cpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12475 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-11 22:30:50 +00:00