raa-eruanna
|
f9795a2533
|
Revert "Remove linear sky again"
This reverts commit 21390e91b8 .
- also set r_linearsky to "false" by default.
|
2016-10-03 21:39:15 -04:00 |
|
Magnus Norddahl
|
ddbdb55eca
|
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
|
2016-10-04 01:36:39 +02:00 |
|
Magnus Norddahl
|
e05ed47fee
|
Remove C++ and SSE drawers
|
2016-10-04 01:36:26 +02:00 |
|
raa-eruanna
|
2b2926728b
|
Merge http://github.com/rheit/zdoom
|
2016-10-03 18:35:19 -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 |
|
Magnus Norddahl
|
dcb6c1ac3a
|
Move ApplyFXAA to PostProcessScene
|
2016-10-03 23:30:00 +02:00 |
|
Magnus Norddahl
|
9c8f841858
|
Merge branch 'llvmcompiler' into qzdoom
|
2016-10-03 23:22:28 +02:00 |
|
alexey.lysiuk
|
5d99e7dafe
|
Fixed compilation on platforms other than Windows
|
2016-10-03 22:13:33 +03:00 |
|
alexey.lysiuk
|
d6346fb0c6
|
Fixed compilation with GCC or Clang
|
2016-10-03 21:44:00 +03:00 |
|
Major Cooke
|
d597af1494
|
- Fixed a few corner cases where forcing alpha wouldn't work.
- On the other hand, soultrans, fuzzy and stencil (as is, not including the mixing styles like stenciladd) are no longer accounted for by FORCEALPHA.
|
2016-10-03 13:14:48 -05:00 |
|
Christoph Oelckers
|
15af9242d6
|
Merge branch 'master' of https://github.com/rheit/zdoom
|
2016-10-03 16:22:16 +02:00 |
|
Christoph Oelckers
|
7ab7fc9a57
|
- seems I missed this part...
|
2016-10-03 16:21:50 +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 |
|
Christoph Oelckers
|
41ab08ee47
|
- fixed: TVector::Resized needs to consider that the input vector has a length of 0. In this case just performing the normal calculations results in an invalid vector.
|
2016-10-03 11:00:26 +02:00 |
|
Magnus Norddahl
|
7c47806382
|
Fix aspect ratio bug in LensDistortScene
|
2016-10-03 09:18:47 +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 |
|
Major Cooke
|
8cfeca655d
|
Added priority renderstyles, and added PSPF_FORCE(ALPHA / STYLE).
- Renderstyles now override alpha based on which is used.
- The new flags will override whatever renderstyle and alpha is currently being utilized.
|
2016-10-02 21:19:56 -05:00 |
|
Major Cooke
|
4865e7109c
|
Fixed merge conflicts.
|
2016-10-02 21:18:01 -05:00 |
|
Christoph Oelckers
|
2da18bfa56
|
Merge branch 'master' of https://github.com/rheit/zdoom
|
2016-10-03 00:56:55 +02:00 |
|
Major Cooke
|
201ae3c60f
|
Added OverlayID() for retrieving psprite layer numbers.
|
2016-10-03 00:44:06 +02: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 |
|
Christopher Bruns
|
5391216756
|
Delete unused new BlitFromEyeTexture() method I ended up not using.
|
2016-10-02 16:27:43 -04:00 |
|
Christopher Bruns
|
63b28a1d80
|
Retain stereoscopic parity after dragging window in row interleaved 3D mode.
|
2016-10-02 16:11:06 -04:00 |
|
Christopher Bruns
|
0240cdef18
|
Modulate row interleaved stereo 3d offset with window height parity, because gl_FragCoord.y approaches zero at the bottom, not the top of the window.
|
2016-10-02 16:10:58 -04:00 |
|
Christopher Bruns
|
576619504e
|
Remove unused WindowHeight uniform.
|
2016-10-02 16:10:50 -04:00 |
|
Christopher Bruns
|
fcbf9342d6
|
Compute row location using gl_FragCoord.
|
2016-10-02 16:10:39 -04:00 |
|
Christopher Bruns
|
460b653709
|
Row interlaced 3d might be working, at least in fullscreen 1920x1080 mode.
|
2016-10-02 16:10:21 -04:00 |
|
Christopher Bruns
|
79046580d5
|
Partial implementation of row interlaced mode.
|
2016-10-02 16:09:22 -04:00 |
|
Christopher Bruns
|
960d4d6755
|
Create TopBottom3D mode and begin sketching RowInterleaved3D mode.
|
2016-10-02 16:09:02 -04:00 |
|
N.E.C
|
671646be26
|
Fix errors encountered when compiling for v140_xp target
|
2016-10-02 13:05:26 -07:00 |
|
Major Cooke
|
1620ff58c8
|
Added INTCVAR to DrawNumber.
- Allows retrieval and displaying of an int/bool user/server cvar.
|
2016-10-02 20:11:13 +02:00 |
|
Christoph Oelckers
|
e84a7de390
|
- variable was in the wrong scope.
|
2016-10-02 18:56:04 +02:00 |
|
Christoph Oelckers
|
37d61167ea
|
- hotfix for a RapidJSON bug: If the Writer tries to process an INF or NaN value, it aborts and leaves the writer in a broken state, unable to recover. Changed so that it writes a 0 value so that the resulting JSON at least parses correctly.
|
2016-10-02 18:50:37 +02:00 |
|
Christoph Oelckers
|
3418710a38
|
- be a bit more thorough and also call Effect() on vertically moving missiles with zero damage.
|
2016-10-02 14:38:48 +02:00 |
|
Christoph Oelckers
|
865863ab6f
|
- fixed: AFastProjectile did not work properly for perfectly vertically moving missiles. Like AActor::Tick it needs to ensure that a tiny bit of lateral movement is present so that collision detection and the Effect() function work as intended.
|
2016-10-02 14:37:26 +02:00 |
|
Christoph Oelckers
|
0bce6e3925
|
- added ACS and DECORATE setter functions for named translations.
|
2016-10-02 14:09:45 +02:00 |
|
Christoph Oelckers
|
a505e91032
|
- added TRNSLATE lump for defining global translations which are accessible by name.
This is only the definition part, manipulation functions for ACS and DECORATE still to do.
|
2016-10-02 13:35:25 +02:00 |
|
alexey.lysiuk
|
d7683a8c55
|
Fixed crash on early fatal error exit
Process terminates correctly if zdoom.pk3 is missing
|
2016-10-02 10:13:45 +03:00 |
|
Marisa Heit
|
efc9ed2fe9
|
Fix state lookup from non-action functions (i.e. Damage functions)
|
2016-10-01 22:31:07 -05:00 |
|
Marisa Heit
|
eb2ee33950
|
FxVMFunctionCall must pass null pointers when calling an action function from a non-action function
|
2016-10-01 22:29:57 -05:00 |
|
Marisa Heit
|
944ae2bc09
|
Only generate the self==stateowner check inside action functions
|
2016-10-01 21:47:43 -05:00 |
|
raa-eruanna
|
ff0d409e2b
|
Merge http://github.com/rheit/zdoom
|
2016-10-01 19:06:43 -04:00 |
|
raa-eruanna
|
a89ec61dc1
|
Merge http://github.com/coelckers/gzdoom
|
2016-10-01 19:06:40 -04:00 |
|
Christoph Oelckers
|
51ffd6d9c6
|
- fixed some warnings.
- A_SetRenderStyle should not default to STYLE_None.
|
2016-10-02 01:00:07 +02:00 |
|
Christoph Oelckers
|
80f2f5829f
|
- added A_SetRenderStyle function which replaces A_SetTranslucent. A_SetTranslucent had to be deprecated due to obsolete semantics of the renderstyle argument.
|
2016-10-02 00:43:05 +02:00 |
|
Christoph Oelckers
|
ff0b879323
|
- added UDMF portal flags. Names are identical with Eternity for compatibility reasons.
|
2016-10-02 00:31:25 +02:00 |
|