Flakebi
a84094e55e
Add difficulty to karts
2014-07-29 22:54:42 +02:00
Flakebi
bcf7690809
Ignore vim swap files
2014-07-29 16:26:49 +02:00
Flakebi
71f8766cb1
Add per-player difficulty
2014-07-28 18:32:39 +02:00
Flakebi
bfd54cf37c
Split kart selection screen into more files
2014-07-23 22:08:22 +02:00
Flakebi
4fe34007cd
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-07-23 15:18:46 +02:00
Flakebi
0195d95bad
Adding basic gui for per-player difficulties
2014-07-23 15:18:40 +02:00
hiker
9fa93d74d5
Fixed linux compilation.
2014-07-23 22:11:37 +10:00
Marianne Gagnon
06e4cbb9be
Fix input config screen, since the list widget was improved it didn't display quite right
2014-07-22 20:09:38 -04:00
Flakebi
55090a0566
Unify log output
2014-07-22 12:54:11 +02:00
Flakebi
53fd34f7b8
Fix issues with in-game screens
2014-07-22 12:54:11 +02:00
Flakebi
a9a46a2dd6
Some little fixes
2014-07-22 12:54:10 +02:00
Marianne Gagnon
fff498b9fe
Improve graphics settings dialog to try to avoid mutually incompatible options
2014-07-21 19:58:45 -04:00
Marianne Gagnon
b2fab2ae6d
Fix glitch where the irrlicht dialog close button would be slightly visible in the corner of a STK dialog, and a crash would ensue if you clicked it
2014-07-21 19:55:02 -04:00
Deve
bb4381a0a7
Merge pull request #1414 from konstin/fontsize
...
fix #1410 + better text alingment in GP info dialog
2014-07-18 21:02:35 +02:00
konstin
7a8743fb65
better text alingment in GP info dialog
2014-07-18 16:03:23 +02:00
konstin
0a93b7a2d3
fix #1410
2014-07-18 15:58:34 +02:00
Marianne Gagnon
00ae12677a
Fix GUI crashes when exiting STK by clicking the X button in the window titlebar
2014-07-17 19:24:35 -04:00
Flakebi
a77778b1cd
Display skill labels only once
2014-07-17 21:33:25 +02: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
vlj
f5a5988967
Fix instanced and reenable displace.
2014-07-17 00:24:09 +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
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
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
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
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
vlj
9230cab9dd
Add shadow for instanced grass.
2014-07-15 00:02:17 +02:00
vlj
146e99b13d
Port instanced shadow shaders to singleton.
2014-07-14 23:49:00 +02:00
vlj
ffe77e4aa4
Port instanced pass2 shaders to singleton
2014-07-14 23:41:47 +02:00
