Rachael Alexanderson
80a23f3bb3
Merge commit 'refs/pull/417/head' of https://github.com/coelckers/gzdoom
2018-01-30 23:51:02 -05:00
Rachael Alexanderson
4381ce64d4
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-30 23:50:36 -05:00
Christoph Oelckers
8e90386567
- made Weapon.CheckAmmo and Weapon.DepleteAmmo virtual on the script side.
2018-01-30 22:04:31 +01:00
alexey.lysiuk
d9323b9740
Marked internal menu commands as safe
...
This fixes soundfont/patchset/config selection menus in advanced sound options
2018-01-30 16:02:30 +02:00
Marisa Kirisame
f59d3eecde
Export GetSector() again, removed lightingdata assignment.
2018-01-28 21:25:19 +01:00
Rachael Alexanderson
d17cc884f0
Merge commit 'refs/pull/417/head' of https://github.com/coelckers/gzdoom
2018-01-28 14:43:38 -05:00
Rachael Alexanderson
e094a04073
Merge commit 'refs/pull/416/head' of https://github.com/coelckers/gzdoom
2018-01-28 14:43:35 -05:00
Rachael Alexanderson
4126342bd3
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-28 14:11:37 -05:00
Rachael Alexanderson
89f373b606
Revert "Merge commit 'refs/pull/411/head' of https://github.com/coelckers/gzdoom "
...
This reverts commit 799a308ef7
, reversing
changes made to 038654eb81
.
2018-01-28 13:48:26 -05:00
Marisa Kirisame
5c740551f3
Export sector effect pointers, fix missing pointer assignment on Lighting effect creation.
2018-01-28 19:41:26 +01:00
Marisa Kirisame
f88dced8f8
Fix accidentally removed SectorPlane assignment. Added missing HitVector support.
2018-01-28 17:45:36 +01:00
alexey.lysiuk
11ec3b1de0
Added compatibility option for Demonfear MAP22
...
Bridge beyond red skull door was raising too high
2018-01-28 14:34:31 +02:00
Christoph Oelckers
410749cf67
- compatibility node rebuild for Doom2's MAP25
...
https://forum.zdoom.org/viewtopic.php?f=15&t=59256
2018-01-28 08:44:40 +01:00
Christoph Oelckers
f346709937
- new rocket smoke sprites by Talon1024.
...
The old ones which are from Heretic have been removed as a consequence.
2018-01-28 08:37:56 +01:00
Rachael Alexanderson
73a3f36112
Merge commit 'refs/pull/410/head' of https://github.com/coelckers/gzdoom
2018-01-27 14:27:29 -05:00
Marisa Kirisame
8c41c387d7
Typo fix
2018-01-27 19:36:01 +01:00
Rachael Alexanderson
799a308ef7
Merge commit 'refs/pull/411/head' of https://github.com/coelckers/gzdoom
2018-01-27 13:01:28 -05:00
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
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
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
Marisa Kirisame
d7521c1540
Add GetSector() to the SectorEffect class, allowing read-only access to its m_Sector variable to outside objects.
2018-01-26 18:51:06 +01:00
Rachael Alexanderson
48415266e5
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-26 04:51:17 -05: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
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
4c0dce875f
Merge branch 'fuzz_software' into gzdoom
2018-01-25 19:00:14 +01: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
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
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
69e8c9ec6e
A more "general purpose" line trace function. Far from a complete ZScript interface with Trace(), though.
2018-01-21 10:54:02 +01:00
Rachael Alexanderson
aaccae2cf6
Merge branch 'master' of https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/p_actionfunctions.cpp
2018-01-20 22:13:28 -05:00
Christoph Oelckers
9b40097e48
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-20 22:41:41 +01:00
Jonathan Russell
708d24aba7
- added Screen.getViewWindow function
2018-01-20 21:56:34 +01:00
Rachael Alexanderson
96ad0e757c
- restore reverbedit menu
2018-01-20 13:37:59 -05:00