Marianne Gagnon
|
f778f68649
|
Merge remote-tracking branch 'origin/master' into MaterialsRefactor
|
2014-05-19 20:37:44 -04:00 |
|
vlj
|
c79d96df69
|
Add lightviz to instanced node
|
2014-05-20 02:35:50 +02:00 |
|
vlj
|
c88d66a862
|
Add lightviz to spheremap
|
2014-05-20 02:35:49 +02:00 |
|
Marianne Gagnon
|
778649f182
|
More material work
|
2014-05-19 20:01:51 -04:00 |
|
Marianne Gagnon
|
6410cf8776
|
Start refactoring materials
|
2014-05-19 19:30:44 -04:00 |
|
vlj
|
3f1c85a897
|
Merge pull request #1336 from supertuxkart/shader-fix
Fix shader problems when UBO is disabled.
|
2014-05-20 00:19:02 +02:00 |
|
Stephen Just
|
493b7b7c69
|
Fix whitespace in glwrap.cpp
|
2014-05-19 10:02:35 -06:00 |
|
Stephen Just
|
0167e6d95a
|
Fix up whitespace in shaders.cpp
|
2014-05-19 09:59:13 -06:00 |
|
Stephen Just
|
f4992b80fc
|
Fix errors when compiling shaders with UBOs disabled
|
2014-05-19 09:57:31 -06:00 |
|
hiker
|
ebcce3da32
|
Avoid freeing potentially uninitialised variable.
|
2014-05-19 13:58:37 +10:00 |
|
hiker
|
9ae67f5c7a
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-05-19 12:36:17 +10:00 |
|
vlj
|
84235b6491
|
Fix attempt for intel mesa
|
2014-05-19 00:25:25 +02:00 |
|
vlj
|
42db6d2bba
|
Forget another change
|
2014-05-19 00:13:17 +02:00 |
|
vlj
|
6b8df482df
|
Forget a hunk
|
2014-05-19 00:06:38 +02:00 |
|
vlj
|
df70681574
|
Fix attempt for linux
|
2014-05-19 00:05:52 +02:00 |
|
vlj
|
33f19e55b8
|
Fix for shadows.
|
2014-05-18 23:47:52 +02:00 |
|
vlj
|
31487814fe
|
Fix compile
|
2014-05-18 23:28:39 +02:00 |
|
Vincent Lejeune
|
0ccac4c552
|
Forget to remove some unused shaders.
|
2014-05-18 19:59:03 +02:00 |
|
Vincent Lejeune
|
eca3999d52
|
Do some cleaning
|
2014-05-18 19:56:25 +02:00 |
|
Vincent Lejeune
|
bf71c2f71d
|
Factorize code drawing shadows.
|
2014-05-18 19:45:52 +02:00 |
|
Vincent Lejeune
|
838b44fc00
|
Remove Cautics effect
It's not used anywhere and I have no way to test it so it's useless.
|
2014-05-18 19:28:53 +02:00 |
|
hiker
|
2d4f2c5b28
|
Try to fix one more potential linux compilation problem.
|
2014-05-18 22:32:58 +10:00 |
|
hiker
|
c1194600c3
|
Try to fix my fix for linux compilation ;)
|
2014-05-18 22:09:04 +10:00 |
|
hiker
|
c9c3b289be
|
Try to fix linux compilations problems (apparently on some systems
Screen is defined, which then interferes with out Screen class).
|
2014-05-18 22:00:28 +10:00 |
|
Marianne Gagnon
|
f0e3ee8832
|
Fix kart shadow vs kart animation (for the main player only)
|
2014-05-17 21:57:06 -04:00 |
|
vlj
|
32b2359f21
|
Spheremap: Flip y and add light.
|
2014-05-18 03:39:53 +02:00 |
|
vlj
|
30f35cadde
|
Fix texture sampled by spheremap
|
2014-05-18 03:28:57 +02:00 |
|
vlj
|
a2e1724389
|
Use correct mapping for spheremap
|
2014-05-18 03:19:18 +02:00 |
|
vlj
|
dc7e6cb99f
|
Revert to spheremapped reflection
|
2014-05-18 03:01:24 +02:00 |
|
Marianne Gagnon
|
b91484a2ef
|
try to fix linux compilation
|
2014-05-17 19:29:59 -04:00 |
|
vlj
|
7fcd7a3301
|
Add a fake skybox where no skybox is available
For spheremap shaders
|
2014-05-17 17:26:51 +02:00 |
|
vlj
|
8673d36885
|
Merge branch 'fboencapsulate'
|
2014-05-17 17:05:31 +02:00 |
|
vlj
|
af34fa54e7
|
Fix displace effect.
|
2014-05-17 17:03:50 +02:00 |
|
Deve
|
b1395a8fe0
|
Install assets in data directory
|
2014-05-17 16:28:05 +02:00 |
|
Deve
|
4331a5c0a3
|
Few more checks for assets
|
2014-05-17 14:37:55 +02:00 |
|
hiker
|
4aa1fde07d
|
Don't show password field if player has a saved session.
If player changes online username, make password field visible again
and clear saved session data. In case of login problem, clear
saved session data.
|
2014-05-17 12:40:14 +10:00 |
|
hiker
|
40564534d2
|
Fixed callbacks in case of using the tabbed version of the UserScreen.
|
2014-05-17 12:17:19 +10:00 |
|
hiker
|
6f4579d55d
|
Only auto-login player if last time they played they were online.
|
2014-05-17 12:05:49 +10:00 |
|
hiker
|
1946df97be
|
Fixed start with no players (including aborting the create user screen),
added 'lastWasOnline' flag to enable saving of a login token even
when the account is used offline in between.
|
2014-05-17 11:43:05 +10:00 |
|
hiker
|
cf297c67b4
|
Fixed heading.
|
2014-05-17 11:40:16 +10:00 |
|
vlj
|
9c98012e09
|
Fix dof and transparent fog.
|
2014-05-17 03:09:21 +02:00 |
|
vlj
|
883b39591f
|
Width and height are passed by UBO
|
2014-05-17 02:39:55 +02:00 |
|
vlj
|
c465900ee3
|
Use rtt with fitting size.
|
2014-05-17 02:05:31 +02:00 |
|
Marianne Gagnon
|
4ff8b813fa
|
Create RTTs only when loading a track
|
2014-05-16 19:30:39 -04:00 |
|
vlj
|
12ecd4e58e
|
Attempt to fix travis ci
|
2014-05-17 00:56:16 +02:00 |
|
Vincent Lejeune
|
fef87b4853
|
Reenable splitscreen
|
2014-05-16 19:37:16 +02:00 |
|
Vincent Lejeune
|
a8a97d28ce
|
Move final blit to render.cpp
|
2014-05-16 19:28:15 +02:00 |
|
hiker
|
b38a31f303
|
Simplified handling of current player: instead of storing a flag
in each player, PlayerManager now just uses its m_current_player
to write this information in the players.xml file.
|
2014-05-16 15:39:33 +10:00 |
|
hiker
|
63b270283d
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-05-16 14:34:09 +10:00 |
|
hiker
|
c4ed2fbc7c
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-05-16 14:29:06 +10:00 |
|