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
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
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
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
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
Jan Engelhardt
3f45f938d6
Update LZMA SDK to version 17.01
2018-01-21 10:53:40 +01:00
Neil McPhail
ded0c7805d
Fix failure to write under ~/ in confinement
...
When running in a confined environment (such as a snap) it may not be
possible to write to directories such as ~/.config. By using the $HOME
variable instead of the '~' shortcut, the confined environment can pass
an alternative 'home' directory with write privelges.
I have only changed this for posix/unix and haven't touched code for
MacOS, as I don't know if that behaves differently
2018-01-21 10:52:42 +01:00
Christoph Oelckers
56e2db38fd
- Use FName instead of FString to store arg0str in FMapThing.
...
This is because FMapThing gets memset to 0 and changing that would cause more work than it is worth to keep the string. The only thing it is used for is the color for dynamic lights and those do not need case sensitivity so a name will just do as well, but require less adjustments elsewhere.
2018-01-21 09:10:04 +01:00
Christoph Oelckers
c93d025088
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-21 08:57:29 +01:00
Rachael Alexanderson
8b3cc6a617
- remove redundant vm.h include in events.cpp
2018-01-21 01:02:00 -05:00
Magnus Norddahl
0f69778e23
- Add new material shader entries for specular and PBR light modes
2018-01-21 01:53:44 +01:00
Magnus Norddahl
4dd2d789f4
- Rename mTextureEffects to mMaterialShaders to help distinguish between those and effect shaders (mEffectShaders)
...
- Add MaterialShaderIndex enum
2018-01-21 01:19:16 +01:00
Christoph Oelckers
9b40097e48
Merge branch 'master' of https://github.com/coelckers/gzdoom
2018-01-20 22:41:41 +01:00
Christoph Oelckers
6aaf5df617
- reworked spot lights to receive all relevant information through the args.
...
As a bonus, arg0str can now be used for all dynamic lights to pass a color in textual form, including X11R6RGB-names.
2018-01-20 22:41:28 +01:00
Jonathan Russell
708d24aba7
- added Screen.getViewWindow function
2018-01-20 21:56:34 +01: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
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
Magnus Norddahl
f3c55c01c8
Add material definition to GLDEFS
2018-01-20 16:28:24 +01:00
alexey.lysiuk
c840368446
Fixed compilation warnings reported by GCC/Clang
...
src/s_environment.cpp:908:6: warning: variable 'v' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
src/s_environment.cpp:908:26: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
src/s_environment.cpp:934:26: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
2018-01-20 14:59:29 +02:00
Christoph Oelckers
16461e0d59
Merge branch 'reverbedit'
2018-01-20 13:06:26 +01:00
alexey.lysiuk
7a1ec9ab9d
Applied values to latched CVARs in correct order
...
https://forum.zdoom.org/viewtopic.php?t=59159
2018-01-20 13:53:13 +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
Christoph Oelckers
2fddea7bed
Merge branch 'unsafe_context'
2018-01-20 11:21:52 +01:00
alexey.lysiuk
b5006bbee4
Fixed potential compilation error in ACS loader
...
https://forum.zdoom.org/viewtopic.php?t=59164
2018-01-20 10:34:07 +02:00
Christoph Oelckers
2720e36a2c
- marked a few more CCMDs unsafe.
2018-01-20 09:11:28 +01:00
Christoph Oelckers
4cf5977b56
Merge branch 'master' into unsafe_context
2018-01-20 08:53:00 +01: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
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
6d20da8ab5
Fixed nust -> must typos
2018-01-18 11:43:32 +02:00
alexey.lysiuk
56f656516d
Fixed rare crash when menu is closed from Ticker() function
...
https://forum.zdoom.org/viewtopic.php?t=59112
2018-01-16 11:00:48 +02:00
Christoph Oelckers
13c4e58c3d
- simplified IgnoreMIDIVolume.
...
The XP related check had already been deactivated but not removed.
2018-01-14 10:48:26 +01:00