Commit Graph

7458 Commits

Author SHA1 Message Date
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
hikerstk
808ffa85f8 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-24 03:22:59 +00:00
hikerstk
a7bdb6f99a Show skidding in history replay (still no skid marks or so,
but at least the visual rotation is shown).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10708 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-23 10:37:54 +00:00
hikerstk
fd4eb3fa5e Added comment.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10707 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-23 06:06:17 +00:00
hikerstk
0836380d9e Apply the additional rotation to be applied to a body also
to the interpolated world transform. This fixes a bug for
rotations that are applied only once, since kart.cpp would
use the interpolated world transform, which is otherwise
not updated till the next time step, resulting in a jump
of the kart rotation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10706 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-23 05:37:21 +00:00
hikerstk
51468de16e Removed sqrt from visual skidding angle, which helps keeping the
physics and visuals in synch (since the physics body will rotate
linearly over time when releasing skid, while the visuals would
still use sqrt).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10705 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-23 05:34:32 +00:00
auria
b9cdffb650 Improve bubbles by the sea, near the top, to better match the shape of the little caves
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 03:06:49 +00:00
auria
a5e80dcdcd Revert accidentally committed stk_config.xml, attempt 2
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 02:40:58 +00:00
auria
7bee493c1f Revert accidentally committed stk_config.xml
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 02:40:31 +00:00
auria
c3e3c38817 Show required points near each force field. Feedback welcome, I'm somewhat dubious
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 02:21:19 +00:00
auria
792aac1e68 Improve where rescue will drop you in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 01:14:15 +00:00
auria
aac43ad521 Improve starting challenge from overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 00:43:51 +00:00
auria
01482b018b Fix potential assertion failure/crash
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 00:43:05 +00:00
auria
18ead10df9 Add support for tangent meshes when converting to bullet
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-20 00:19:10 +00:00
auria
5dda0e97a1 Add Japanese font, thanks to tkbd
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10692 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-18 22:12:26 +00:00
auria
34a1802320 Add missing texture in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-18 22:12:00 +00:00
hikerstk
1160c68ee5 Improved handling when releasing the skid button.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-18 05:39:29 +00:00
hikerstk
1998ed5d90 Removed debug output.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 21:59:32 +00:00
hikerstk
79e2b7d0ae More work on skidding (still disabled by default).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 21:52:47 +00:00
hikerstk
2a741992e2 Yet another fix to linux compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 21:44:19 +00:00
mbjornstk
5940abf58b Add string include so it compiles.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10684 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 20:52:08 +00:00
hikerstk
351f766ca4 Made KArtProperties member of STKConfig a pointer,
which removes the dependency of kart_properties.hpp
from stk_config.hpp, hopefully reducing the compile
time when kart_properties.hpp is changed. Had to
add many missing includes all over the place as a
result :)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 05:59:51 +00:00
auria
9f69dad8a3 better error handling
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-15 22:07:05 +00:00
auria
d6221dae92 Use new normal map shader for overworld columns. Remove 2-UV-layer normal map feature, irrlicht just doesn't support it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-15 21:52:07 +00:00
auria
93a7099cf9 Minor tweaks to normal maps
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-15 20:33:18 +00:00