Commit Graph

6733 Commits

Author SHA1 Message Date
red-skull
c4a24ad6b6 mark conflicts between configuration in blue for #39 (commit with Auria's blessing)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9656 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 02:21:50 +00:00
auria
c4d06b5c1e Allow accessing 3-stirkes in single-player mode if artist-debug-mode is enabled, that's easier to debug tracks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 01:32:05 +00:00
auria
931c9ab948 Integrate quobodup's and mr_spoon's more visible selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9654 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 01:24:05 +00:00
auria
3ee1e92b23 Improve anti-aliasing : remove my attempts at configuring it and just use the defaults, it's much nicer-looking this way ^^
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9653 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 01:05:02 +00:00
auria
b0ec889105 Add highly visible note so that I don't ever again do the same mistake that I fix in previous commit but really puzzled me for a while :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 00:55:47 +00:00
auria
861715c0a6 Fixed some material flags not being set on textures that don't appear in materials.xml
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9651 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 00:52:06 +00:00
auria
0dcb1fa792 Add support for particles on crash-reset, use them in XR591 as example; on the way add support in the particle emitter for decaying emission rates, and use this feature for nitro fire instead of manually applying the decay
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 16:15:42 +00:00
auria
2c677b46c0 Apply patch by nathanm32292394, thanks\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9640 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 15:25:30 +00:00
auria
2dfee28d65 A few more tweaks top electric arcs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9639 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 01:56:05 +00:00
auria
92ae1e05c4 Add back crash-reset property to XR591 arcs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 01:52:47 +00:00
auria
a99ab0f300 Lazily get particle materials, mostly fixing the issue of per-track particles
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 01:36:54 +00:00
auria
94ddc4a59b Allow changing tabs in kart seleciton screen as long as the game master has not selected
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 01:13:58 +00:00
auria
c8be0cb0c6 In multiplayer mode, don't start the game unless at least 2 players joined
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-28 00:20:51 +00:00
auria
ecbdf707c6 Tweak fort magma so karts are less close to each other on start
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-27 18:08:47 +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
magned
b040fbf7a2 Changed 'Race' to 'Single-player' and 'Multiplayer Race' to 'Multiplayer' as 'Race' is redundant. We're not racists, but we know we're going to race.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-26 02:03:50 +00:00
hikerstk
3c67221a07 Updated help text for swatter and rubber ball, made
punctuation usage consistent.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-26 01:11:20 +00:00
hikerstk
fa9b53eed4 Applied Khonkhortisan's patch for #395: adding help text
for rubber ball and swatter.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-26 00:42:11 +00:00
magned
465fc4d5d5 Not to toot my own horn, but now it's less noisy ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-26 00:08:34 +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
a51597cdaf Refactoring: instead of flyable triggering explosions, this must now
be done from the hit function of the objects that need an explosion.
This makes flyable and the behaviour of flyables easier to understand
when reading the code, getting rid of the needsExplosion function.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9623 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 22:16:52 +00:00
hikerstk
f3355f2484 Refactored the 'hit strings' displayed in the gui. Now each
flyable object has to have a 'getHitString' function (instead
of the hard coded global functions like getBowlingString etc).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 22:02:29 +00:00
hikerstk
d9cd6cec9b Added newsly added files to cmake config file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 04:25:55 +00:00
auria
5aab4279b4 Update Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 01:52:06 +00:00
hikerstk
771cf47339 Refactoring: flyable and hit effects now call
updateAndDelete instead of update. The return
value indicates if the flyable/hit effect needs
to be deleted. That removes callbacks to the
projectile manager to indicate that something
needs to be deleted.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 00:06:33 +00:00
hikerstk
8d8601655d Removed commented out code and unnecessary function;
fixed documentation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9618 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-25 00:05:30 +00:00
hikerstk
3161c79196 Added hit effect that only plays a sfx. Simplified
projectile manager of special effects somewhat (now
no more calls from a hit effect to the projectile
manager are necessary).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9617 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-24 06:48:05 +00:00
auria
8b0a7f0b2e Fixed battle-island track to be in standard group
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-24 01:41:36 +00:00
auria
8f756d19fa Added quobodup's battle arena in the default package, congratulations and thanks\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-24 01:15:49 +00:00
hikerstk
5ecf3d4c08 Added interface for a 'hit effect', which is now a base for
explosion. This will allow to easily add different effects
later.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-23 21:57:46 +00:00
auria
6665249821 Complete license in models
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-23 00:00:59 +00:00
hikerstk
2a542f011a Fixed comment.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-22 01:09:09 +00:00
auria
d1ee59b1e2 Tweaks over previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-22 00:42:21 +00:00
auria
6ba44be4f7 Give a go at the 3-spare-tires idea for 3 strikes battle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-22 00:35:31 +00:00
auria
a49fefcd3b Added nicer ball-bounce sound, thanks Arthur for the suggestion
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 23:27:29 +00:00
auria
3f1b9feda0 Fixed small gaps in island track + reduce some wasteful polys in the arrow panel
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 23:18:54 +00:00
hikerstk
edfccbea30 Cleaned up explosion code (only cosmetic changes).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 21:57:28 +00:00
hikerstk
c0fbf21f8a Added bounce sound effect for rubber balls. For now(!) this
is just reusing the race-start 'ping', so this needs to be
replaced with a better sfx!!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 21:56:49 +00:00
mbjornstk
720713b9a9 Remove useless svn exec prop.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 21:08:50 +00:00
auria
bb76487477 Add missing files in preivous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 20:55:38 +00:00
auria
e6af679e12 remove a few thousands of useless polygons in XR591
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 20:53:35 +00:00
auria
30a9032698 Fix shortcut in XR591 + smooth the road in a few places where it was quite bumpy
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 20:09:09 +00:00
auria
be402f35d9 Remove old, unused debug code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 17:32:13 +00:00
auria
da87d76f1c Fixed bug 393, channels in IPO animation get out of sync
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 17:27:05 +00:00
auria
d40416f6a8 Fix the color of suzanne
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 17:16:32 +00:00
auria
fdb020016a Better defaults for focusd button in race end screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 16:54:50 +00:00
auria
cbffa1dc8a Make wooden_bridge sound softer, it was way too loud
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 16:48:53 +00:00
auria
41d8df26aa Minor tweak to GP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-21 16:25:21 +00:00
auria
7e45c88dbc Update pot
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-20 21:17:58 +00:00
auria
bb6ae3f1fa Correct the first-use string
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-20 21:02:28 +00:00