Commit Graph

6861 Commits

Author SHA1 Message Date
hikerstk
cb08a03d7d Removed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-02 01:34:08 +00:00
hikerstk
d9f0b49e3b Missing file in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-02 01:22:18 +00:00
hikerstk
397632c62e Made maximum height of ball dependent on terrain (e.g.
balls won't fly too high in tunnels). This is only 
partly working atm.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9708 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-02 01:05:19 +00:00
auria
7395d5307b Improved handling of long add-on names
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9707 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-02 00:31:22 +00:00
auria
79f5f69b9e Change order in which tires are lost
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9706 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 23:59:05 +00:00
auria
a87d0c5f2b Fixed 3-strikes wheels not reappearing when restarting race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9705 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 23:56:22 +00:00
auria
03178d9e75 Kinda fixed crash I introduced in 3 strikes, but the current code leaks. Will need to ask Joerg how irrlicht memory management works...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9704 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 23:47:15 +00:00
auria
3e7aeaf71f HAving some fun : you will now physically lose a tire in 3-strikes mode. Watch out for tires all over the place as the battle gets fierce ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9703 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 20:09:26 +00:00
auria
dd24f83d02 removed bad/outdated flags from Xcode proejct
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 14:56:17 +00:00
hikerstk
8051363917 Updated VS10 project files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 12:59:21 +00:00
hikerstk
1767920dba Replaced the request vector with a priority queue from STL
(which means more efficient insert/delete; less code in STK).
Thanks to Auria for mentioning this.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 10:17:06 +00:00
red-skull
7ca6bc4756 fix bug #397
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 02:13:30 +00:00
hikerstk
5f04084976 Fixed bugs in request sorting (HC_QUIT request with highest
priority did not get sorted to be the next request to be
executed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 01:58:27 +00:00
hikerstk
2ea50e99fd Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 00:59:41 +00:00
hikerstk
85d21b2ea8 Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 00:58:39 +00:00
red-skull
a6dda46ad3 fix bugs added in r9532, constructor delegation doesn't work in C++
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9692 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-01 00:41:45 +00:00
auria
5bd414e546 Fixed glitch in farm
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-31 22:21:18 +00:00
auria
f5fb711c84 Now that we have a new very nice kart (Suzanne), remove old Gooey
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-31 22:18:41 +00:00
auria
f1024541ba Make Hacienda pots cylindrical so that they behave better when hit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 22:46:16 +00:00
mbjornstk
7274186ff5 Remove useless svn exec property.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 22:44:23 +00:00
auria
706dc8fb18 Convert mines to new LOD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 20:43:58 +00:00
auria
6cf71ad6b5 Add missing models in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9670 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 20:13:48 +00:00
auria
ca7b5c4e47 Convert Snow Tux Peak to new LOD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 20:13:05 +00:00
auria
4ce998bde4 Update city for new LOD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9666 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 19:39:37 +00:00
auria
74956e454f Introduce new LOD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 19:10:17 +00:00
red-skull
a3b572cf0a fix #400, live language switch doesn't work for system language
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-30 00:02:59 +00:00
auria
d2af877d81 Improve a little CMake build on OSX
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 18:30:19 +00:00
auria
6aecb42e42 Make the CMake build system work on OSX (link against frameworks, build app bundle, etc.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9657 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-29 18:17:45 +00:00
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