konstin
e7a9c6fcc6
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lapnumber
2014-07-17 20:32:54 +02:00
vlj
4e079b0e14
Fixes shader errors reported by Auria
2014-07-17 02:17:49 +02:00
vlj
23bc1f9344
Remove use of texture2d in rh.frag
2014-07-17 02:11:04 +02:00
Marianne Gagnon
e6fd365685
Re-fix clang fixes so that it works on other compilers too
2014-07-16 20:02:52 -04:00
Marianne Gagnon
8483613a4e
clang fixes
2014-07-16 19:51:24 -04:00
vlj
c4238d2089
Use emplace_back instead of push_back(std::make_tuple())
2014-07-17 01:44:57 +02:00
vlj
14e3ccd059
Duplicate singleton code for abstract/non abstract cases
2014-07-17 01:30:45 +02:00
vlj
366439bdd0
Reenable transparents.
2014-07-17 01:07:59 +02:00
vlj
6e4cca81d1
Fix material identification.
2014-07-17 01:06:17 +02:00
vlj
25c5fb326f
Do not use srgb texture for splatting.
2014-07-17 00:56:11 +02:00
vlj
6710f61863
Do not convert normal map to srgb.
2014-07-17 00:46:17 +02:00
vlj
be55a1a1c6
Reenable normal map material.
2014-07-17 00:36:10 +02:00
Marianne Gagnon
44bce402e3
clang fixes
2014-07-16 18:34:59 -04:00
vlj
f5a5988967
Fix instanced and reenable displace.
2014-07-17 00:24:09 +02:00
vlj
40a7ab0780
Raise one of ssao tolerance value.
2014-07-17 00:12:54 +02:00
vlj
e6bade24ad
Fix RSM
2014-07-17 00:10:34 +02:00
vlj
55ab93a4e6
More work.
2014-07-16 23:44:16 +02:00
vlj
1d0fb9ca68
Simplify material
2014-07-16 23:15:07 +02:00
vlj
27020c0c92
Move draw template function to render_geometry.cpp
2014-07-16 21:38:38 +02:00
vlj
1aa43814b0
Partially unroll template for grass shadow.
2014-07-16 19:41:28 +02:00
konstin
b0f3a48d80
close #1397
2014-07-16 16:02:36 +02:00
konstin
ea56f66d83
Revert "unify separators"
...
This reverts commit ad641eff67
2014-07-16 15:46:52 +02:00
konstin
ec73fcb2b7
minor stuff
2014-07-16 15:40:27 +02:00
konstin
0ec2cd6dc1
Merge branch 'master' of https://github.com/supertuxkart/stk-code into asdf
2014-07-16 15:16:11 +02:00
hiker
ed349914fb
Fix linux compilation.
2014-07-16 21:24:32 +10:00
hiker
a39efe7b3f
Fixed incorrect fix for linux compilation done by me:
...
Shader::getInstance<Shader>()->Program
does not compile on some gnu compiler, proper way is:
Shader::template getInstance<Shader>()->Program
Thanks to auria!
2014-07-16 16:38:41 +10:00
hiker
d0784f3fcd
Fix #1407 (huge rank number in FTL HUD).
2014-07-16 16:28:32 +10:00
hiker
e79c637a11
Try to use an even newer repo, since the previous one is only supported till ... end of this week ;)
2014-07-16 10:18:07 +10:00
hiker
cfed9fc44e
Try to use saucy repo for the opengl updates. Fingers crossed.
2014-07-16 10:01:24 +10:00
Marianne Gagnon
797dcf845e
Test converting code to home-brew Tuple so that STK compiles again on my mac, where clang does not include tuple
2014-07-15 19:48:34 -04:00
hiker
c386f48689
Try to fix travis ci by using a different version (quantal is not on the
...
ubuntu servers anymore).
2014-07-16 09:47:06 +10:00
hiker
a03d1df8dc
Fix linux compilation.
2014-07-16 09:35:59 +10:00
hiker
ec1b0ab9fc
Merge branch 'konstin-m_random_gp'
2014-07-16 08:19:24 +10:00
vlj
b79cebba40
Use singleton template again.
2014-07-16 00:16:57 +02:00
hiker
a8b2ad4f0a
Merge remote-tracking branch 'origin/master' into konstin-m_random_gp
2014-07-16 08:12:16 +10:00
hiker
649848cac2
Mostly cosmetic changes (renamed variables, added comments). Changed
...
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
2014-07-16 08:11:09 +10:00
konstin
ad641eff67
unify separators
2014-07-15 17:15:42 +02:00
konstin
0df72779a9
Use default laps for track info dialog
2014-07-15 17:10:37 +02:00
konstin
a7c6eb3853
close #1263
2014-07-15 15:57:33 +02:00
konstin
b8202b580d
Merge branch 'master' of https://github.com/supertuxkart/stk-code into laps
2014-07-15 15:46:23 +02:00
konstin
02f2488502
add default_number_of_laps
2014-07-15 15:46:17 +02:00
hiker
3684d22ef8
Try to fix linux compilation.
2014-07-15 16:09:57 +10:00
Marianne Gagnon
a3dbb53540
Minor code tweaks for the new feature unlocked scene
2014-07-14 21:39:11 -04:00
hiker
f24e53538c
Merge branch 'master' into konstin-m_random_gp
...
Conflicts:
src/states_screens/dialogs/gp_info_dialog.cpp
2014-07-15 11:07:44 +10:00
hiker
55df48d3e6
PLEASE UPDATE stk-assets! Moved data/models to stk-assets to help with
...
editor development.
2014-07-15 10:52:57 +10:00
vlj
82b5097391
Turn pass1 shaders to singleton template.
2014-07-15 02:43:27 +02:00
vlj
5e0fb8dcf7
Use the singleton template
2014-07-15 02:15:12 +02:00
hiker
a9d3ef0b78
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-07-15 09:13:00 +10:00
hiker
ccb8d0e973
Fix crash: a reference to a string in a widget was used after the
...
widget was deleted.
2014-07-15 09:10:54 +10:00
vlj
c06879a8b4
Fix animated transparent texture.
2014-07-15 00:03:33 +02:00
