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 |
|
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 |
|
vlj
|
098eb7f595
|
Port remaining pass 1 Instanced shaders to singleton
|
2014-07-14 23:25:52 +02:00 |
|
vlj
|
732aefc2dc
|
Turn instanced pass1 shader to singleton.
|
2014-07-14 23:14:20 +02:00 |
|
vlj
|
5838af5f3e
|
Remove useless function.
|
2014-07-14 23:13:33 +02:00 |
|
Vincent Lejeune
|
e310ad5628
|
Move skybox/lights code out of render.cpp
|
2014-07-14 19:44:11 +02:00 |
|
Vincent Lejeune
|
62bf54b8f3
|
Simplify displace handling
Should be faster now
|
2014-07-14 18:54:40 +02:00 |
|
Vincent Lejeune
|
d52d1c0409
|
oops
|
2014-07-14 18:52:41 +02:00 |
|
Vincent Lejeune
|
160d8c1634
|
Fix linux build
|
2014-07-14 18:51:01 +02:00 |
|
Vincent Lejeune
|
d035b86bc4
|
Turn displace shaders into singleton.
|
2014-07-14 18:42:19 +02:00 |
|
hiker
|
ab57903f9f
|
Try to convert m_gp from a GPData pointer to a GP object, compiles, but
crashes.
|
2014-07-14 23:08:46 +10:00 |
|
hiker
|
f24a000f78
|
Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp
|
2014-07-14 14:54:59 +10:00 |
|
hiker
|
1350cc5985
|
Applied fix from b69a1d225a
to fix wiiuse compilation (esp. on travis-ci); enabled WIIUSE by default to test.
|
2014-07-14 14:21:02 +10:00 |
|
vlj
|
db4457655b
|
Fix for real torch in chocolate.
|
2014-07-14 03:00:46 +02:00 |
|
vlj
|
b186bc7f18
|
Try to fix chocolate torch displaced effect.
|
2014-07-14 02:25:04 +02:00 |
|
vlj
|
f1ddf87a5f
|
Plugin displacement material.
|
2014-07-14 02:25:03 +02:00 |
|
Marianne Gagnon
|
f00c55850a
|
Remove old way of doing displacing, turn into a flag in STKMesh. Does not compile, vlj will do the rest
|
2014-07-14 02:25:03 +02:00 |
|
Marianne Gagnon
|
b456205b56
|
Another attempt at fixing kart selection screen, hopefully the right one
|
2014-07-13 19:48:13 -04:00 |
|
Marianne Gagnon
|
2be5c99d47
|
fix assertion failure on kart selection screen caused by manipulating variables directly instead of using the appropriate methods
|
2014-07-13 19:08:07 -04:00 |
|
vlj
|
d0f6e54bba
|
Add a isDisplacement bool
|
2014-07-14 00:35:23 +02:00 |
|
Marianne Gagnon
|
415a502ef1
|
As requested by vlj, move singleton from networking to utils
|
2014-07-13 18:03:26 -04:00 |
|
Vincent Lejeune
|
4e1fd9b4af
|
Move geometry rendering code to another file.
|
2014-07-13 21:49:25 +02:00 |
|
Vincent Lejeune
|
f2acac7230
|
Inadverly inverted shadow and shadow_grass.vert
|
2014-07-13 21:37:12 +02:00 |
|
Vincent Lejeune
|
54b1ce39e4
|
Add Grass shadows.
For non instancing object.
|
2014-07-13 21:33:44 +02:00 |
|
Vincent Lejeune
|
b2fc9eb682
|
Turn shadow shaders into singletons.
|
2014-07-13 21:08:49 +02:00 |
|
konstin
|
872413ba91
|
clean code
|
2014-07-13 19:45:10 +02:00 |
|
Vincent Lejeune
|
7b9fc60f9c
|
Factorise grass material
|
2014-07-13 18:56:17 +02:00 |
|
Vincent Lejeune
|
adba84969e
|
Remove unneeded templates
|
2014-07-13 17:58:51 +02:00 |
|
Vincent Lejeune
|
67ab653aa0
|
Wrap setUniformsHelper inside a struct
|
2014-07-13 17:58:39 +02:00 |
|