Commit Graph

10266 Commits

Author SHA1 Message Date
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
hikerstk
0f098329a6 Removed mergeinfo in that branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:46:08 +00:00
hikerstk
4e134fbe82 Tried more fixed values.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:44:33 +00:00
hikerstk
15788359a6 Updated another mergeinfo file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:41:35 +00:00
hikerstk
94bf328e1e Changed svn:mergeinfo to indicate that all revisions where merged (to solve
merging issues we have).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:32:08 +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
bc2432bb57 Merged with trunk, final part.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:43:14 +00:00
hikerstk
63d5961dd0 Merged with trunk, part 3.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:39:40 +00:00
hikerstk
71341a13f6 Merged with trunk, part 2.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:36:51 +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
samuncle
0a1431aed5 Corrected a bug on intel driver
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 23:46:12 +00:00
samuncle
9fdfb27a67 Add color correction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:48:12 +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
samuncle
77db3a2a6e A basic test (TODO, if this is accepted I should make a new shader for only this effect
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 21:52:07 +00:00
samuncle
cd85c8418b Better grass texture (more colorfull)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 21:51:49 +00:00
samuncle
aa95ccd5f4 Better grass texture
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 20:02:14 +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
samuncle
4e2a553b1f The test map harvest for the new shader pipeline
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:51:27 +00:00
samuncle
063ea38cc6 A new bias (it works better with harvest
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:47:30 +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
d843c1812d add back accidentally deleted music
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:06:54 +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
auria
8c17d21282 Deprecate old texture
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14589 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 20:19:04 +00:00
auria
d8645620e0 Add new egypt music by 0zone0ne
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 20:08:07 +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
ac0b0eb7fb Fixed name of supertuxkart.appdata, added (untested) installation support for that file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:20:36 +00:00
hikerstk
11a0cf4b16 Added 'appdata' file for linux installations (see http://people.freedesktop.org/~hughsient/appdata/
for details).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:14:43 +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
b1c6ca2865 Updated translations (based on 0.8.1).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:02:48 +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
auria
e877e27f4f Add new version of overworld music bu OzoneOne
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-26 23:29:32 +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
7797e1cbc3 Updated Asian fonts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 21:57:33 +00:00
samuncle
6e46086db7 Add the animation of the cart (like the old old mine)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 16:24:56 +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
samuncle
05955679ce I forgot some modifications
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 01:30:42 +00:00
samuncle
7a0f6a635c Add a stop sign
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14558 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 01:27:16 +00:00
samuncle
d811af4ea6 A better screenshoot
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14557 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 00:22:26 +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
samuncle
86385f6107 Add an animation for arrows inside the castel (some player are lost)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:50:34 +00:00
samuncle
b06284f759 Add a glow effect arround crystal
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:19:50 +00:00
samuncle
fe9127ed49 Better lightmap using complementary colors
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14547 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 21:47:42 +00:00
samuncle
78b65ee2b6 Add an animation for the arrows. The right path should be more clear now
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14543 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 21:15:23 +00:00