Arthur-D
8e38f4ca30
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-06 22:39:48 +02:00
Deve
a4ac9f95c2
Use length limit for text only if it's needed.
...
This check is IMO not needed at all because translators will see if text fit in available area or not. But anyway this length should be large enough.
2014-10-06 21:57:25 +02:00
vlj
f828edb445
Fix crash with plunger
2014-10-06 20:51:04 +02:00
Deve
d270a7b80f
Merge pull request #1603 from Flakebi/fix
...
Fix #1438
2014-10-06 18:41:47 +02:00
hiker
8f7515bdbf
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-06 22:09:03 +11:00
hiker
1c7a9229f2
Added OS version for windows and distro-version for linux (not fully tested).
2014-10-06 22:08:28 +11:00
vlj
b10f1a3ef2
Tweak envmap
2014-10-06 02:29:18 +02:00
vlj
c7b98c4e6c
Emulate envmap specular reflexion
2014-10-06 02:19:21 +02:00
hiker
cb40f68229
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-06 09:07:34 +11:00
hiker
a459328676
Fix display of notifications.
2014-10-06 09:01:31 +11:00
hiker
6f5b7aa4ae
Tried a different layout for the checkboxes (sorry, but I didn't like the
...
previous approach at all). Only disadvantage now (I can think of) is that
the width of the lables is now hard coded to 40% of the screen.
2014-10-06 07:48:15 +11:00
Vincent Lejeune
44792a1490
Fix splatting
2014-10-05 22:46:02 +02:00
Vincent Lejeune
4bb73e0573
Fix godray opacity
2014-10-05 22:23:10 +02:00
Vincent Lejeune
9394f275cd
Merge branch 'specmap'
2014-10-05 21:56:10 +02:00
Vincent Lejeune
019db1a11d
Revert "Revert "Prepare shader for specmap value""
...
This reverts commit 780482edba
2014-10-05 21:56:04 +02:00
Vincent Lejeune
0db951f374
Try to emulate enery conservation
2014-10-05 21:53:06 +02:00
Vincent Lejeune
300a09746f
Additionnal fixes
2014-10-05 21:45:56 +02:00
Vincent Lejeune
4c4aba2ad8
Some fixes
2014-10-05 21:33:11 +02:00
Flakebi
297221ca3d
Fix #1438
2014-10-05 21:32:14 +02:00
Vincent Lejeune
a8161288a9
Convert remaining shaders
2014-10-05 20:47:13 +02:00
Vincent Lejeune
9f2b66d195
Use specmap on others mats
2014-10-05 20:37:49 +02:00
Flakebi
f95eeb7f56
Fix #1602
2014-10-05 15:11:45 +02:00
hiker
2730c3c026
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-05 21:37:42 +11:00
hiker
df62c8921e
Added limited lazy-load flag to avoid loading of all font textures
...
(most of which might not be needed). Fixes #1592 .
2014-10-05 21:35:14 +11:00
Vincent Lejeune
780482edba
Revert "Prepare shader for specmap value"
...
This reverts commit 88954a5d88
2014-10-05 02:30:15 +02:00
Vincent Lejeune
0121ae8db6
Use specmap value
2014-10-05 02:30:01 +02:00
Vincent Lejeune
88954a5d88
Prepare shader for specmap value
2014-10-05 02:12:04 +02:00
Marianne Gagnon
83b25768cc
tweak players screen, checkbox placement was weird
2014-10-04 19:44:04 -04:00
Marianne Gagnon
c1d6c054c8
Route a few more controls rendering through the skin, to make them use OpenGL 3
2014-10-04 19:38:44 -04:00
Marianne Gagnon
5a07fd0fa4
FIx crash in LOD
2014-10-04 19:05:27 -04:00
Deve
78b21eb840
Fixed visibility parameter for icon button widget.
...
It was set for widget but not for irrlicht gui element.
2014-10-04 21:51:08 +02:00
hiker
f63e7d93b8
Fixed #1598 (error message about font texture not found).
2014-10-04 23:32:54 +10:00
Marc Coll Carrillo
ee49604856
Issue #1588
...
Fixed crashes in track info screen
2014-10-04 12:15:11 +02:00
Vincent Lejeune
b56901bacd
Fix minimap halo second time it is rendered.
2014-10-04 01:42:25 +02:00
Vincent Lejeune
3a1b2442e8
Revert "Try to cull object whose aera is below 1 px"
...
This reverts commit 83053e0ee4
2014-10-04 00:59:37 +02:00
Marianne Gagnon
8033c5a839
Don't set animation strength on speed weighted objects, it's probably unnecessary and produces weird artifacts
2014-10-03 18:39:07 -04:00
Marc Coll Carrillo
f520e38cd5
This will (hopefully) solve the memory leaks in dynamic ribbons and image button widgets
2014-10-03 22:11:21 +02:00
Marc Coll Carrillo
cc41327db3
Merge remote-tracking branch 'upstream/master'
2014-10-03 18:15:28 +02:00
hiker
ab252a306d
Try to avoid graphical kart chassis being partially in ground (still not
...
perfect).
2014-10-04 00:39:32 +10:00
Marc Coll Carrillo
3fc0d3be09
Second try of my previous pull request, which was partially reverted due to caused crashes and memory leaks
2014-10-03 16:25:19 +02:00
Arthur-D
45c9e4fcac
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-03 11:11:30 +02:00
hiker
b5a85ae100
Fixed typo in xml output.
2014-10-03 16:48:47 +10:00
hiker
9f5b2fbc91
Added a 'print start position' option, which prints a line that can
...
be copied into a scene.xml file to start a kart at the current
position (which is useful to testing to avoid long races before
a location to be tested is reached).
2014-10-03 08:58:28 +10:00
hiker
15307f5e91
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-03 08:56:02 +10:00
Marianne Gagnon
22a884828a
Use unlit material for minimap, to avoid dark minimap segments
2014-10-02 18:52:17 -04:00
hiker
e4e91bf25a
Only cosmetical changes to follow our coding style.
2014-10-03 08:18:31 +10:00
Deve
ce51824d47
Redraw GP info screen when number of oponents was changed.
...
This allows to show or hide "Continue" button without opening screen once again.
2014-10-02 21:56:46 +02:00
Deve
69217bd03c
Grr, wrong file.
...
Fixed continue GPs
2014-10-02 20:21:46 +02:00
Deve
fccac9ed3c
Revert "Fixed continue GPs"
...
This reverts commit 710f7e7296
2014-10-02 20:20:50 +02:00
Deve
710f7e7296
Fixed continue GPs
2014-10-02 20:19:15 +02:00
