Commit graph

13 commits

Author SHA1 Message Date
nashmuhandes
361feaaadc Removed irrelevant voxel code notice in the README (the software renderer doesn't even exist in the current iteration) 2017-02-09 19:26:10 +08:00
nashmuhandes
032ad95b0f Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	docs/licenses/README.TXT
#	src/gl/dynlights/gl_dynlight.cpp
#	src/r_bsp.cpp
#	src/r_draw.cpp
#	src/r_plane.h
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
#	src/win32/win32video.cpp
#	src/win32/zdoom.rc
2017-02-05 20:13:39 +08:00
Christoph Oelckers
0c3aab794f - corrections to license file. 2017-01-15 12:17:48 +01:00
nashmuhandes
514835b752 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-10-04 01:18:06 +08:00
alexey.lysiuk
c68aa2b241 Added FXAA post-processing
Implementation of Fast Approximate Anti-Aliasing is based on nVidia sample:
https://github.com/NVIDIAGameWorks/GraphicsSamples/tree/master/samples/es3-kepler/FXAA
2016-10-03 00:15:45 +02:00
nashmuhandes
a7be71bda1 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/CMakeLists.txt
#	src/r_main.cpp
2016-09-15 13:06:51 +08:00
Christoph Oelckers
f3a4036dc5 - lgpl.txt 2016-09-14 21:05:25 +02:00
nashmuhandes
ed2d5863e7 Revert "Removed xBRZ due to licensing incompatibilities."
This reverts commit 35c5cf2e05.
2016-09-11 13:13:05 +08:00
nashmuhandes
35c5cf2e05 Removed xBRZ due to licensing incompatibilities. 2016-09-06 17:26:04 +08:00
nashmuhandes
6018c716e2 Removed a couple of unused licenses 2016-09-05 21:24:10 +08:00
nashmuhandes
20be72a535 Remove the Build license which was accidentally added. GZDoom-GPL uses no Build code. 2016-09-05 20:47:42 +08:00
Christoph Oelckers
aece9aaa58 - added xBRZ texture scaler after clearing the licensing conditions. A screenshot of the confirmation that this is ok has been added to the 'licenses' folder. 2016-09-03 14:01:51 +02:00
Christoph Oelckers
bf5f10a897 - added all relevant licenses to docs. 2016-09-02 10:48:38 +02:00