Commit Graph

3222 Commits

Author SHA1 Message Date
auria
7ff75dee45 Updated Xcode project : DEBUG was not defined (not I understand why cheat F-keys wouldn't work, duh...)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4863 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 20:09:51 +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
c151c124cb Added utility methods to set badges in GUI; used them to fix missing green badge when selecting kart
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 19:21:53 +00:00
auria
620f63adc2 Dont give plungers in 3 strikes mode (we need more weapons for this mode\!)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 19:09:41 +00:00
auria
9b7a0fdc31 Some fixes with end-of-race messages;don't display 'you have finished the race' when you're killed in 3-strikes mode; don't display 'you have won' when using the 'race again' button at the end of three strikes; improved FTL end
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4859 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 19:09:05 +00:00
auria
c5d98cf73f Updated canyon
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4858 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 17:04:15 +00:00
auria
d812c0f274 Apply back fix that was committed in r4817 and mysteriously reverted in r4843, plus minor improvements to battle mode end
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 02:43:13 +00:00
hikerstk
d88a8e14e9 Fixed typo in script.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4851 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 01:55:27 +00:00
mbjornstk
423afebb30 Make suspension harder (48 -> 248), seems to work better with jumps and curves.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 23:15:51 +00:00
auria
85227df4a0 Committed back octree, since it is now obvious I was totally wrong thinking this caused the shininess... hum, should have looked at hiker's commit first *blush*
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4849 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 21:39:09 +00:00
mbjornstk
db2805bffa Wild fix for things being overlighted/white. "Works for me", please test.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4848 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 21:28:35 +00:00
mbjornstk
08106d9d2d Make cheats give bowling again, with F5 (F1 and F5 were giving both gum).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4847 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 21:20:11 +00:00
auria
05fe53f70c Reverted the (accidental) switch to an octtree, since this causes very brightly materials on Linux and Windows (WTF??) [and not on mac... WTF again...]
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 21:10:28 +00:00
hikerstk
13f4c5c8ab Removed unused final camera.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 03:33:39 +00:00
auria
eb15a6f11c Removed debug prints that should not have been committed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 02:53:38 +00:00
auria
10834134d4 Started adding more interesting stuff to end-of-3-strikes battle dialog (more polish to come)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4841 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 02:52:07 +00:00
hikerstk
5042ed7e4e Bugfix: script would not work with 'our' improved b3d exporter (for
generating mimaps), and set normals and vertex colours to be exported.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4840 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 02:28:12 +00:00
auria
ac4346cd6d Improved ebnd-of-battle dialog a tiny bit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4839 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 01:54:28 +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
616a3b3719 Fixed STK to not stumble upon command-line arguments that the OS X Finder might pass to the process
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4837 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 00:40:25 +00:00
auria
2945e55d89 Fixed camera doing ugly moves when restarting race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 00:16:06 +00:00
auria
8e345671a9 Some more cleanup to make code follow our guidelines
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4835 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 00:08:02 +00:00
auria
1c17346a0a Cosmetic fix : corrected confusing code indentation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 23:51:56 +00:00
auria
2308e94386 FIxed penalty time, which was broken by the switch to controllers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4833 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 23:46:36 +00:00
auria
5c6df4653a Make a default selection in track selection screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4832 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 23:34:25 +00:00
auria
81bfc497b3 Lowered dependencies of Shadow (now accepts any scene node, no more uselessly requires an animated mesh)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4831 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 22:11:06 +00:00
auria
3ece963bc2 Lowered dependencies of Star (now accepts any scene node, no more uselessly requires an animated mesh)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 22:10:27 +00:00
auria
93c12ead08 Fixed const correctness issue with class ModalDialog + fixed behaviour when pressing ESC in race over dialog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4829 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 22:08:41 +00:00
auria
151e4b64a6 Re-exported elephpant to be smooth and no more hit ground (@Joerg: I have no clue why it hit the ground so kart... maybe you included the wheels in the body of the kart?)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4828 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 17:02:31 +00:00
hikerstk
1fd1e7c099 Added animated elephpant - the first end race animation.
Note that there are still issues with the physics for this
model, it sometimes gets stuck.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4821 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 05:09:52 +00:00
auria
379939e97e Show times in GP dialogs too + prevent a crash (does not fix it, tho)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4820 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 03:01: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
6ef1b804a5 Disable swapper powerup in battle mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 01:57:25 +00:00
auria
b656321ba6 Fixed losing lives in 3 strikes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 01:52:00 +00:00
auria
9fb9d24f08 Committed my code to quickly 'profile' FPS, in case someone ever needs that again
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 01:24:48 +00:00
auria
8ddd775132 Added back applause sound at gp end
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 23:47:31 +00:00
hikerstk
93d96200c1 Bugfix: removed deleted path from configure.ac.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 05:00:56 +00:00
auria
f0b59c19b7 Added a 'loading' screen, so that the game does not seem unresponsive when loading a big track
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4810 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 01:00:21 +00:00
auria
6577d770fb My latest (failed) attempt at fixing MrIceBlock : allow setting material settings for untextured surfaces too. Committing because we might eventually see an interest in this
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4809 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 00:09:09 +00:00
auria
a1d24a8433 Uopdated mines with new features (including camera far clipping, which gives a couple FPS for free)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 23:55:00 +00:00
hikerstk
f4a830fed4 Removed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 22:08:19 +00:00
hikerstk
a7629f7b1d Bugfixes: 1) Incorrect use of 'type=' instead of 'kind='.
2) Avoid crash if id-property 'arena' is empty.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 21:46:02 +00:00
auria
77d2032682 Removed previous attempt, since irr docs clearly say 'This flag is ignored, if the material type is a transparent type.' (i.e. they're making it official that their support for alpha textures is crappy -.-)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4803 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 20:29:17 +00:00
auria
da45ef4721 Some tweaks with alpha. I thought this'd fix Mr Ice Block floating eyes, but it's not the case *sigh*
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4802 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 20:26:26 +00:00
auria
d6a4fc0eeb Removed white pixels around tree textures
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4801 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 20:08:15 +00:00
auria
812459dcb0 Improved looks of GP end
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4799 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 19:01:00 +00:00
auria
239da9419a Include problem fix : wrong case character
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4798 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 18:39:41 +00:00
auria
5121c32e21 Updated makefile for removal of bullet OpenGL demo code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 18:33:29 +00:00
auria
1fed34a601 Updated Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 16:51:48 +00:00
hikerstk
cd68ac9250 Fixed line endings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4795 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 12:15:36 +00:00