Commit graph

2917 commits

Author SHA1 Message Date
Rachael Alexanderson
7cd66f5132 Merge branch 'master' of https://github.com/coelckers/gzdoom 2018-01-26 23:20:32 -05: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
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
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
Christoph Oelckers
dbf0a68b02 Merge commit '67e3106254e987f5acb9534e725d4f5c3eaa82b2'
# Conflicts:
#	src/doomdata.h
#	src/namedef.h
#	src/p_udmf.cpp
2018-01-20 19:07:54 +01:00
Rachael Alexanderson
6df936e0a0 - remove A_IsPlayingSound 2018-01-20 19:01:47 +01:00
Marisa Kirisame
a01ca4c3a1 Exported S_IsActorPlayingSomething and S_GetMSLength to ZScript.
Added missing vm.h include, moved A_IsPlayingSound to p_actionfunctions.cpp.

- make A_IsPlayingSound ui only
2018-01-20 19:01:47 +01:00
Rachael Alexanderson
88a5c997de Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	wadsrc/static/zscript/menu/optionmenuitems.txt
2018-01-20 11:52:31 -05:00
Major Cooke
d5d393aaf2 - Added GetRadiusDamage. Returns the raw calculated explosion damage falloff by distance only.
- Split off both explosion damage calculations into P_Get(Old)RadiusDamage functions for ease of maintenance.
2018-01-20 18:45:01 +02:00
Christoph Oelckers
2d8e394529 Merge branch 'master' into reverbedit
# Conflicts:
#	wadsrc/static/zscript/menu/optionmenuitems.txt
2018-01-20 11:44:42 +01:00
Christoph Oelckers
94720f8a96 - replaced DBIGFONT and SBIGFONT in gzdoom.pk3 with the one from Ultimate Simplicity, which comes with permission to reuse.
The original copyrighted fonts have been moved to the 'extra' PK3.
2018-01-20 11:33:06 +01:00
Rachael Alexanderson
1763fb7597 Merge branch 'master' of https://github.com/coelckers/gzdoom 2018-01-20 04:16:35 -05:00
Marisa Kirisame
fa8ebf9ca4 A more "general purpose" line trace function. Far from a complete ZScript interface with Trace(), though. 2018-01-20 04:15:42 -05:00
Christoph Oelckers
19cf887ad1 - fixed: Dynamic arrays for object pointers need different treatment than arrays for regular pointers, because they require GC::WriteBarrier to be called. 2018-01-19 19:49:42 +01:00
Rachael Alexanderson
88fbf92018 Merge branch 'master' of https://github.com/coelckers/gzdoom 2018-01-18 10:27:42 -05:00
alexey.lysiuk
f629678320 Fixed const correctness for secplane structure
https://forum.zdoom.org/viewtopic.php?t=59151
2018-01-18 15:34:56 +02:00
alexey.lysiuk
23c50540f6 Added missing fields to StrifeDialogueNode ZScript definition
https://forum.zdoom.org/viewtopic.php?t=59091
2018-01-13 13:13:38 +02:00
alexey.lysiuk
d9ddd50c98 Disabled interpolation point "thinking"
https://forum.zdoom.org/viewtopic.php?t=59087
2018-01-12 18:27:19 +02:00
Rachael Alexanderson
39cee3a081 - revert 24d468e..e1a0b5e 2018-01-09 19:25:07 -05:00
Christoph Oelckers
be82f3ef56 - TapwaveZodiac's submission for:
* Improved French translation, also covers previously missing strings.
* Adds a string for Borderless Windowed.
* Adds option to enable or disable borderless windowed for Windows only.

These commits had to be manually recreated because somehow the files appaarently ended up with CRLF in the repo which can cause problems with Windows Git and line ending normalization on.
2018-01-09 20:30:33 +01:00
Rachael Alexanderson
36b6253c3d Merge branch 'FriendlySeeBlocks' into zmd5 2018-01-09 13:55:09 -05:00
Rachael Alexanderson
5c1824d596 Merge remote-tracking branch 'gzdoom/master' 2018-01-09 13:07:03 -05:00
Rachael Alexanderson
232c8e0f4b Merge remote-tracking branch 'gzdoom/FriendlySeeBlocks' 2018-01-09 13:06:57 -05:00
Rachael Alexanderson
7416f42b47 - add 'FriendlySeeBlocks' actor property that allows a modder to expand the maximum radius that a friendly monster can see enemies. 2018-01-09 12:34:12 -05:00
TapwaveZodiac
e1a0b5e1d3 Adds option to enable or disable borderless windowed for Windows only. 2018-01-09 17:55:30 +01:00
TapwaveZodiac
bf64cbc3ad Adds a string for Borderless Windowed. 2018-01-09 17:55:30 +01:00
TapwaveZodiac
24d468e8fd Add files via upload
Improved French translation, also covers previously missing strings.
2018-01-09 17:55:30 +01:00
Blue Shadow
f68d90accb Fixed a case of infinite loop in A_BrainDie 2018-01-08 11:50:01 -05:00
Jameson Ernst
e8a7f00b9b Adjust FNF enum to fix FILLZEROS 2018-01-07 23:44:03 +01:00
alexey.lysiuk
80ef547d3c Fixed potential compilation issue with software fuzz shader
Use array constructors because initializer list is a core feature since OpenGL 4.2
2018-01-07 10:55:53 +02:00