Commit Graph

7482 Commits

Author SHA1 Message Date
auria
fb442f3a1e Fixed fish that was impaled in grass
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10776 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-01 00:40:31 +00:00
hikerstk
9d5485a9e3 1) Moved attachment handling from physics to attachment.
2) Split Kart::crashed into two public functions for collisions with
   kart and collisions with track, and one private function with code
   common to both collisions.
3) Removed #include of attachment.hpp from kart.hpp to reduce compile
   time.
Sorry for not splitting this up into three parts.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 12:02:10 +00:00
auria
27360fbe93 Fix leak by introducing code to free meshes that are not associated to any scene node
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10774 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 02:24:10 +00:00
auria
b950d4a7bc Work around crashes when visting overworld twice. However I'm pretty sure this 'fix' causes a leak
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10773 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 01:23:50 +00:00
auria
19dd91da8f All very minor changes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10772 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 01:17:39 +00:00
auria
449c24ed47 Fix starting backwards on overworld (Thanks Joerg for the script fix)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10770 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 01:12:24 +00:00
auria
6cc19c39d0 Improve challenge selection screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10768 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 00:28:17 +00:00
hikerstk
c7083edba3 Moved terrain particle effectrs from kart into kart_gfx.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10766 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 22:20:31 +00:00
auria
9e99055545 Split overworld trees in subnodes to help irrlicht do proper Z sorting
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10765 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 22:14:34 +00:00
magned
5ab305771c Added particles for 2.5 sec skidding and 3.5+ sec skidding. Feel free to improve.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 07:35:04 +00:00
auria
3fbaeab536 Fix pedestrals by the sea
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 02:55:26 +00:00
auria
665ee15cdd Fix large font
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10760 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 02:25:38 +00:00
auria
3e3c676db0 Clean up text nodes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 01:59:33 +00:00
auria
b29456012c Silence those remaining of the annoying warnings that are printed when loading the overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10758 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 01:00:33 +00:00
auria
e346b44ba1 Silence many of the annoying warnings that are printed when loading the overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 00:54:13 +00:00
auria
973a7cd4bb Use higher-res font for the digits in the overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 00:27:53 +00:00
hikerstk
369338e39f Fix nitro in old (current default) skidding code (skidding effect
was shown all the time after 2.5 seconds of skidding all in all).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 22:41:05 +00:00
hikerstk
35d02e2547 Added indication when the skid bonus 1 and 2 is reached. ATM this
still looks like nitro, and there the bonus of bonus 1 and 2
is actually still the same (wip).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 22:31:40 +00:00
hikerstk
b68e849521 Updates VS 9 project file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10753 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 22:26:22 +00:00
auria
c4507211db Make water in overworld trigger rescue
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10751 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 21:51:46 +00:00
auria
6ff2734b11 Fix crash when starting race in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 21:44:29 +00:00
auria
91cdec00a6 Correct crashes in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10749 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 21:28:31 +00:00
auria
9d4157de93 Add sound hack in debug mode on OSX to make STK more pleasant to debug ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 20:08:49 +00:00
auria
a9516bb08d Fix boats hovering in mid-air, update license
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10747 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 17:04:52 +00:00
auria
691319efd3 Only use water shader when driver supports GLSL and shaders are enabled in preferences
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 16:40:35 +00:00
auria
71118f24cf Add water shader for the overworld. Feedback ewlcome
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 16:39:30 +00:00
auria
652e3180f0 Added needed code for shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 03:13:12 +00:00
auria
1d12c3c9aa Improve water shaders a bit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 03:11:48 +00:00
auria
f33cbb8dc0 Add WIP water shader. Not yet used because not satisfying
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 02:55:52 +00:00
auria
b57ea6a182 Slightly improve normal map shader. It's less physically realistic than before but IMO looks better
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 01:10:57 +00:00
auria
bae9f0e15e Stop time while the challenge dialog is shown
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-28 03:00:31 +00:00
mbjornstk
c551aa5c59 Add select_challenge.[ch]pp to build system.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-28 02:51:37 +00:00
auria
708d79b2f4 Add dialog asking to select challenge difficulty. Crashes for now so don't report bugs yet
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-28 02:06:44 +00:00
auria
0bf039c09e Update Xcode and CMake files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-27 23:47:21 +00:00
mbjornstk
3f0fc54773 Add string include so compile completes.
Error was "string in namespace std does not name a type".


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-27 22:33:35 +00:00
hikerstk
1a49c6bfe5 1) Moved zipper and nitro particle code into a common class
KartGFX (to make kart.cpp smaller). Work in progress.
2) Updated VS 9 project file.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-27 13:09:51 +00:00
hikerstk
ad2a999034 Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10732 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-27 13:08:11 +00:00
auria
af51e45217 Fixed leaks when a challenge file could not be read
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-27 02:46:58 +00:00
mbjornstk
23fe90cd61 Remove references to challenges.[ch]pp, including the include.
Maybe main_menu_screen.cpp is also useless now? Otherwise it would had failed
compiling in other plataforms too.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-27 00:33:39 +00:00
auria
0bab0045bf Update challenges in the overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-26 19:23:57 +00:00
auria
57b727f68d Big overhaul of challenges. Bumped challenge XML file format to version 2.0. Now each challenge file speficies 3 difficulty levels. Started adapting unlock manager for these changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10727 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-26 19:12:48 +00:00
auria
47a7076ab0 Avoid potential crash with challenges
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-26 18:14:01 +00:00
auria
57085843ae Improve placement of numbers in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-26 01:52:55 +00:00
auria
5bdca7e90f Improve display of requirements on force fields
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10723 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-26 01:13:45 +00:00
auria
7db25a654b Update other subsea particles
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-25 02:56:22 +00:00
auria
8e9218c435 make water in subsea trigger a reset. While we're at it update the particles to the new format
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10720 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-25 02:46:18 +00:00
auria
ec0a20c319 Fix bug #557 by deactivating challenge orbs when the player doesn't have enough points for them
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-25 02:09:10 +00:00
auria
870d5c05aa Fix gamepad in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10718 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-25 02:01:29 +00:00
hikerstk
c9d2286e30 Changed the speed dependency of the visual skid offset:
before it was scaled by getSpeed()/getCurrentMaxSpeed().
Since current max speed is affected by zipper (it increases
max speed), the visual skid angle would change when the
skid bonus is activated, resulting in jump in the kart
rotation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10711 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-24 05:56:43 +00:00
hikerstk
f25cda4aa2 Update STK to compile with latest irrlicht (irrlicht r4047
fixed a typo in a function name, so now you need r4047 or later
for STK to compiler!).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-24 03:24:09 +00:00