ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,934 Commits 9 Branches 28 Tags 433 MiB
2eb0f151b7
Commit Graph

2612 Commits

Author SHA1 Message Date
Vincent Lejeune
7aa7e2d148 Factorise sun color/position 2014-12-15 23:09:19 +01:00
Deve
2995051f7c Merge pull request #1779 from math07/working 
When entering gp_name, display buttons vertically to allows gamepad
 2014-12-15 12:17:00 +01:00
hiker
3fa8625c78 Fixed incorrect icon name. 2014-12-15 17:10:34 +11:00
Vincent Lejeune
03694d9c7c Factorise SH coefficient in an UBO 2014-12-15 00:18:03 +01:00
Vincent Lejeune
4b2abef56c Remove redondant uniform in IBL 2014-12-14 21:55:15 +01:00
Vincent Lejeune
1732b1cfef Clean up sunlight shader + factorize diffusebrdf 2014-12-14 21:39:18 +01:00
Vincent Lejeune
d50dde4c97 Revert "Try to fix ibl precision issue" 
This reverts commit 1cf592394b.
 2014-12-14 02:48:47 +01:00
Vincent Lejeune
1cf592394b Try to fix ibl precision issue 2014-12-13 22:35:46 +01:00
Vincent Lejeune
7872bc7860 Fix image format for bilateral blur 2014-12-13 22:28:16 +01:00
Mathieu Laprise
15927f319c When entering gp_name, display buttons vertically to allows gamepad selection 2014-12-12 20:19:27 -05:00
hiker
ba990318d1 Merge remote-tracking branch 'origin/master' into new_server 2014-12-13 10:49:45 +11:00
Marianne Gagnon
72a02128de Fix gand prix 2014-12-11 20:20:42 -05:00
Marianne Gagnon
9b3b99610a MInor GUI XML cleanup 2014-12-11 19:39:30 -05:00
Marianne Gagnon
334cca21ad Merge branch 'Math07_master' 2014-12-10 21:06:09 -05:00
Marianne Gagnon
7cc28a9755 Revert "Friends Search bar goes off the bottom of the screen #1762" 
This reverts commit f98a169e9c.
 2014-12-10 21:04:57 -05:00
Vincent Lejeune
1c05d9ef68 Port colored lines too 2014-12-11 01:44:58 +01:00
Vincent Lejeune
db6600a687 Frustrum shader is updated to new system 2014-12-11 01:19:17 +01:00
hiker
c0c4357331 Switch from IP address to addons.supertuxkart.net (including new 
certificate).
 2014-12-10 23:53:47 +11:00
samuncle
cb8017cae1 clamping values to avoid pink specularity 2014-12-10 03:02:36 +01:00
hiker
83f49ec319 Merge remote-tracking branch 'origin/master' into new_server 
Conflicts:
	src/online/http_request.cpp
 2014-12-10 11:25:16 +11:00
Vincent Lejeune
a8ce996047 Revert "Simplify sunlight shadow shader." 
This reverts commit cc7f95163c.
 2014-12-09 21:20:55 +01:00
Vincent Lejeune
cc7f95163c Simplify sunlight shadow shader. 2014-12-09 19:00:21 +01:00
Vincent Lejeune
c91c04c862 Same for shadow blur pass 2014-12-09 18:54:27 +01:00
Vincent Lejeune
b24fd621a5 Precompute coefficient in gaussian blur pass 2014-12-09 18:43:48 +01:00
Vincent Lejeune
d97b9f2d0e Clamp SpecularIBL value on positive range 2014-12-09 01:33:58 +01:00
Vincent Lejeune
2667791621 Tweak IBL 2014-12-08 19:36:23 +01:00
Vincent Lejeune
72fdf816e7 Fix Importance sampling 2014-12-08 19:16:26 +01:00
Vincent Lejeune
2b0680d92d Use texture buffer instead of uniform for samples 
Should fix nvidia glsl error
 2014-12-08 18:24:43 +01:00
Vincent Lejeune
6041c48fbe Source DiffuseIBL algorithm 2014-12-07 21:37:16 +01:00
Vincent Lejeune
a320eebece Cleanup tonemap shader 2014-12-07 21:27:26 +01:00
Vincent Lejeune
a094bbae19 Factorize DiffuseIBL and SpecularIBL 2014-12-07 19:10:22 +01:00
Vincent Lejeune
e491422bdc Weight sample in importance sampling 2014-12-07 18:26:51 +01:00
Mathieu Laprise
f98a169e9c Friends Search bar goes off the bottom of the screen #1762 2014-12-06 17:28:02 -05:00
Mathieu Laprise
107e434fe9 Missing button in grand prix editor name dialog #1765 2014-12-06 15:14:27 -05:00
auria
d3ba1ca283 Update strings 2014-12-05 19:26:09 -05:00
Marianne Gagnon
f05618b3b9 Add possibility to specify non-translated texts in GUI XML files, and use it for debug strings that should not be translated 2014-12-05 19:17:52 -05:00
Vincent Lejeune
1e2656dc88 Use clamp instead of max(0, dot(normalized, normalized)) 
Should help GLSL compiler to optimize them.
 2014-12-05 17:51:18 +01:00
Vincent Lejeune
8f3b8cf448 Implement specular IBL properly 2014-12-05 16:42:49 +01:00
hiker
48593534a5 Added certificate for our vps. 2014-12-05 13:57:27 +11:00
Vincent Lejeune
4079c18050 Update graphic restriction 
This should fix bug #1519
 2014-12-05 01:38:54 +01:00
Vincent Lejeune
fd2da4085b Rename some shader to improve their meaning 2014-12-05 00:20:16 +01:00
Vincent Lejeune
23b781e7dd Move glossmap formula to getspecular shader 2014-12-05 00:09:15 +01:00
hiker
645f01a508 Removed 'can use existing stkaddons' account from message. 2014-12-04 16:24:14 +11:00
Marianne Gagnon
35f55c19a1 Tweak jungle challenge to use Cocoa Temple and a slightly adjusted time 2014-12-01 18:42:46 -05:00
samuncle
3627719440 min max where inverted 2014-12-01 23:54:34 +01:00
Vincent Lejeune
354dad7392 Fix an error when indirect instancing is not supported 2014-12-01 01:46:50 +01:00
hiker
020c129691 Specify the replay buffer size as time value (i.e. how many seconds), 
not how many frames.
 2014-11-27 16:15:53 +11:00
hiker
ea3a433147 Fix #1620 (Player's achievements can only be seen when logged in). 2014-11-25 17:12:47 +11:00
hiker
ebfbf5e2aa Updated pot file (just to check launchpad integration, no string freeze yet). 2014-11-25 15:05:51 +11:00
Marianne Gagnon
cd7bc96d68 Fix invalid snow particles XML file that would cause assertion failures 2014-11-24 18:31:38 -05:00
samuncle
82b8548066 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-11-24 21:10:08 +01:00
samuncle
92801f2b74 Tweak the snow 2014-11-24 20:23:55 +01:00
Deve
54b311f6f7 Allow to set custom ratio for images from xml file. 
It avoids crashes and memory leaks after changing resolution.
 2014-11-24 19:31:46 +01:00
Marianne Gagnon
5d5460d845 Add way to test intro cutscene easily; do not throttle sound effects on cutscenes 2014-11-22 18:21:31 -05:00
samuncle
91736e1941 Add the support for emit map. For the moment it's only for solid objects 2014-11-22 15:59:22 +01:00
Vincent Lejeune
d426a395bb Use old formula for glossmap 2014-11-22 02:03:20 +01:00
Vincent Lejeune
f3a637fb99 Fix sun area light 2014-11-21 02:44:27 +01:00
Vincent Lejeune
79e5e9f880 Revert "Use f0 in fresnel schlick" 
This reverts commit acdafc5566.
 2014-11-21 02:09:02 +01:00
Vincent Lejeune
593f462ec5 Revert "Use color for specular" 
This reverts commit fcba1dab86.
 2014-11-21 02:09:00 +01:00
Vincent Lejeune
4a8afd2d40 Implement sun as an disk area light. 
Solid angle is defaulted to sun's one.
 2014-11-21 01:54:30 +01:00
Vincent Lejeune
fcba1dab86 Use color for specular 2014-11-20 22:57:32 +01:00
Vincent Lejeune
acdafc5566 Use f0 in fresnel schlick 2014-11-20 22:51:22 +01:00
Vincent Lejeune
bcd3452b70 Remove bubble shaders 2014-11-20 22:05:19 +01:00
Vincent Lejeune
a78b889b05 Modelise Beer Lambert absorption for fog 2014-11-20 21:23:33 +01:00
Vincent Lejeune
c594295288 Tweak shadow blur 2014-11-18 03:44:45 +01:00
Flakebi
4ab84a6b83 Unify I18N attributes in screens 2014-11-17 00:08:47 +01:00
Marianne Gagnon
d8b0f79428 Tweak register script so that the "Online" checkbox is closer to the text 2014-11-15 18:38:51 -05:00
Vincent Lejeune
c2859d24ce Improved shadow stability 2014-11-15 21:27:15 +01:00
Vincent Lejeune
448f254a2b Fixes 2014-11-15 21:02:24 +01:00
Vincent Lejeune
a7b8ba13cd Add shader content 2014-11-15 20:43:44 +01:00
Vincent Lejeune
7e3c2c4897 Add a shader to blur shadow 2014-11-15 20:37:47 +01:00
Vincent Lejeune
687bb6e065 Spare a few lds inst 2014-11-15 19:18:07 +01:00
Vincent Lejeune
3c42223add Try graphical restrictions on nvidia old drivers 2014-11-15 03:10:23 +01:00
Vincent Lejeune
6cc721eaf9 Use CS for gaussian6 2014-11-15 01:11:26 +01:00
hiker
2ec5c3765a Added a config file which can be used to disable certain graphical 
options dependeing on card, os, driver version.
 2014-11-15 10:06:54 +11:00
Marianne Gagnon
c6651489c1 Tweak nitro for new engine 2014-11-13 19:24:15 -05:00
Deve
5c32aa8baa Minor modifications for skidding and nitro. 
Still could be better, I'm not an artist ;p
 2014-11-13 19:24:53 +01:00
samuncle
bd9823dbbe Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-11-13 18:02:49 +01:00
samuncle
ffb76788a9 Minor tweak with transluscent material 2014-11-13 18:02:25 +01:00
hiker
22b6aaea25 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-13 22:47:05 +11:00
hiker
753c3d7168 Fixed #1638 (text overflows behind buttons) - partially by removing 
the confirmation field for the emal address.
 2014-11-13 22:42:32 +11:00
Deve
c1fd2d3614 Fixed skidding and nitro particles. 
Not perfect but at least working.
 2014-11-12 22:20:33 +01:00
Deve
91d26e92ef A bit better rain. 2014-11-12 16:31:41 +01:00
hiker
25b4d35a65 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code 2014-11-12 15:45:03 +11:00
hiker
28db99b7c1 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-12 12:26:00 +11:00
hiker
4b01d090c6 Fixed track name for GP. 2014-11-12 12:25:33 +11:00
samuncle
1bd3ee24c6 Add a description to the shader 2014-11-12 01:22:33 +01:00
samuncle
f39ae90b6e merge with trunk + try to adapt to the new blur system 2014-11-12 00:08:21 +01:00
Vincent Lejeune
192ed8a486 Fix classic fog 2014-11-11 22:43:25 +01:00
Vincent Lejeune
09fa1ee3cb Implement scattering for point light 2014-11-11 22:36:27 +01:00
Vincent Lejeune
bd4fe57524 Use fog start value to determine density 2014-11-11 21:52:54 +01:00
Vincent Lejeune
84affec451 Change fog equation 2014-11-10 22:08:12 +01:00
Vincent Lejeune
85bbc0f8b8 Use variable sigma for blur filter 2014-11-10 21:32:04 +01:00
samuncle
d0caeb3b63 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare 2014-11-10 06:51:10 +01:00
hiker
8dff64644a Fixed #1687 (time too long when using many karts in ftl)> 2014-11-10 16:49:13 +11:00
samuncle
e20d8bdcdf Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare 
Keep lens flare updated with trunk
 2014-11-08 01:51:40 +01:00
hiker
5401e7f3b7 First try to prevent #1566: kart chassis appears inside of terrain. 2014-11-08 11:43:06 +11:00
Vincent Lejeune
04d313671c Fix sqrt(int) in diffuseenvmap 2014-11-08 01:02:46 +01:00
Vincent Lejeune
5eefe0c0ad Make envmap reflexion less blurry 2014-11-08 00:57:49 +01:00
samuncle
2a440bb2cb minor modification to the blueish mood of lens flare 2014-11-07 16:20:39 +01:00
samuncle
1e547652f7 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare 
Keep lens flare updated with master
 2014-11-07 16:14:11 +01:00
Vincent Lejeune
d7f3198ac9 Merge branch 'sdsm' 2014-11-07 13:42:29 +01:00
Vincent Lejeune
909948c9a4 Implement depth histogram to position cascade split 2014-11-07 13:42:13 +01:00
Vincent Lejeune
cacb008ae6 Prepare compute shader to stretch lightcoord 2014-11-07 13:42:13 +01:00
hiker
cfb4dc13a8 Updated GP for new mines track. 2014-11-05 13:39:57 +11:00
Flakebi
9dd86c8332 Don't handicap AIs 2014-11-04 23:57:33 +01:00
Flakebi
5a84b471e4 Add 'handicapped' to player name 2014-11-04 23:36:16 +01:00
samuncle
52bc4cebd4 Add the lensflare shader 2014-11-04 21:15:18 +01:00
Vincent Lejeune
92ecd01e61 Make cascade split modifiable 2014-11-04 20:53:32 +01:00
samuncle
d7caebe847 enable vignette during races 2014-11-03 21:53:44 +01:00
hiker
dec5ac8aa2 Fixed several xml errors (unclosed <space> tags). 2014-11-03 15:25:39 +11:00
Vincent Lejeune
17aafae42c Merge remote-tracking branch 'origin/esm' 2014-11-03 01:02:27 +01:00
hiker
841ae8814e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-03 08:56:19 +11:00
hiker
62b81b3e9a Shortened labels to fit on smaller screens. 2014-11-03 08:23:35 +11:00
hiker
0be0d7ee72 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code into Flakebi-perPlayerDifficulties 2014-11-03 06:52:31 +11:00
Vincent Lejeune
ddecd23472 Tweak values 2014-11-02 19:07:02 +01:00
Vincent Lejeune
ebe11370a2 Reenable bluring 2014-11-02 16:30:44 +01:00
Vincent Lejeune
c5186e3ab3 Use depth in exp space 2014-11-02 16:26:46 +01:00
Vincent Lejeune
b975b63eea Use proper depth linear value 2014-11-02 16:00:41 +01:00
Vincent Lejeune
f5a44c0a19 Take more sample 2014-11-02 02:42:44 +01:00
Vincent Lejeune
9113aa7a39 Implement Exponential Shadow map 2014-11-02 02:36:10 +01:00
Vincent Lejeune
7679213e26 Use exp algorithm for the gaussian blur 2014-11-02 02:35:02 +01:00
Vincent Lejeune
6aed902ae0 Store depth in color buffer instead of depth 
This allows for instance to blur it using already existing shaders
 2014-11-01 22:38:38 +01:00
Flakebi
9ca1c03480 Applying merges correctly is difficult... 2014-10-31 18:54:52 +01:00
Flakebi
abf7bacfea Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/graphics/stkmesh.cpp
	src/states_screens/kart_selection.cpp
 2014-10-31 16:47:34 +01:00
Vincent Lejeune
ee687440c7 Increase shadow filtering 2014-10-29 18:57:39 +01:00
Marianne Gagnon
bf0f75a367 Fix (again) initial scattering of now so that it falls evenly 2014-10-28 19:06:29 -04:00
Arthur-D
6c0ace85ee Slight improvement on notification backgrounds. Feedback welcome. 2014-10-28 07:16:29 +01:00
Flakebi
f27597c450 Revert "Fix incorrect alignment in spinner widgets" 
This reverts commit 4cb8be6ab4.
 2014-10-26 18:02:28 +01:00
Flakebi
46f3fa5f74 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/options_ui.stkgui
	src/graphics/stkmesh.cpp
	src/states_screens/options_screen_ui.cpp
 2014-10-26 17:47:29 +01:00
Flakebi
4cb8be6ab4 Fix incorrect alignment in spinner widgets 2014-10-26 17:10:28 +01:00
Flakebi
690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
Arthur-D
ef2cf3b17d Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome. 2014-10-26 15:34:51 +01:00
hiker
f7893afbef Adjusted button position, thanks to auria. 2014-10-24 11:16:08 +11:00
hiker
8bc6aa91bb Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-24 10:34:59 +11:00
hiker
1920703f09 Converted label to button, just for tests. 2014-10-24 10:34:10 +11:00
Vincent Lejeune
794ab54b7a Clamp lodval 2014-10-24 00:41:34 +02:00
hiker
b4f95d672a Started to indicate the name of the logged in user ... still work in 
progress (black writing on dark grey).
 2014-10-23 22:26:11 +11:00
Vincent Lejeune
9ca4d7e3e6 Improve ibl specular reflexion using mipmap chain 2014-10-22 14:49:06 +02:00
hiker
c012e98f9b Allow disabling of hw stats collection. 2014-10-22 08:20:26 +11:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch... 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
 2014-10-20 22:36:54 +02:00
Marianne Gagnon
c95e90b925 Tweak checkbox position on login screen 2014-10-17 19:24:21 -04:00
Vincent Lejeune
2f45266c6f Fix position of speedmeter 
Only need to get the texture
 2014-10-17 18:51:41 +02:00
Vincent Lejeune
ce7f017adf Some fixes 2014-10-17 18:43:39 +02:00
Deve
3499975b03 Move track name to center. 
It allows a bit longer track names and looks better.
 2014-10-16 19:33:54 +02:00
hiker
50c21cc11e Added secret achievement (i.e. progress not shown in list). 2014-10-09 23:32:17 +11:00
auriamg
3061123e3e Merge pull request #1606 from Flakebi/fix 
Fix some more bugs
 2014-10-08 18:18:37 -04:00
Vincent Lejeune
ea3cc141ff Fix grass in azdo mode 2014-10-08 01:01:28 +02:00
hiker
4ff00018b4 Fixed alignment of password field. 2014-10-08 08:25:00 +11:00
Flakebi
0193c4c7a5 Fix #1170 Add "Don't Assign" option when configuring inputs 2014-10-07 00:06:15 +02:00
Vincent Lejeune
9de7d11ee4 Fix bloom effect on mesa 2014-10-07 00:00:16 +02:00
Vincent Lejeune
20ea7ca271 GI use sun color value 2014-10-06 22:51:41 +02: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
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
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
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
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
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
 2014-10-05 12:10:39 +02: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
hiker
f63e7d93b8 Fixed #1598 (error message about font texture not found). 2014-10-04 23:32:54 +10:00
samuncle
97772ba1ae set the downard impulse to 5 + a more easy to use backward camera 2014-10-02 13:53:59 +02:00
vlj
30dda3e343 Fix sky warp 2014-10-02 02:53:31 +02:00
hiker
de9a1f51a7 Removed empty 'online overview' page, show the achievements page instead. 2014-10-02 07:59:24 +10:00
vlj
2236e8dd1c Fix extra respawning particles 2014-10-01 01:19:49 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
samuncle
af037d6267 tweak particle.xml 2014-09-29 12:30:43 +02:00
hiker
a593c81a64 Some improvement for #1505, but still wip. 2014-09-26 16:33:47 +10:00
hiker
2d7b8228e9 Fix #1565: Added better instructions for account creation screen (and also made the 
instructions actually visible).
 2014-09-26 08:57:52 +10:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00
vlj
58e1b73752 Fix bloom computation 2014-09-24 01:19:37 +02:00
hiker
06523a62c3 Fixed typo, renamed file to have proper extension. 2014-09-23 22:58:08 +10:00
hiker
13cbde2e09 Added new supertuxkart.appdata file from hughsie (#1545). 2014-09-23 15:51:06 +10:00
hiker
4cea6bd7fe Fixed #709 (Missing R with caron in title font). Thanks! 2014-09-22 15:53:40 +10:00
hiker
249c34cd0d Fixed achievement warning. 2014-09-22 07:54:34 +10:00
Vincent Lejeune
5643e38886 Some factorisation for non instanced path 2014-09-20 19:28:06 +02:00
Vincent Lejeune
b3e124b93e Some fixes 2014-09-20 18:48:22 +02:00
Vincent Lejeune
f6d2ff92f1 Merge remote-tracking branch 'origin/glossmap' 2014-09-20 01:57:55 +02:00
Vincent Lejeune
b034049a28 Support for 3 tex mats 2014-09-19 23:09:22 +02:00
Deve
12977c3764 Merge pull request #1530 from marcoll/master 
Some improvements to the GP editor

Merged because it fixes some issues. Previously I wasn't able to create new GP without a crash.
 2014-09-19 21:54:38 +02:00
Vincent Lejeune
24cd727899 Add glossytex to textures 2014-09-19 19:54:00 +02:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Vincent Lejeune
1d2c77d86a Use ProjectionViewMatrix in glow_object.vert 2014-09-17 02:12:28 +02:00
Vincent Lejeune
b769e46a00 Use texture instead of image in SSAO. 2014-09-16 15:18:29 +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
vlj
cb922ed4db Force non negative value in bloom 2014-09-15 22:11:53 +02: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
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