Commit Graph

11660 Commits

Author SHA1 Message Date
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
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
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
c4ed2fbc7c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-16 14:29:06 +10:00
hiker
fd0b017b5f Fixed compiler warnings (m_ssao is bool, not int). 2014-05-16 14:28:12 +10:00
Marianne Gagnon
b049acb81d Make STKMeshSceneNode destructor virtual, as it should 2014-05-15 21:17:01 -04:00
hiker
94457e7a53 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-16 09:56:19 +10:00
hiker
7544850012 Merge branch 'solistice-properties' 2014-05-16 09:55:50 +10:00
hiker
636f34160a Finished using Log:: instead of printf, removed separate 'profile'
level, instead use 'profile' as component.
2014-05-16 09:54:32 +10:00
Marianne Gagnon
2b7dc07cda Fix crash-on-second-load bug 2014-05-15 19:41:44 -04:00
vlj
ecca6911d1 Encapsulate fbos in a class 2014-05-16 00:37:26 +02:00
Bart Cools
61d9b7a0ea Output of logging profile tests changed to the stdout.log instead of standard output. type of output also changed to space separated values instead of tsv 2014-05-15 18:30:16 +02:00
hiker
f4a5949198 Fixed invalid memory read (thanks to valgrind). 2014-05-15 15:37:23 +10:00
hiker
cc03578056 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-15 12:41:35 +10:00
hiker
a3c01a6b2a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-15 11:17:36 +10:00
hiker
d3f6aa5e52 Fixed some memory problems reported by valgrind. 2014-05-15 11:17:05 +10:00
Marianne Gagnon
78d8199de8 disable crash reporter in debug mode 2014-05-14 20:10:23 -04:00
Marianne Gagnon
aae7d01e57 Try to make the custom GUI settings popup work on any resolution 2014-05-14 19:29:39 -04:00
hiker
717a989bf8 Fixed --profile-laps command line parameter. 2014-05-15 09:08:18 +10:00
hiker
5966cefed9 Merge pull request #1325 from solistice/properties
small patch for --no-graphics mode and small bug fix
2014-05-15 08:42:31 +10:00
Bart Cools
f521ba0242 fix issue #1328 2014-05-14 17:57:22 +02:00