94 Commits

Author SHA1 Message Date
proller
fdb7682d6f Merge remote-tracking branch 'minetest/master' 2016-12-24 19:34:29 +03:00
Lars Hofhansl
923a8f1983 Shaders: Remove unnecessary 'if' statements
Pull if GENERATE_NORMALMAPS == 1 into the template to avoid evaluating
it for each fragment.
Remove if (fogDistance != 0.0).
2016-12-24 00:22:16 +00:00
proller
668681f6aa Merge remote-tracking branch 'minetest/master' 2016-12-07 21:52:22 +03:00
Lars Hofhansl
075833e393 Fog: Make fraction of visible distance at which fog starts configurable
Optimise the fetching of global settings 'camera_smoothing',
'cinematic' and 'cinematic_camera_smoothing'.
Cache 'cam_smoothing'.
2016-12-07 04:07:54 +00:00
proller
348b7b0cf8 Merge remote-tracking branch 'minetest/master' 2016-11-17 15:44:46 +03:00
Rogier-5
5f0dc8e78a Fix unexplained shader issue (glsl compiler bug??) (#4757) 2016-11-17 02:56:05 +10:00
proller
94add55976 Merge remote-tracking branch 'minetest/master' 2016-11-05 01:12:41 +03:00
lhofhansl
6bb4347208 Remove unused shader matrices. (#4723) 2016-11-04 18:12:45 +01:00
proller
2299eab0ef Merge remote-tracking branch 'minetest/master' 2016-10-26 18:35:17 +03:00
lhofhansl
198ed60cab Shaders: Remove special handling for liquids. (#4670) 2016-10-26 16:24:45 +02:00
proller
020ca97774 Merge remote-tracking branch 'minetest/master' 2016-10-25 11:33:21 +03:00
Lars Hofhansl
98176481c1 Shaders: Apply tone mapping before fog calculation. 2016-10-25 07:49:19 +02:00
proller
59fa5bc720 Merge remote-tracking branch 'minetest/master' 2016-10-24 12:50:39 +03:00
Lars Hofhansl
779d2c5f64 Shaders: Harmonize Irrlicht and shader fog calculations 2016-10-24 07:41:00 +01:00
proller
12955d0430 Merge commit '0ad40fd' 2016-10-14 22:53:06 +03:00
Lars Hofhansl
0ad40fd484 Use range-based fog instead of z-plane based. 2016-10-13 23:30:15 +02:00
proller
182f2408b5 Merge remote-tracking branch 'minetest/master' 2016-03-30 15:22:11 +03:00
paramat
597c1d73da Nodes shader: Decrease amplitude of waving leaves and plants
Fix initialisation of variable 'disp'
Fix a few minor code style issues
Add independent X motion combining 2 prime frequencies
2016-03-30 01:53:22 +01:00
proller
2c7d110798 Merge remote-tracking branch 'minetest/master' 2016-03-26 19:21:48 +03:00
est31
205e38f5b8 Replace CRLF with LF in shader files 2016-03-25 15:57:18 +01:00
RealBadAngel
47cc77afd6 Shaders: fix fog not affecting opaque liquids 2016-02-25 02:01:15 +03:00
RealBadAngel
e8a3d22cbe Shaders: fix fog not affecting opaque liquids 2016-02-23 23:51:41 +00:00
proller
4c1a0c96a0 fix wieldlight 2016-02-17 22:01:09 +03:00
proller
cafbb539d5 Merge commit 'eb3840a' 2016-02-10 04:08:58 +03:00
RealBadAngel
eb3840a3f8 Filmic HDR tone mapping 2016-02-09 02:55:59 -05:00
proller
9a7ee54eef Merge remote-tracking branch 'minetest/master' 2016-02-09 02:12:58 +03:00
RealBadAngel
b44da4916a Cleanup selection mesh code, add shaders for halo and selection boxes 2016-02-08 03:57:42 -05:00
proller
6afcab7cf7 Merge commit 'a64d78a' 2015-12-19 18:56:45 +03:00
RealBadAngel
a64d78a37e Speed up and make more accurate relief mapping
using linear + binary search.
2015-12-10 18:24:11 +01:00
proller
a7dea2972f Merge commit '0b87556' 2015-09-15 20:26:24 +03:00
paramat
0b87556048 Shaders: use triple-frequency waving for leaves and plants 2015-09-07 21:52:36 +02:00
proller
03cffd211e Merge commit 'd44fcea'
Conflicts:
	CMakeLists.txt
	src/client/tile.cpp
2015-08-20 15:01:13 +03:00
RealBadAngel
8b8d17b22b Remove use of engine sent texture tiling flags - theyre no longer needed 2015-08-20 02:41:40 +02:00
proller
35663e15bf Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/mapgen_v7.cpp
	src/wieldmesh.cpp
2015-07-22 01:53:12 +03:00
RealBadAngel
60350699c7 Add wielded (and CAOs) shader 2015-07-21 23:56:41 +02:00
proller
7055f2449a Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/nodedef.cpp
2015-07-16 17:10:11 +03:00
RealBadAngel
655fc6010f Fix relief mapping issues 2015-07-16 15:36:48 +02:00
proller
6dc98792bf Merge remote-tracking branch 'minetest/master' 2015-07-02 22:42:04 +03:00
RealBadAngel
8a85e5e58d Shaders fixes and cleanup relief mapping code. 2015-07-02 21:36:45 +02:00
proller
8de84f4acb Merge remote-tracking branch 'minetest/master' 2015-06-28 22:28:29 +03:00
RealBadAngel
1455267c9e Bugfix: variable type mismatch 2015-06-28 21:11:54 +02:00
proller
1736e799c8 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/client.cpp
	src/client.h
	src/game.cpp
	src/mapblock_mesh.cpp
	src/nodedef.cpp
2015-06-28 15:21:12 +03:00
RealBadAngel
ffd16e3fec Add minimap feature 2015-06-27 03:42:01 +02:00
proller
ef36c894e8 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/mapgen_v7.cpp
2015-06-21 14:08:51 +03:00
RealBadAngel
53efe2ef42 Remove textures vertical offset. Fix for area enabling parallax. 2015-06-21 00:11:09 +02:00
proller
c290071a50 Merge commit 'ee38bcd'
Conflicts:
	client/shaders/nodes_shader/opengl_vertex.glsl
2015-06-16 19:50:32 +03:00
proller
20adb4bca2 merge fix 2015-06-16 19:48:22 +03:00
proller
aa1314d02f Merge commit '43fcfbf'
Conflicts:
	client/shaders/nodes_shader/opengl_fragment.glsl
	client/shaders/nodes_shader/opengl_vertex.glsl
	client/shaders/water_surface_shader/opengl_fragment.glsl
	src/clientmap.cpp
	src/mapblock_mesh.cpp
	src/mapblock_mesh.h
2015-06-16 19:43:18 +03:00
est31
ee38bcd307 Automated whitespace error fix for last commit 2015-06-14 23:15:20 +02:00
RealBadAngel
43fcfbfe05 Improved parallax mapping. Generate heightmaps on the fly. 2015-06-14 21:13:36 +02:00