Commit Graph

6806 Commits

Author SHA1 Message Date
deveee
bc46c305f3 Solved conflicts before merge hilnius branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:27:23 +00:00
samuncle
5b5fd87a8b Add two per track parameter for color correction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 16:33:14 +00:00
samuncle
6b0962f876 Add the callback for the color correction shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 14:21:27 +00:00
auria
85bfec00a0 Correct VS compilation (VS 2013 is 18, not 17)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:54:54 +00:00
hikerstk
8032fdb3b0 Converted line endings consistently to unix.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:46:55 +00:00
auria
a358c4d8ee Change risky cast into dynamic_cast, fixing crash
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:38:29 +00:00
hikerstk
46bb243955 Added constant 'stencil' to make it easier to disable stencils for people
with cards that don't support it (like apparently hd3000).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 00:46:34 +00:00
auria
68820bb325 VS 2013 fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 00:36:44 +00:00
hikerstk
7c2e48e2c6 Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while
it can probably be disabled, it's just annoying to search the reason for
a rather incomprehensible error message all over again.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:54:11 +00:00
hikerstk
697a7cf111 Oops - forgot files in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:11:29 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:02:06 +00:00
funto66
3b6aab44b5 Fix compilation with Visual Studio 2010
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 22:38:49 +00:00
auria
faa7fd7ca5 fix typo that broke SSAO
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14611 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:22:03 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:27:55 +00:00
hikerstk
ad0fd41d52 Fixed compiler warnings on VS.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:16:43 +00:00
auria
eaef91fc4b Fix multiple crashes when new pipeline is turned off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:42:14 +00:00
auria
f383440d7f More post-graphics-merge tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:18:14 +00:00
auria
e5fbd5d1fb First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:05:44 +00:00
auria
d1b8bc6073 Apply modified version of patch to remove remaining hit messages
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:23:48 +00:00
auria
8cf0030a27 Apply patch to fix OSX compilation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 16:51:08 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 21:33:06 +00:00
funto66
3a659d45dd Add basic crash reporting functionality on Windows
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-29 22:33:11 +00:00
hikerstk
26744f16d1 Removed minimal race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:06:45 +00:00
hikerstk
05607e862e Goodbye hit messages (note: I had to rebuild from scratch
to avoid some strange crashes).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-27 21:43:34 +00:00
hikerstk
87cc616a6c Fixed orientation of final 4 wheels that are added to an arena
in battle mode (plus some minor code cleanup).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14578 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 11:27:59 +00:00
hikerstk
50c451ac35 Bugfix: forgot to set the actual type.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 09:26:29 +00:00
hikerstk
c136bc2bd0 Fixed #1109 by adding a proper constructor to the Settings class
(which will make sure all fields are initialised).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 06:01:16 +00:00
hikerstk
a1eaada6da Changed default settings for wiimote.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 10:05:49 +00:00
hikerstk
af605462b2 Enabled wiimote-debug output in release builds, changed debug
output to show the now used and derived value.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:55:35 +00:00
hikerstk
ea9b7fe05c Removed 'for Windows' from the name.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14516 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 22:59:16 +00:00
hikerstk
24f13806b0 Disabled hardcoded setting of difficulty to hard when using profile
(difficulty can be set with --mode, this way every difficulty can be tested).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 10:21:49 +00:00
hikerstk
a97430c882 'Better' fix for incorrect time in easter egg mode - thanks to
Devee for diagnosing the problem!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14512 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 01:50:46 +00:00
auria
5ab8b2b563 Fix crash on empty ribbons, required for what's coming next
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 00:14:57 +00:00
hikerstk
5a7fb84267 Fixed incorrect overloaded getTexture function (char * where handled
as bool, not std::string), avoided more crashes on missing textures,
adde better warnings.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 22:37:12 +00:00
deveee
195daa8794 Avoid to run Easter Egg mode as Grand Prix.
I added new files to avoid a mess.
Proposed for 0.8.1

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 18:29:10 +00:00
deveee
8ea98eae71 Display time in race result of Easter Egg mode properly.
It was broken since Easter Egg starts as linear world. My proposition is to include it to 0.8.1 branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 14:43:17 +00:00
hikerstk
e6660d7c74 Improved warning messages: most warnings about textures not
found will now be prefixed with a line indicating what kart
or track it comes from. Fixed crash in referee when a texture
did not exist. Irrlicht's warnings about missing textures
while loading a mesh will be prefixed by a line about which
kart/track is missing as well.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 10:56:42 +00:00
hikerstk
a17db8d168 1) Fixed #1103 (installer does not remove shortcuts) by running installer as
admin which apparently is default in win7), and then setting SetSHellVarContext All
   to tell the installer that the shortcuts are in AllUser.
2) Moved images out of supertuxkart directory (otherwise the images will be installed
   with STK), added missing image.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 09:55:50 +00:00
hikerstk
4b057e320b Removed old and outdated build support for VS and XCode.
CMake must be used now.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:12:46 +00:00
auria
685589a19c Silence warnings that could occur when sound is disabled
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14476 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:09:19 +00:00
auria
fc37766a6f fix harmless spinner warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:02:36 +00:00
yasin-ghannam
287ff4c8ee Added time limited-match instead of only goal-limited ones.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 01:58:10 +00:00
hikerstk
096c883552 Added new installer (which includes some commented out sections
which can be used to customise text), and new logo.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14471 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 23:58:42 +00:00
deveee
75a339b099 Force speed of a kart to be equal to 0 while rescue/explosion animation.
It solves problem with speed-weighted objects. Perhaps also others, for example some sounds depend on speed.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-16 19:43:42 +00:00
deveee
a6952261e2 Stop sounds on close Grand Prix win screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-16 18:32:11 +00:00
hikerstk
8247f73604 Replaced tabs with spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever -
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 11:43:21 +00:00
hikerstk
5d7650c418 Reverted r14410 - the proper finding of textures when loading models
is implemented, and has worked properly in the last years. This patch
will unlikely fix the issue Funto had (incorrect texture for one kart),
but might have unwanted side effects which are hard to evaluate so short
before a release.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14442 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:40:53 +00:00
hikerstk
cce43a6555 Avoid calling guiengine::render if STK is about to be aborted. While
it didn't cause any problems so far, it feels wrong ;)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:05:35 +00:00
hikerstk
a7315d163b Fixed minor memory leak.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 23:56:37 +00:00