Vincent Lejeune
ef5039c02f
Apply patch from http://sourceforge.net/p/glew/patches/40/
2014-09-16 16:05:24 +02:00
Vincent Lejeune
1f383245d6
Merge branch 'master-fix'
2014-09-16 15:34:39 +02:00
Vincent Lejeune
58fc801322
Slightly extend coverage of ssao cs
2014-09-16 15:18:29 +02:00
Vincent Lejeune
b769e46a00
Use texture instead of image in SSAO.
2014-09-16 15:18:29 +02:00
hiker
e4fd6ed32b
Merge remote-tracking branch 'origin/master'
2014-09-16 22:27:55 +10:00
hiker
9cdbaebd29
Started to add hardware stats reporting functionality.
2014-09-16 22:27:41 +10:00
hiker
e8aa181348
Merge remote-tracking branch 'origin/master' into include-glew
2014-09-16 11:05:35 +10:00
Vincent Lejeune
546cbabf3e
Use ifdef WIN32 for test purpose
2014-09-16 01:14:45 +02:00
Vincent Lejeune
4c6df4821d
Revert "Do not allow specvalue to be below 0."
...
This reverts commit 6b4430caaa
.
2014-09-16 00:37:49 +02:00
Vincent Lejeune
fbb71bca7e
Revert "Fix negative value inside tonemap"
...
This reverts commit 16dc973faa
.
2014-09-16 00:37:37 +02:00
Vincent Lejeune
b5598fda57
Revert "Force non negative value in bloom"
...
This reverts commit cb922ed4db
.
2014-09-16 00:37:23 +02:00
Vincent Lejeune
45b15c1d65
Add some memory barrier when using compute shaders
2014-09-16 00:34:23 +02:00
Vincent Lejeune
bd4602fb5d
Fix context creation on linux when driver support gl 4.3
2014-09-15 23:39:48 +02:00
vlj
cb922ed4db
Force non negative value in bloom
2014-09-15 22:11:53 +02:00
hiker
8029bc5880
Build a static version of glew.
2014-09-15 21:49:06 +10:00
hiker
69473b1811
Try to include glew in stk.
2014-09-15 16:33:46 +10:00
hiker
8dfe72f73f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-15 12:41:34 +10:00
Marianne Gagnon
835b329c46
kart selection screen : don't reload RTT scene if the selected kart hasn't changed
2014-09-14 19:16:06 -04:00
Vincent Lejeune
16dc973faa
Fix negative value inside tonemap
...
It should be checked before but since it's not always reproducible.
2014-09-15 01:10:12 +02:00
Marianne Gagnon
05d43440b2
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-14 19:07:00 -04:00
Marianne Gagnon
3536e13c49
Tweak fade-in/fade-out times in cutscenes and remove hardcoded values
2014-09-14 19:06:19 -04:00
Vincent Lejeune
6b4430caaa
Do not allow specvalue to be below 0.
...
Just in case it shouldnt be possible anyway.
2014-09-15 01:06:15 +02:00
Vincent Lejeune
0d982e55f0
Do not use kart position if there is no kart
2014-09-15 00:42:48 +02:00
Vincent Lejeune
866cd2b979
Set texture matrix in updateNoGL and not in updateGL
2014-09-15 00:16:50 +02:00
hiker
e26e10db61
Fixed compilation of font_tool.
2014-09-15 07:45:13 +10:00
Vincent Lejeune
476f95a6c9
Fix snb on linux
2014-09-14 23:41:42 +02:00
Vincent Lejeune
7c54ac4d81
Fix second texcoord in instanced_object_pass.vert
2014-09-14 23:07:10 +02:00
Vincent Lejeune
cd68be24f5
Delete sync object
2014-09-14 17:35:16 +02:00
Deve
0eb09af027
Filtering actions is not needed now
2014-09-14 17:08:40 +02:00
Deve
8ea38fe622
Block event for one-element ribbon widget in the same way as multi-element widget.
...
This fixes problem with pressing left and right arrow in track and GP info screen.
2014-09-14 17:06:21 +02:00
vlj
26b69ecace
Use __linux__ macro
2014-09-13 23:35:15 +02:00
vlj
108215dfdd
Add a dtor to animated mesh
2014-09-13 15:57:39 +02:00
vlj
6d685a843d
Drop support for GL 3.1 on windows
...
Fixed pipeline will be used instead
2014-09-13 15:45:10 +02:00
Marc Coll Carrillo
5cf3ad220f
Some improvements to the GP editor:
...
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
- allow empty GPs to be loaded by the GP manager, so that they can appear
on the GP editor (but not on the track selection screen)
- enable/disable buttons depending on the available options
- provide some feedback after pushing the "save" button
- some minor bug corrections and improvements
2014-09-13 10:40:27 +02:00
Vincent Lejeune
1d913ad5b4
Do not set glewExperimental outside of linux
2014-09-13 02:02:05 +02:00
Vincent Lejeune
349a64ae8d
Revert "Use a parallel loop for IA"
...
This reverts commit 8e333afa99
.
2014-09-13 01:32:40 +02:00
Vincent Lejeune
674f0a5f05
Reenable billboards
2014-09-13 01:21:09 +02:00
Vincent Lejeune
d480c52f8c
Revert "Try to put IA in its own thread"
...
This reverts commit 2a60a84155
.
2014-09-12 23:22:54 +02:00
Vincent Lejeune
2a60a84155
Try to put IA in its own thread
2014-09-12 23:04:40 +02:00
Vincent Lejeune
78e512880c
Remove unneeded functions
2014-09-12 19:29:01 +02:00
Vincent Lejeune
8e333afa99
Use a parallel loop for IA
...
It sighltly helps decreasing stuttering in some area of chocolate.
2014-09-12 19:10:22 +02:00
hiker
c4b6307ec9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-13 01:24:17 +10:00
Vincent Lejeune
9453541006
Merge remote-tracking branch 'origin/master-fix'
2014-09-12 17:22:59 +02:00
hiker
991f60d06d
Select 'start' as default in gp info screen.
2014-09-13 00:58:30 +10:00
deve
cca078dbae
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-12 09:03:27 +02:00
deve
e6ab299f37
Fixed mingw compilation
2014-09-12 09:01:35 +02:00
vlj
0b0fabc7bb
Try to merge all MeshFor_Pass
2014-09-12 02:58:13 +02:00
vlj
503ecbb6f1
Some fixes to ligthshaft
2014-09-12 02:27:48 +02:00
Vincent Lejeune
6f65874ab2
Try to disable openMP at runtime
2014-09-12 01:12:55 +02:00
Vincent Lejeune
53fe339fb3
Enable simple culling for non indirect codepath
2014-09-12 01:07:02 +02:00