Commit Graph

240 Commits

Author SHA1 Message Date
auria
b4b11fa3fc Apply patch by belphegorr to fix nitro target
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-25 23:14:57 +00:00
hikerstk
b5c90675d9 Fixed #941: highlight nitro bar when nitro is used.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-23 07:02:46 +00:00
hikerstk
10317fe33c Applied nixt's patch to use the new speedometer and
nitro bar.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12662 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-15 22:54:28 +00:00
hikerstk
502042432c Big refactoring: the camera for a kart is now not part of the
kart anymore, instead they are managed by static functions
in Camera. This allows us to have several cameras for one
kart now (can be useful for debugging; or for three-screen setup
where you have one monitor for left, right, and center; or potentially
for an back mirrir). Also 'rain' is moved into camera now (where it
belongs more naturally then in kart), and several loops over all
karts searching for a camera are now replaced by simpler loops over
all cameras (though a few loops were added to handle code for all
cameras now, while before there as no loop).
Main advantage: handling post-processing will be easier to do now.
Also this fixes a bug: in split screen mode, when a kart is eliminated
(ftl) the camera for this kart was supposed to show the
leader facing backwards, which didn't work (it just showed the previous
location of the elimintaed kart) - now it works.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12541 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-06 22:08:41 +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
auria
14c058a311 Work on tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 00:58:40 +00:00
funto66
e16c03edf2 Added a special type of tracks for soccer arenas
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-22 22:33:15 +00:00
hikerstk
d77471b446 Refactored information exchange between modes and race GUIs:
instead of each mode maintaining an array of data for each kart
which is used by the race GUI, use one array in race_gui_base,
which is then filled by the game mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-05 04:04:01 +00:00
hikerstk
78865a5608 Move the plunger a bit more randomly.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-28 23:19:20 +00:00
hikerstk
ddea03ebe5 'Animated' the plunger-in-face somewhat, and additionally reduced
plunger-in-face time somewhat.
Atm you can test by pressing F1 in a race (which I'll remove soonish).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-25 21:51:07 +00:00
auria
44a36a8bbf Apply patch by Steel to make the timer count down during a timed challenge. Thanks\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-25 00:21:54 +00:00
hikerstk
ed9b701e53 Added maximum amount of nitro a kart can collect to stk_config.xml
(instead of "const int MAX_NITRO = 16"  in moveable.hpp).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11512 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-19 23:41:36 +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
auria
2a96276da5 The oveworld GUI now has its own class, will be easier to work the UI as I want
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10532 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-31 22:07:49 +00:00
hikerstk
2f89789c56 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10465 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-21 21:02:52 +00:00
auria
c2d69b24f9 Display number of trophies in overworld HUD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10461 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-20 22:01:45 +00:00
auria
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-06 18:43:36 +00:00
auria
c4fc2a2bf7 Fixed issue of 3-strikes lives not being visible with the minimal race UI by somewhat de-minimizing it a bit in 3 strikes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-05 23:49:17 +00:00
magned
be0e6987db Applied a bug fix from khonkortisan regarding icon squashing in correlation with kart squashing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9630 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-26 21:08:52 +00:00
hikerstk
5f3f25a5e5 Applied Khonkhortisan's patch to squash the icons
in the race gui if the kart is squashed. Thanks!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 23:49:29 +00:00
hikerstk
da8ec214ce Added a very first version of a swatter (or inflatable hammer).
Details are in the wiki (http://supertuxkart.sourceforge.net/Items).
Note that the model is _obviously_ a placeholder, and I  used
the icon for the bomb (which isn't used in game atm) for the
swatter. I hope someone can provide a better model and icon.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9011 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-22 12:27:48 +00:00
auria
561e40a9ed No questiuon mark for minimap when RTT is down
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8881 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-12 00:04:53 +00:00
auria
4157f7dc10 More work on 'thou shalt not include irrlicht.h everywhere carelessly'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-22 19:45:17 +00:00
auria
13de7b86d4 Give the same APPROXIMATE plunger-in-face handicap at all resolutions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 23:59:49 +00:00
auria
922eb14a22 Simplify and make more robust the random kart selection code for AIs, hopefully fixing Arthur_D's bugs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 23:40:29 +00:00
hikerstk
9c127322f2 Added assert to material_manager to catch if unintentionally
temporary materials are made permanent (while this is not
a memory leak, the code should use the right functions to
indicate which materials will stay around). Fixed some
materials that became permanently even though the code
called 'pushTempMaterial' (but the materials stayed
permanent). Moved icons_frame into commong race gui
base class, and made race gui textures permanent (so
that they don't cause any false texture-leaked messasges,
and also to avoid loading them again at each race).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-04 00:15:46 +00:00
auria
bea4efecfc Fix material 2D not always being enabled when it should
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-30 17:42:44 +00:00
auria
c1f992231e Full support for smoothing scaled icons in the GUI (will only work if you use a patched irrlicht)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8433 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-23 20:34:38 +00:00
hikerstk
db41b21af6 Moved more functions and variables common to the two
race guis into a common base class.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-11 21:56:15 +00:00
hikerstk
0fcfc3d5cf Added lighning support to minimal race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-10 22:10:33 +00:00
auria
c54809ebe2 Fixed lightning being multiplied in multiplayer mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8174 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-01 14:41:18 +00:00
auria
2d36a9c491 Fixed fonts being messed up by lightning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-17 22:44:10 +00:00
mbjornstk
67d3d86cc9 Tone down lightning flashes and add (disabled) rainy look via fixed tinting.
Some kind of flexible tinting system would be nice to have.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7961 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-17 00:14:24 +00:00
auria
d272c2e725 Fixed merging glitch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-17 00:07:07 +00:00
auria
b3fc0ed2cd Merged tinygettext branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7958 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-17 00:02:27 +00:00
hikerstk
15241ef88e Added tinygettext source. They compile on Linux atm, but are not used
yet. stk_file_system.?pp atm is just unix_file_system.?pp.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/tinygettext@7911 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-16 00:31:53 +00:00
auria
886fa2986a Fixed bad OpenGL includes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-15 23:55:53 +00:00
auria
bfeb8b6f31 Add thunder to lighthouse
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-15 22:48:59 +00:00
auria
d8b04b2338 use smaller font in split screen mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7502 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-23 03:07:30 +00:00
auria
0d5c243b38 Hide bottom messages in split screen mode, we just don't have enough screen space
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7501 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-23 02:57:50 +00:00
auria
af48c54926 Add I18N comment
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7444 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-16 16:34:37 +00:00
hikerstk
f629413846 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-14 01:43:13 +00:00
auria
bf3b23210f Fixed race messages appearing in wrong viewport when playing with 3 or 4 players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-14 00:25:46 +00:00
auria
30e6f2323e Fixed a few displays for RTL
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-14 00:19:40 +00:00
auria
98cb8b14d9 Correct location of new speedometers when playing with 3 or 4 players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-14 00:07:52 +00:00
hikerstk
9dde70687f Implemented icon caching, and updated to support the future
web page (unfortunately the web server isn't up to that
standard yet, so expect error messages, addons that don't
work etc.).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-11 22:49:55 +00:00
auria
79b41ace2a Say hello to the new nitro bar, thanks to Dakal (it only goes up to 16, while old one went up to 20, but I don't think it matters, I never reached 20 in real gameplay anyway)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-10 20:08:41 +00:00
auria
afa16287ea Mark a few forgotten strings as translatable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7159 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-23 18:30:23 +00:00
auria
10299aae86 Don't display rank in 3 strikes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7099 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-20 01:19:05 +00:00
hikerstk
47661bf772 Fixed crashes in case of FTL GP (in 2nd races no number of laps was defined).
Note that the ordering in FTL GP is still broken and can still result in crashes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7073 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-18 12:58:09 +00:00
hikerstk
d81be16715 Removed display of highest speed when wheels are not on ground.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6999 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-13 11:50:42 +00:00
hikerstk
37892fc06d Fixed rank display in FTL races - the number of karts was not
decreased when a kart was removed (bug 3133631).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6935 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-09 21:19:01 +00:00
auria
c6b61f8a55 Add hidden feature to remove the race GUI: will be helpful to take track screenshots.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6867 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-07 00:28:13 +00:00
auria
5c372e2f81 Make timer in race gui resolution-independent + fixed some very fishy code along the way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-05 16:25:51 +00:00
hikerstk
b7b0f1b41b Fixed splitsceen display: energy bar was moved down a bit,
lap and rank display are now on top of the energy bar (and
just under the time). Removed 'finished' display if the
race is finished.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-19 21:49:19 +00:00
hikerstk
5460aa2058 Removed double display of 'finished' for laps and rank.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-17 12:28:46 +00:00
auria
5eb4aaf4ef Hopefully fixed nitrobar going off-screen at large resolutions : use a percentage of screensize, or an sbolute size multiplied by the scale parameter, but not both toghether.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6191 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-01 23:46:46 +00:00
hikerstk
2c98d511fe Fixed graphical error in FTL races when music is enabled
(see bug 3072740): the countdown timer caused incorrect
values to be used for the 'music credit' display.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-23 07:17:04 +00:00
hikerstk
5fbc6eb0bb Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5990 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-14 00:57:27 +00:00
jmimu
62eff31d0e Hide icons overlaping minimap
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5971 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-12 15:25:48 +00:00
hikerstk
ea7e1e2734 Applied jmimu's patch to fix icons in battle mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5953 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-10 05:16:52 +00:00
hikerstk
91e86e83b8 Applied jmimu's patch, to fix the real problem with the disappearing
icons. Thanks for the patch!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5918 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-08 05:56:18 +00:00
hikerstk
fb7cd0e161 Applied jmimu's patch to fix bug 3059574 "Race icons
disappearing", which is triggered when AI karts have
finished the race. Thanks a lot!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5912 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-07 13:46:51 +00:00
hikerstk
a9d0acef3e Bugfix in new animated icons: if the kart positions were not in the right order
when stk is started (i.e. kart with world id 8 is on position 10 instead of 9)
then the race gui would crash. While this situation should not happen (the 
incorrect position happens if a kart has an invalid start position and is 
therefore rescued when the 'go' happens), this patch avoids a crash, helping
tpo diagnose other problems.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-05 23:41:59 +00:00
hikerstk
7688b613ec Removed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5896 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-05 01:05:52 +00:00
auria
15523034da Applied icon outline patch by jmimu, thanks\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5883 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-04 18:29:04 +00:00
auria
5d631158db Reversed WIP icon background patch that I accidentally committed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-04 18:20:11 +00:00
auria
bc490ef54e Added ability for setting some labels to a different color, to improve on the unreadable text on dark background issue. Colors may need to be tweaked.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5879 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-03 19:42:36 +00:00
hikerstk
548ebab371 Fixed (at least one) bug in new race gui which caused battle mode not to
work anymore (battle modes don't have distance along track).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-02 12:47:28 +00:00
hikerstk
10616dab38 Applied jmimu's patch which shows players affected by attachments
and explosion in the player icon list, and 'animates' if a kart
is overtaken another kart. Thanks a lot for this patch!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-02 00:44:11 +00:00
hikerstk
9b74339431 Fixed bug 3041526 - speedometer display was incorrect for higher speeds.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5806 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-29 12:56:08 +00:00
hikerstk
2ad6b0a027 Renamed CGUIFont.{h,cpp} to scalable_font.{hc}pp, removed all
references to CGUIFont (so that the new mono-space-digits functions
can be used everywhere); some code cleanup. 


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-21 00:01:22 +00:00
hikerstk
626f83087a Added new base class for race gui (in prepration for improved
result gui).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-11 23:03:54 +00:00
hikerstk
e8d97d035d Fixed delete being inconsistent with new.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-08 05:14:42 +00:00
hikerstk
2b3eac1746 Fixed memory leak.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5667 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-07 21:50:32 +00:00
auria
a8224ea937 Fixed a couple issues in race GUI
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-02 23:14:44 +00:00
hikerstk
0d527829ef Fixed VS compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-29 11:11:03 +00:00
auria
6cb51e2492 More work on scalable race GUI : race GUI will now be not so small on high resolutions (we need higher-definition weapon icons\!)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-29 01:23:56 +00:00
auria
536bce6aa9 Started implementing scalable race GUI : race GUI will now be not so small on high resolutions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-29 00:59:20 +00:00
hikerstk
0a59455a82 Removed LIMBO state, added new RESULT_DISPLAY_PHASE (but at this stage no
visible change to user).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-10 23:53:32 +00:00
auria
c9ddf98f3d Added assertions to catch the bug reported on the forum earlier (when doing the resolution switch, not when plasying afterwards). Seems it has to deal with the material manager and the handling of 'permanent' materials (but I can't make any sense of your code there Joerg, so please help -.-)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5401 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-07 15:28:05 +00:00
auria
e92a0cc2ea Improved lap count display location calculation to avoid any overlap with minimap. The position is still calculated every frame even though it doesn't change, which is a bit silly, but we can improve that later...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-28 18:26:23 +00:00
hikerstk
ac42071c82 Moved PowerupType into PowerupManager (some minor work on
weights for powerups started, but nothing more than some
declarations).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-28 13:17:02 +00:00
auria
271287f192 Removed scaling parameter from race gui lap
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-28 00:07:48 +00:00
mbjornstk
2142f5f5e2 Remove exclamation mark that showed "flying" (it was half off screen).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-27 22:51:07 +00:00
mbjornstk
e6e23021bc Make minimap scale with window size. "Lap n/m" text still to be adjusted.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-27 21:44:01 +00:00
auria
1ced2b17cd Added a FIXME explaining the cause of some bug; didn't fix the bug yet, though, cause I'm not sure what the best way to fix it is. Will need to discuss with Joerg
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5267 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-25 18:11:36 +00:00
hikerstk
d5b39b67d0 1) Added support to display icons of the karts instead of
dots in the minimap.
2) Added documentation to KartProperties.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5245 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-23 02:18:45 +00:00
auria
297f0cceb4 Renamed SoundManager into MusicManager, since this makes it much clearer what it does (it was just confusing to have SoundManager and SFXManager)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-21 17:24:02 +00:00
auria
1be79f8a72 fixed a FIXME (minor change)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5107 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-31 23:49:42 +00:00
auria
4340cccd9f Added support for displaying the same fonts in different sizes. Use smaller font for in-game messages
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-07 02:03:39 +00:00
auria
11c147c8e9 Display less important messages in white, at the bottom of the screen, to not detract attention from gaming. Fixed probable grammar mistake in string
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-07 01:35:57 +00:00
auria
d0624a7ab7 Improved vertical spacing betweewn messages to adapt to font (but multi-line messages are NOT supported anymore)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4931 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-05 01:58:27 +00:00
auria
6f278f6d1e Started implementing clicking on a challenge to start it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-28 00:52:41 +00:00
auria
a6430189f5 Draw plunger-in-face first and not last, so messages are not hidden under the plunger
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 19:30:53 +00:00
auria
08c0d291fb 3 strikes now has some ending instead of crashing (more to come)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4838 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 01:48:32 +00:00
auria
c0543e1c69 Fixed color display in 3 strikes mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4819 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 02:11:33 +00:00
auria
dc017fc74c Fixed plunger-in-face display
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4778 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-20 20:16:26 +00:00
auria
262ba9275f Fixed messages saying 'tux has been', to now say 'tux has been eliminated' (strangely enough, the text is no more centered with this fix, even though I believe it should)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4766 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-19 00:53:08 +00:00
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
hikerstk
328373289a 1) Moved access to world object from race_manager to static functions in
world.
2) Removed more dujplicated/unnecessary functions from race_manager
   (getPlayerKart, getTrack).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 07:11:52 +00:00
hikerstk
b9ffb6fa13 Removed g++ compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 23:55:19 +00:00
hikerstk
c6bf95a64c Started to remove the various kart lists in various objects.
1) Removed getKart from RaceManager.
2) Renamged RaceManager::getNumKarts() to getNumberOfKarts.
   This function should only be called when the world
   does not exist (or is not yet initialised). 	In all
   other cases world::getNumKarts() should be called.
3) Improved several 'const' functions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 11:40:33 +00:00
hikerstk
4e36fc1f78 Moved WorldStatus enums into WorldStatus class.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-09 09:24:45 +00:00
auria
998cc50ed0 RIP domestic manners
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-24 23:57:50 +00:00
hikerstk
71616e256e Removed calls to gettext in each frame, instead the tranlsation is only done once when
the object is created.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-11 22:08:33 +00:00
hikerstk
cf0e69b48f Removed #include of kart and player_kart from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-10 23:12:29 +00:00
hikerstk
e6296c1987 Fixed speedometer display for irrlicht 1.7 (no change for irr 1.6).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-05 11:31:10 +00:00
auria
33e95fca6a Fixed reported bug with musical note placement in in-game music credits
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-04 18:05:56 +00:00
mbjornstk
5fe41e5625 Run expand -t4 to convert tabs to spaces. No other whitespace fixes, but
there are still trailing spaces and lines with 5 spaces as indent (fix them
as the files are changed for other reasons). src/guiengine/CGUIFont.* and
src/bullet/ not processed to allow cleaner updates from upstream.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-18 00:36:35 +00:00
auria
edf2a43676 As suggested on the mailing list : 3-player-plit-screen should divide in 4 and use the 4th window to put stuff like minimap and players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4261 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 18:35:58 +00:00
hikerstk
5b58714fff Revmoed support for irrlicht 1.5 (which doesn't have all functions we need anyway).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-04 01:09:40 +00:00
hikerstk
29ddca4044 Bugfix: the circles representing kart in the minimap had an incorrect colour.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4234 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-03 09:10:57 +00:00
hikerstk
ed9bd38402 Some redesign of split screen to enable proper handling of
ambient light changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-29 13:04:57 +00:00
hikerstk
a5a90be806 1) Started to add split screen (though not all parts of the race gui are displayed correctly yet).
2) The name of an AI kart will now only get the AI name added if it's profile mode (to prevent
   the name with AI name to be displayed in game)
3) Some code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-23 05:20:05 +00:00
hikerstk
4543f6ab5e Ported the display of karts in the minimap to irr 1.6
(note that the speedometer display is also ported, but does
not work atm due to limitations of irr 1.6 ... or incorrect
usage ;)  ).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-15 23:51:41 +00:00
auria
0f14b098cd Completely removed the IRR_SVN macro, makes it confusing for people trying to build STK from autotools. irrlicht version is now detected from irrLicht includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-06 19:17:16 +00:00
hikerstk
4d6add9f4c Port for irrlicht 1.6/svn version.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4080 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-05 01:23:10 +00:00
hikerstk
0a5e7ba293 Bugfix: the 'circles' representing karts in minimap were not working anymore.
To auria: something's weired with the rtt - you are calling setRenderTarget
twice - but it looks like it's not working for the kart screen otherwise.
I've worked around so that at least the 2d rendering works as expected (with
a single call).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-08 12:50:52 +00:00
auria
c3f0f7ab82 Massive conversion from std::string to stringw for all strings that need to be translated. Currently, translation is broken (strings i try to transalte appear as junk) -- since irrlicht GUI widgets all use wchar_t, using std::string in UTF-8 just didn't make it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 18:21:59 +00:00
auria
b39414cf8e Many more I18N clarifications, and fine-tuning of extracting strings from XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 01:50:22 +00:00
auria
ff2dd24ec6 Cleaned up render-to-texture code. It should be much more efficient for kart rendering, and also code should be easier to read. @Joerg: I think I didn't break your RTT bits but better check *blush*
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-29 17:09:03 +00:00
auria
452808838a Fixed various warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-26 15:18:14 +00:00
hikerstk
6318008c87 Restructured modes to be easier to inerhit from:
- cleanly split into constructor and init()
  phase
- added new isRaceFinished() function
Some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-21 13:05:52 +00:00
hikerstk
ef175e94d4 1) Added alpha version of profile-mode (which replaces if-statements
in world).
2) Moved camera management into race gui, so that the number of split screens
   used can be adjusted (and not only indirect via number of player) - this
   allows e.g. debug modes where you can see 4 AI karts at the same time,
   for profile mode, ...
3) Code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-21 00:32:24 +00:00
hikerstk
184ba6269e Bugfix: the circles for the karts on the minimap were not shown
when the game was started using the menu (instead of -N command
line option).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-18 09:41:53 +00:00
hikerstk
ce4d1b8000 Fixed VS compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3871 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-17 00:19:55 +00:00
auria
91c04d564f Improved music credit text displayed at the beginning of a race so it's not confused with track author
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 22:52:41 +00:00
auria
a2e93a9b2c Don't show music desc when music is off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 20:55:06 +00:00
rforder
7a84273ec5 Cleaning up kart selection. Assigns karts correctly in multiplayer. included some null pointer and bounds checks that were causing some
crashes, etc.



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 22:53:24 +00:00
hikerstk
2b5a273b95 Renamed RaceManager::getKartName to getKartIdent, since this is was the function actually does :)
(prevents us printing the id instead of the name somewhere).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 04:53:51 +00:00
hikerstk
6bed41add5 Bugfix: removed debug/test code.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-05 12:58:08 +00:00
hikerstk
c64608eec7 Added fixes to STK to work with current irrlicht SVN. All changes
are in #ifdef IRR_SVN - and at this stage linking fails for atm unknown
reasons. No changes to irrlicht 1.5 compilation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-05 12:45:11 +00:00
hikerstk
a0102fcc0e Fixed half-transparent icons in race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-30 10:20:11 +00:00
hikerstk
89b2eea124 Added first version of track mini map to race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3784 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-30 02:40:30 +00:00
hikerstk
368604f379 Added speedometer.
NOTE: to use the speedometer, a patched version of irrlicht is needed. The replacement
files are included here, we hope that the necessary functions will be included in the
next irrlicht release (STK will still compile without a patched irrlicht version,
but not display the speedometer).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3781 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-27 11:56:09 +00:00
auria
d1b5f001cb Fixed back warnings (don't remove them this time hiker ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-21 01:35:18 +00:00
hikerstk
d8b212aa44 1) Fixed render-to-texture bug (which resulted in black background instead of
transparent one for the kart selection screen and mini map).
2) Added very first version of minimap (scale is wrong, no kart display yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3778 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-20 12:35:34 +00:00
auria
85266dfe10 Started mammoth cleanup of GUI code. Separated the generic GUI engine and the STK-specific bits (still work to do on this side)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 17:48:36 +00:00