Commit Graph

6457 Commits

Author SHA1 Message Date
mbjornstk
35a3e78b94 Convert tabs to spaces and remove some trailing space.
computerfreak97 should check the editor settings, r9194 was full of noise.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9203 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-09 02:20:43 +00:00
auria
9d9ca9a3f4 Say hello to zen garden\! This track is still a work in progress but I'm sure you will enjoy
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9201 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-09 01:32:32 +00:00
auria
f4f81d352e Say hello to zen garden\! This track is still a work in progress but I'm sure you will enjoy
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9200 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-09 01:29:56 +00:00
auria
81df80efd4 Fixed a small problem with gnu's 'hair' found by Narann
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9198 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-09 00:11:24 +00:00
auria
605cc255d4 Update jungle to clamp a couple textures
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9196 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-08 23:59:32 +00:00
computerfreak97
2bcc2b1006 Removed skid marks from Gnu. Smoke is still there though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9194 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-08 22:04:22 +00:00
hikerstk
c9830eac8c Worked around a potential linux audio bug: on one machine
the sfx manager kept on reporting that it was playing (the
track intro sound), while it wasn't. That resulted in STK
hanging (not reaching the 'ready set go' phase).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9192 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-08 01:22:43 +00:00
auria
f17d1ad69b Add clamping to transition texture in jungle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9185 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-07 00:48:47 +00:00
auria
b036723966 Update translations in trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9184 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-07 00:11:32 +00:00
auria
1fbf60b6ca Improve Xcode compilation with frameworks; note you will need to download the latest version of frameworks from sourceforge
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9173 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-06 01:02:48 +00:00
hikerstk
babe186845 Renamed license file so that it is exported correctly.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9172 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-06 00:58:22 +00:00
hikerstk
1138c14595 Fixed incorrect unsigned (since -1 is used to indicate 'not set').
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9170 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-06 00:53:59 +00:00
funto66
1c2795f0c8 Added a debug option to skip the ready-set-go phase
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9168 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 21:22:50 +00:00
hikerstk
4b39be6f83 Removed two unnecessary includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9167 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 06:05:08 +00:00
hikerstk
8e0d7789b1 Fixed #298: the karts were rescued to 'last valid quad - 1'
instead of using the predecessor. So a kart on the first
quad of a short cut would be rescued to an incorrect
location (most likely to the end of the main driveline,
since shortcut quads come just after the main driveline
in the quad.xml). See r9161 on 0.7.2.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9166 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 01:39:38 +00:00
hikerstk
b24f53a3eb Added support for storing a predecessor for each node in the
quad graph (needed for rescueing). 


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9165 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 01:35:45 +00:00
hikerstk
ce827038de Renamed 'Run' menu entry to 'supertuxkart' to avoid clash
with Windows 'run' menu entry.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9163 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 01:20:14 +00:00
auria
28886692d9 Fixed warnings + update Xcode projet
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9162 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 01:05:03 +00:00
hikerstk
e4905f48bd Added NoCopy.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9158 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-05 00:15:09 +00:00
computerfreak97
183a72ae82 Changed up skid marks a bit to resolve some z fighting issues I had. They still need a lot of work though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9154 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-04 17:28:53 +00:00
mbjornstk
208fc1adc5 Add old local comment about bomb animation so it doesn't go missing.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9152 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-04 02:01:26 +00:00
computerfreak97
e1ae80d8c0 Added swatter cpp and hpp to vc10 project. Fixed warning in arenas_screen.cpp relating to comparing unsigned and signed integers in for loop condition.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-03 19:25:59 +00:00
auria
fed9fbf695 Fixed Windows paths in Makefile.am
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-03 19:00:25 +00:00
hikerstk
9ff4fdd2ef Started re-factoring attachments: the swatter is now implemented as
a plugin, which makes the attachment objects much smaller. Other
attachments will likely follow :)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9142 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-03 11:54:41 +00:00
computerfreak97
487a45eb17 Stopped hard coding 3 as the number of arenas in 3 strikes menu. See previous commit for more.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9140 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-03 01:48:47 +00:00
computerfreak97
641c9633e9 Fixed bug where 3 strikes arena screen didn't appear properly the first time. Not sure if this is the cleanest way to do it, but it works!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9136 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-03 01:37:31 +00:00
auria
9c76e99106 Enable artist debug mode tricks in multiplayer too
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9131 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-02 00:31:26 +00:00
auria
51a02272f0 At Arthur_D's request : in artist debug mode, when there are no AI karts, skip the ready/set/go messages quickly to make testing go faster
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9130 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-01 23:59:25 +00:00
auria
3a8df49a9e More minor tweaks to powerup probabilities
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9129 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-01 23:17:04 +00:00
auria
30fd8372f0 Remove parachutes from 3 strikes battle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-01 23:07:12 +00:00
auria
cb2672d5db Fixed shortcut in snow peak
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9125 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-01 19:39:14 +00:00
xapantu
71e15d9b15 Fix french translation (fixed in launchpad too)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9123 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-01 19:15:53 +00:00
auria
6e78d93437 Replace the fricition material flag with a simpler boolean (anyway the previous value was only used like a boolean)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-01 00:23:57 +00:00
hikerstk
5bb1a133cb Applied computerfreak97's patch to fix #286.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9114 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-30 13:14:21 +00:00
auria
27ee8072dc Fixed skin glitch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-29 00:12:33 +00:00
hikerstk
4a3d737620 Added support for arena-addons (as a separate tab).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9109 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-27 22:49:15 +00:00
hikerstk
feca29e6de 1) Moved LOD node from kart into kart_model (which should
handle all graphics for the karts).
2) Fixed squashing of karts in case of disabled animations
   (see #283, but only partly solved).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-27 11:43:19 +00:00
hikerstk
b578458ac0 Added support to ignore addons, see #293.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9106 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-27 11:11:17 +00:00
hikerstk
7f85271ec3 Added assert to make sure the lod node is used correctly.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9105 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-27 10:44:22 +00:00
hikerstk
73d93cc559 Removed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 23:03:50 +00:00
auria
0631de56d0 More work to make arenas debuggable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9096 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 22:59:06 +00:00
auria
2d824186fd Fixed crash when starting into an arena from command-line
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9095 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 22:49:09 +00:00
auria
49e1c11332 Add Tux exported with Blender 2.5 for slightly betetr shading
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9093 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 21:02:33 +00:00
auria
1360f9c08f Add Nolok exported with Blender 2.5, also with improved shading
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9090 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 20:36:29 +00:00
auria
7dbeffe200 Added Konqi exported with Blender 2.5 exporter, now that I finally managed to make it all work (and as a plus it also receives nicer shading)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 20:15:41 +00:00
auria
11339d3ae1 Restore floating-point colors to beagle, the code hasn;t yet been translated to the new 'uniform' color
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9082 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 15:38:51 +00:00
auria
694c584051 Add Beagle exported from Blender 2.5; for some reason it looks much better. Better normals?
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9080 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 15:32:45 +00:00
auria
6c3bb3d12e Fixed a few typos in main.cpp found by Crendgrim and KroArtem
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-26 14:41:09 +00:00
auria
a277cf2258 Remove outdated FIXME I forgot
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-25 23:36:58 +00:00
auria
c96b00dc6b Reduce overlapping in add-ons screen by making the name column wider and the date column smaller
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-25 23:34:06 +00:00