Commit Graph

4243 Commits

Author SHA1 Message Date
xapantu
bc283dfab6 Re-adding CREDITS text, I removed it to debug :(
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-23 14:13:07 +00:00
xapantu
39281ee8a7 Cleaning up the translator-credits code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5763 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-23 14:10:36 +00:00
xapantu
0f7bb742ab Merge translations
Fix the Credits screen for Launchpad contributions

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5762 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-23 14:04:45 +00:00
xapantu
8525ccc087 Updating .pot file
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-22 18:15:00 +00:00
xapantu
5605a4c864 Adding support for the translator-credits string, it will add automatically the name of the translators
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5760 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-22 18:13:49 +00:00
xapantu
9cfeac1ed4 Adding a mutex in the main_screen to avoid problem with the thread that loads the news
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-22 17:51:48 +00:00
hikerstk
bae43d78df Very minor layout changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5758 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-21 13:21:21 +00:00
hikerstk
1b1de55a20 Added some debug code to inform of incorrect removal of widgets.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-21 13:18:24 +00:00
auria
ca63182f5c Added FIXMEs to annotate a minor set of bugs in the layout code that Joerg just stumbled upon
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-18 23:59:05 +00:00
auria
eb52c1d4af Improved on previously committed GUI engine internals docs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-18 01:38:18 +00:00
auria
8c578b19a4 Documented some GUI engine topics that are admittedly not trivial (thanks Joerg for showing me that ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-18 01:27:13 +00:00
hikerstk
ae85e05390 Bugfix: uninitialised variable was used, which causes (at least on Windows) the camera
position to be completely wrong.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5753 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-17 04:01:17 +00:00
xapantu
9362dc13f4 Convert (partialy) the addons dialog in the new xml system
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 09:34:31 +00:00
xapantu
14fa9736b7 Adding a missing kart icon (for addons tab)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5751 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 09:04:08 +00:00
mbjornstk
73c3ed302f Add missing include for typeid.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 01:05:41 +00:00
hikerstk
314cb2ec3f Updated VS project file, fixed compilation problem in layout_manager.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5749 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 01:01:46 +00:00
auria
e3fa74187d Added YET more files I forgot in earlier commits xD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:54:39 +00:00
auria
4e48bbd66b Extracted the new common base for Screen and ModalDialog out of the temporary location where it was put in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5747 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:46:17 +00:00
auria
021dea1829 Reconciliated Screen and ModalDialog by extracting their common funcitonality into a common base class
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5746 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:39:53 +00:00
auria
ce0f923623 Cleaned out outdated code and no more relvant TODO
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5745 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:13:10 +00:00
auria
d2399b76a6 Converted 'confirm resolution' dialog to use XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:10:09 +00:00
auria
d812bc4289 Added files I forgot in several previosu commits -.-
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 23:57:23 +00:00
auria
b7fe74141e Converted the 'new player' dialog to use XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 23:51:34 +00:00
auria
f43d9d4d35 Ported race paused dialog to XML files + fixed many small things with dialogs-from-xml on the way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 23:24:08 +00:00
auria
f03c8b94fe Fixed error in GUI engine doc
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 22:23:11 +00:00
auria
975451c7ec Dialogs may now be specified in XML files. Ported the 'press a key' dialog to a XML file as a test and example
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 22:12:58 +00:00
auria
ee1f67b19d Converted back CREDITS to UTF-16 (why was it converted back to UTF-8? STK expects UTF-16, since that's the format our font object can handle) - fixing crash when trying to see credits in-game. Also addded better error handling in the code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 20:42:18 +00:00
auria
b1f7012cbd Moved layout code out of Widget and Screen classes; not only is it cleaner this way, it also paves the way for eventually making Dialog classes also use the XML layout code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 20:24:51 +00:00
hikerstk
e034082a2b 1) Moved calls to World::(un)pause from state_manager into
the menus. This simplifies the state manager (no more
   hidden side effects of pushScreen), less parameter
   to onGameStateChange, easier extend for new RaceResultGUI
   (which must not have calls to pause). Now the calls
   are done in the Screen base class (and can be disabled
   in the constructor).
2) Many cosmetic changes to make the code follow our
   coding standards.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 01:15:19 +00:00
hikerstk
a28ed20d9e Only cosmetic changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-11 22:53:42 +00:00
hikerstk
426cedcacb Fixed rare bug in which stk aborts (because it receives a WM_QUIT message)
immediately after start (after closing the null device and opening the actual
screen).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-10 01:15:53 +00:00
hikerstk
ab92817eb6 Removed unnecessary variable (which was actually declared and used in
WorldStatus).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-10 00:25:38 +00:00
hikerstk
dc0d97ed1c More names for scene nodes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5732 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-08 23:01:25 +00:00
hikerstk
41f69b89bd Added names to scene nodes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-08 22:54:04 +00:00
auria
9dfa90beed Decide smarter who won and who lost in a GP, depending on number of players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-08 01:02:26 +00:00
auria
35d2456800 Documented problem
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5729 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-08 00:59:19 +00:00
auria
e940cccc36 Started implementing the 'max number of karts' track parameter as per the todo ticket in the tracker. The count is read but not yet enforced. The values I added in the track files are very approximative and not tested. Ideally the track exporter should generate this field
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-07 01:59:44 +00:00
hikerstk
856d59fc76 1) Worked around bug of 'continue' text not being shown when a kart is unlocked.
2) Minor style cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5727 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-06 13:59:03 +00:00
hikerstk
25b2d48a2a Minor coding style changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-06 05:12:50 +00:00
hikerstk
fd8e85e2eb Simplified code by reusing existing function.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5725 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-05 13:16:32 +00:00
hikerstk
32a7186320 Bugfix: avoid crash if any of the special debug keys (F1, F2, ...) is
pressed when no race is on.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-04 22:47:36 +00:00
hikerstk
5c00d7044a Simplified code somewhat.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5723 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-04 13:10:20 +00:00
hikerstk
7d5f69cf32 Fixed incorrect display of karts in mini-map.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-04 10:33:32 +00:00
hikerstk
80dfb0baca Added debug output if a check line is crossed in 2d, but the kart
does not have the right height. This helps debugging cases when
a check line is too low or too high.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5721 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-02 23:25:35 +00:00
hikerstk
efd148fc42 First test to fix incorrect race order in star track
(which could be caused by the lap-activation line being
too low, causing only some karts to actually cross this
check line correctly).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-02 03:44:44 +00:00
hikerstk
4b50bc250a Fixed gcc compiler warning (incorrect order of initialisation).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5718 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-02 00:18:07 +00:00
hikerstk
3d7f706cfc Removed debug print statement.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5717 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-02 00:16:39 +00:00
hikerstk
a27ab81982 1) Fixed incorrect colours for rows (player karts should be in red).
2) Removed unnecessary type casts.
3) When increasing the GP points, the 'recently earned' points are now
   decreased.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-01 23:37:39 +00:00
hikerstk
14e41122a8 Replaced _DEBUG_PRINTS_LIKE_MAD_ with code that will only print
this information when a race position changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-01 23:30:13 +00:00
auria
64a002116d Updated more screens to not hardcode button heights
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-30 01:47:16 +00:00