Rachael Alexanderson
038654eb81
Merge commit 'refs/pull/410/head' of https://github.com/coelckers/gzdoom
2018-01-27 13:01:22 -05:00
Rachael Alexanderson
2233d5e787
Merge branch 'materials' of https://github.com/coelckers/gzdoom
2018-01-27 12:56:31 -05:00
Rachael Alexanderson
60dc223b19
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-27 12:56:26 -05:00
Marisa Kirisame
68df140c62
Merge branch 'master' into clearscope_mapdata
2018-01-27 16:31:06 +01:00
Christoph Oelckers
d207f426c1
Typo.
2018-01-27 12:49:52 +01:00
Christoph Oelckers
1794774f22
- ScriptedMarine already exists as a name so most literal occurences in the source could be replaced with more efficient direct use of the name.
2018-01-27 09:54:33 +01:00
Christoph Oelckers
7ceb70bcc1
- renamed 'Tracer' class to 'LineTracer', because 'Tracer' is a too common name that had been used by some mods.
2018-01-27 09:32:26 +01:00
Rachael Alexanderson
7cd66f5132
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-26 23:20:32 -05:00
Rachael Alexanderson
2d8731508b
- minor typo fix
2018-01-26 23:18:13 -05:00
Magnus Norddahl
6deb51f23c
- disable the tonemapping to let it bloom instead
2018-01-27 00:42:17 +01:00
Magnus Norddahl
a6da1d356a
- add PBR materials to main.fp
2018-01-27 00:22:15 +01:00
Marisa Kirisame
92547028f3
Exports sky textures to ZScript (readonly, needs setter function due to the setup required) and speeds, along with a ChangeSky function for setting the textures.
2018-01-26 21:00:44 +01:00
Rachael Alexanderson
276310c18a
Update README.md
2018-01-26 09:56:58 +00:00
Rachael Alexanderson
afb8cf3dc3
- update README.md to QZDoom
2018-01-26 04:54:18 -05:00
Rachael Alexanderson
48415266e5
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-26 04:51:17 -05:00
Rachael Alexanderson
8cfb1cba7c
- add AppVeyor badge
2018-01-26 04:50:07 -05:00
Rachael Alexanderson
866d42d26e
- add README.md file for Github friendliness
2018-01-26 03:40:44 -05:00
alexey.lysiuk
a77b253cba
Fixed Sector.SetYScale() function in ZScript
...
https://forum.zdoom.org/viewtopic.php?t=59224
2018-01-26 10:29:37 +02:00
alexey.lysiuk
577c6b033e
Changed quad stereo mode restart notification
...
Restart requirement for quad stereo mode should be output to console because CVAR can be toggled directly from it
Long option names break menu layout on some aspect ratios like 16:10
2018-01-26 10:10:51 +02:00
alexey.lysiuk
7206bfcfbc
Made software fuzz shader compatible with supported OpenGL versions
...
Use array constructors because initializer list is a core feature since OpenGL 4.2
2018-01-26 09:53:31 +02:00
Rachael Alexanderson
42dce912b4
Merge branch 'materials' of https://github.com/coelckers/gzdoom
2018-01-25 14:25:24 -05:00
Magnus Norddahl
30af6d38b3
- fix automap render bug
2018-01-25 20:22:51 +01:00
Magnus Norddahl
2c9a2e7170
- fix specular defaults to be a little more sane
2018-01-25 19:59:57 +01:00
Magnus Norddahl
7a59bcde4c
- move glossiness and specular level to GLDEFS
2018-01-25 19:53:55 +01:00
Magnus Norddahl
0855418475
Merge branch 'gzdoom' into materials
...
# Conflicts:
# src/gl/shaders/gl_shader.cpp
# src/gl/shaders/gl_shader.h
2018-01-25 19:21:19 +01:00
Marisa Kirisame
23393c4f9f
Mark various "getter" functions across level data structs clearscope, for access from ui.
2018-01-25 19:18:26 +01:00
Magnus Norddahl
a46bbc81a0
Merge branch 'bloom_psprite_fix' into gzdoom
2018-01-25 19:01:46 +01:00
Magnus Norddahl
4c0dce875f
Merge branch 'fuzz_software' into gzdoom
2018-01-25 19:00:14 +01:00
alexey.lysiuk
1b4e3d3f94
Added overloaded Little...() functions for big endian targets
...
https://forum.zdoom.org/viewtopic.php?t=59197
2018-01-25 13:35:34 +02:00
alexey.lysiuk
e728634497
Use dummy Get...() functions for all Intel targets
...
64-bit Intel targets built with GCC/Clang were using strict memory alignment versions of GetShort(), GetInt(), GetBigInt() functions
2018-01-25 13:23:12 +02:00
Rachael Alexanderson
f60d5052f0
- reverbedit fix: third time's a charm?
2018-01-24 15:36:54 -05:00
Rachael Alexanderson
753ac678e0
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-24 15:32:07 -05:00
Rachael Alexanderson
5f970bccb8
- remove A_IsPlayingSound
2018-01-24 15:30:55 -05:00
Christoph Oelckers
103aa648cd
Re-merge branch 'reverbedit'
2018-01-24 15:30:26 -05:00
Magnus Norddahl
1875902414
- Do not flip the normal based on face direction
2018-01-23 23:59:58 +01:00
Magnus Norddahl
81c6808d2a
- Add specular and normal map handling to main.fp
2018-01-23 23:10:28 +01:00
Magnus Norddahl
e045fb57c9
- Declare new textures for specular and pbr modes
2018-01-23 20:51:48 +01:00
Magnus Norddahl
c7ec489846
Merge remote-tracking branch 'origin/master' into materials
2018-01-23 20:16:32 +01:00
alexey.lysiuk
47b276024e
Fixed compilation warnings reported by MSVC
...
src\p_map.cpp(4857): warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
src\p_map.cpp(4858): warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
2018-01-22 12:29:16 +02:00
Rachael Alexanderson
00e51dc16f
Merge branch 'master' of https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/doomdata.h
# src/namedef.h
# src/p_udmf.cpp
2018-01-21 16:49:07 -05:00
Christoph Oelckers
76d594f952
- reverted the hard offset for transferred skies.
...
This is not the correct way to apply it.
2018-01-21 19:25:21 +01:00
Christoph Oelckers
09f1859c83
- allow retrieving the length of a string constant.
2018-01-21 18:49:46 +01:00
Christoph Oelckers
6438416adb
- fixed: The culling mode for translucent models must be inverted when rendering a mirror.
2018-01-21 16:29:40 +01:00
Christoph Oelckers
e1d6f6f3b3
- fixed: precise rendering did not work anymore due to a missing reference operator in the setup function for the needed data.
2018-01-21 16:17:49 +01:00
Christoph Oelckers
ce88830a59
- fixed a warning caused by the LZMA-SDK update.
2018-01-21 10:58:12 +01:00
Christoph Oelckers
884db96cbb
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-21 10:54:34 +01:00
ZZYZX
ee1a8f71bb
Disable TRACE_PCross and TRACE_Impact on ZScript side
2018-01-21 10:54:23 +01:00
ZZYZX
74b937620e
Added texture detection for walls and 3D floors; renamed some fields to more intuitive names
2018-01-21 10:54:23 +01:00
ZZYZX
a7ff62316d
Exported Trace() interface to ZScript
2018-01-21 10:54:23 +01:00
Marisa Kirisame
15e7d9daba
Gave the user data struct for CheckLineTrace a more unique name to avoid confusion with FLineTraceData
2018-01-21 10:54:02 +01:00
