raa-eruanna
cd21d017fb
Merge remote-tracking branch 'remotes/origin/decorate-viewbob'
2016-10-17 09:04:37 -04:00
Magnus Norddahl
8b297221fe
Merge branch 'gl_swframebuffer' into qzdoom
2016-10-16 23:18:16 +02:00
Magnus Norddahl
f81d0d3964
macOS support and Intel driver bug fixes
2016-10-16 22:40:08 +02:00
raa-eruanna
135c861247
Merge http://github.com/coelckers/gzdoom
2016-10-16 04:02:34 -04:00
Christoph Oelckers
b03489a43c
Merge branch 'master' of https://github.com/rheit/zdoom
2016-10-16 08:51:13 +02:00
Marisa Heit
e4281454ce
Split ANIMATED into three parts, filtered by game that uses them
...
- ANIMATED contained definitions for Doom, Heretic, and Strife, all
crammed into a single file. This meant that animations from one game
could erroneously make their way into maps for another game that
provided custom textures with names that matched textures that animated
in the other game. There are now three separate ANIMATED lumps with only
the animations defined for the original game and no others. The one
that gets loaded depends on the game being played.
- Added documentation for the ANIMATED file format to the comment for
FTextureManager::InitAnimated(), since I had to figure it out from the
code.
2016-10-15 21:40:24 -05:00
raa-eruanna
3122538006
Added menu entry for "r_fullbrightignoresectorcolor"
2016-10-14 18:16:22 -04:00
Magnus Norddahl
2a0ab96341
Merge remote-tracking branch 'origin/ssao' into qzdoom
2016-10-13 18:12:56 +02:00
Magnus Norddahl
14c1a77f8a
Fix AmbientOcclusionColor bug where pixelpos was assumed to be in eye space coordinates
2016-10-13 18:08:04 +02:00
raa-eruanna
15c08f73d5
Merge http://github.com/coelckers/gzdoom
2016-10-12 03:15:03 -04:00
Christoph Oelckers
a4a00435e2
Merge branch 'master' of https://github.com/rheit/zdoom
2016-10-12 08:42:37 +02:00
Major Cooke
3de83b8943
Added PSPF_FLIP.
...
Flips the overlay on the X axis.
2016-10-11 17:20:58 -05:00
raa-eruanna
49745e133d
Merge http://github.com/rheit/zdoom
2016-10-11 17:43:27 -04:00
raa-eruanna
13271cb967
- Created menus for all this render-switching insanity.
2016-10-11 17:42:46 -04:00
Major Cooke
5dc94a10c3
Added A_SetInventory.
...
- Sets the absolute amount of an inventory actor.
- Limits itself to the range [0, MaxAmount]. Setting beyondMax to true disregards the MaxAmount. Default is false.
2016-10-11 14:44:31 -05:00
Magnus Norddahl
f5c069c759
Merge remote-tracking branch 'origin/gl_swframebuffer' into qzdoom
2016-10-11 14:54:18 +02:00
Magnus Norddahl
3c7d6234cb
Add wipes
2016-10-11 14:37:57 +02:00
Magnus Norddahl
01dc9de8d1
Misc bug fixes and performance improvements
2016-10-11 10:27:18 +02:00
Magnus Norddahl
682b040b97
OpenGL based software renderer hardware accel now works for most things
2016-10-11 00:03:46 +02:00
Magnus Norddahl
f4308b3184
Add glsl shader version of the d3d9 shaders and get enough of it working for it to boot without errors
2016-10-10 21:03:55 +02:00
raa-eruanna
2a7b902a0a
Merge http://github.com/coelckers/gzdoom
...
# Conflicts:
# src/gl/renderer/gl_renderer.cpp
2016-10-10 10:39:07 -04:00
Christoph Oelckers
14a6e7989b
Merge branch 'master' of https://github.com/rheit/zdoom
...
# Conflicts:
# wadsrc/static/menudef.txt
2016-10-10 11:38:08 +02:00
Major Cooke
31ca5a1900
Added OverlayX/Y(int layer)
...
- Retrieves the X/Y positions of an overlay.
- A_OverlayFlags and A_OverlayOffset now interpret a layer of 0 to mean 'use this calling layer'.
2016-10-10 10:48:50 +02:00
raa-eruanna
1fab0cc514
- Added: PlayerPawn property "Player.ViewBob" which acts as a MoveBob/StillBob multiplier.
2016-10-10 01:35:47 -04:00
Christopher Bruns
779e6acb7b
Create "final" two non-VR 3D modes: Column-interleaved and checkerboard.
2016-10-09 13:05:50 -04:00
Magnus Norddahl
94d8e10f96
Merge branch 'ssao' into qzdoom
2016-10-09 06:27:42 +02:00
Magnus Norddahl
1b7c42f45f
Multisampling ssao bug fixes and split linear depth to its own buffer
2016-10-09 06:17:48 +02:00
raa-eruanna
a2551ce95e
Merge http://github.com/rheit/zdoom
2016-10-07 08:30:25 -04:00
Christoph Oelckers
ee66d22034
Revert "- added an option to disable the pickup screen flash."
...
This reverts commit 2d320a2e86
.
The feature has been superseded by pickup_fade_scalar and is no longer needed.
2016-10-07 08:46:06 +02:00
raa-eruanna
a4ccbddfd6
- Menudef: Split Truecolor options into their own menu.
2016-10-07 02:38:08 -04:00
raa-eruanna
e75cf42756
- Forgot to add language entries.
2016-10-07 00:35:06 -04:00
raa-eruanna
a80c67c2ca
- Backported blood_fade_scalar from Skulltag
...
- Added new pickup_fade_scalar which works the same way for pickups
- Default for blood_fade_scalar is 1.0 instead of 0.5 from Skulltag.
2016-10-07 00:35:06 -04:00
raa-eruanna
3ccc85876c
- Forgot to add language entries.
2016-10-06 20:05:30 -04:00
raa-eruanna
02f66fa34e
- Backported blood_fade_scalar from Skulltag
...
- Added new pickup_fade_scalar which works the same way for pickups
- Default for blood_fade_scalar is 1.0 instead of 0.5 from Skulltag.
2016-10-06 20:01:20 -04:00
Christoph Oelckers
fc246be03e
Merge branch 'master' of https://github.com/rheit/zdoom
2016-10-06 21:21:46 +02:00
Magnus Norddahl
bb79dcb634
SSAO math bug fixes
2016-10-06 07:36:49 +02:00
raa-eruanna
e592473f57
Merge http://github.com/rheit/zdoom
2016-10-05 21:36:23 -04:00
Christoph Oelckers
5b350dcdd5
- gave Boom's point pusher and puller things the NOCLIP flag so that they won't get moved around by scrollers.
2016-10-05 16:27:12 +02:00
Christoph Oelckers
2d320a2e86
- added an option to disable the pickup screen flash.
2016-10-05 09:59:19 +02:00
Magnus Norddahl
00e72028ef
Add another gbuffer with normal data and make ssao pass use it
2016-10-05 07:57:27 +02:00
raa-eruanna
4d1ea5c477
Added language entry for Linear skies. (oops)
2016-10-03 21:52:25 -04:00
raa-eruanna
b9a644e762
Added menu option for Linear sky.
2016-10-03 21:41:37 -04:00
Magnus Norddahl
e9d13e5d74
Remove gl_light_math (reverts last remains of old lightmath branch)
2016-10-04 00:25:35 +02:00
Magnus Norddahl
51f867bc6c
Merge branch 'ssao' into qzdoom
...
# Conflicts:
# src/gl/renderer/gl_renderer.cpp
# wadsrc/static/language.enu
# wadsrc/static/menudef.zz
# wadsrc/static/shaders/glsl/main.fp
2016-10-04 00:16:05 +02:00
Magnus Norddahl
ecb57d6cd9
Merge remote-tracking branch 'gzdoom/master' into ssao
...
# Conflicts:
# src/gl/renderer/gl_renderer.cpp
# src/gl/scene/gl_scene.cpp
# src/gl/shaders/gl_shader.cpp
# wadsrc/static/language.enu
# wadsrc/static/menudef.zz
2016-10-04 00:01:03 +02:00
Magnus Norddahl
bcb64a3445
Merge branch 'ssao' into qzdoom
...
# Conflicts:
# src/gl/renderer/gl_postprocess.cpp
# src/gl/renderer/gl_renderer.cpp
# src/gl/scene/gl_scene.cpp
# src/gl/shaders/gl_ambientshader.cpp
# src/gl/shaders/gl_ambientshader.h
# src/gl/system/gl_cvars.h
# wadsrc/static/language.enu
# wadsrc/static/menudef.zz
2016-10-03 23:47:09 +02:00
Christoph Oelckers
4eb5f10b02
- use normals to have proper light attenuation. So far only implemented for walls and flats. Models are planned but need some thinking about how to efficiently collect all required lights for an object.
2016-10-03 16:09:32 +02:00
raa-eruanna
267b131c03
Merge http://github.com/rheit/zdoom
2016-10-02 23:10:28 -04:00
raa-eruanna
c6408e92e2
Merge http://github.com/coelckers/gzdoom
...
# Conflicts:
# src/gl/renderer/gl_postprocess.cpp
# src/gl/renderer/gl_renderer.cpp
# src/gl/scene/gl_scene.cpp
# wadsrc/static/language.enu
# wadsrc/static/menudef.zz
2016-10-02 23:10:07 -04:00
Christoph Oelckers
2da18bfa56
Merge branch 'master' of https://github.com/rheit/zdoom
2016-10-03 00:56:55 +02:00