zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-18 17:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
13949 commits 86 branches 139 tags 124 MiB
Commit graph

12518 commits

Author SHA1 Message Date
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
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
Christoph Oelckers
103aa648cd Re-merge branch 'reverbedit' 2018-01-24 15:30:26 -05:00
Magnus Norddahl
81c6808d2a - Add specular and normal map handling to main.fp 2018-01-23 23:10:28 +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
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
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
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
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
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
2fddea7bed Merge branch 'unsafe_context' 2018-01-20 11:21:52 +01:00
Rachael Alexanderson
1763fb7597 Merge branch 'master' of https://github.com/coelckers/gzdoom 2018-01-20 04:16:35 -05:00
Marisa Kirisame
f06021da11 Backported struct name change from gzdoom branch 2018-01-20 04:15:42 -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
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
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
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
alexey.lysiuk
f28914d1b6 Simplified handling of command line arguments in Cocoa backend 
Empty arguments are no longer ignored
 2018-01-14 11:29:45 +02:00
alexey.lysiuk
09e2326c63 Use dummy uallong() function for all Intel targets 
64-bit Intel targets built with GCC/Clang were using strict memory alignment version of this function
 2018-01-14 10:13:18 +02:00
alexey.lysiuk
72f181be08 Revert "Added partial bounds check for instruction pointer in ACS VM" 
This reverts commit 83cd53c9b1.
 2018-01-14 10:04:13 +02:00
alexey.lysiuk
9b52c18ef6 Improved layout of FMultiPatchTexture::TexPart structure 
Removed "gaps" between members (for 64-bit targets) and initialized them in place
 2018-01-13 12:44:23 +02:00
alexey.lysiuk
d95ac93376 Fixed crash when resolving multipatches with missing textures 
https://forum.zdoom.org/viewtopic.php?t=59088
 2018-01-13 12:41:19 +02:00
alexey.lysiuk
337bbfc88c Custom submenus are no longer removed from altered protected menu 
https://forum.zdoom.org/viewtopic.php?t=59081
 2018-01-12 10:51:14 +02:00
Rachael Alexanderson
fde3d65066 Merge remote-tracking branch 'gzdoom/master' 2018-01-09 19:27:45 -05:00
Rachael Alexanderson
ee9736fbb3 - print out FriendlySeeBlocks on 'info' ccmd 
- not setting FriendlySeeBlocks on UDMF now causes the actor to use its ZScript default
 2018-01-09 15:48:19 -05:00
Rachael Alexanderson
9c189e5d4b - expose a monster's 'friendlyseeblocks' to UDMF 2018-01-09 15:30:45 -05:00
Rachael Alexanderson
68cd0fad76 - fixed crash when entering 'finishgame' in the console outside of a level. 2018-01-09 20:24:25 +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
d97994a2b0 Merge remote-tracking branch 'gzdoom/unsafe_context' 2018-01-09 13:06:50 -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
Rachael Alexanderson
6006e62b04 - fixed crash when entering 'finishgame' in the console outside of a level. 2018-01-08 16:13:35 -05:00
Christoph Oelckers
8667987cd6 - DWaitingCommand needs to serialize its unsafe state. 2018-01-08 18:13:02 +01:00
alexey.lysiuk
6370594e17 Fixed crash on finishgame CCMD before starting new game 
https://forum.zdoom.org/viewtopic.php?t=59045
 2018-01-08 17:16:03 +02:00
alexey.lysiuk
b008426ed7 Added propagation of unsafe execution context to waiting command 
Thanks Edward-san for pointing this out
 2018-01-08 10:41:31 +02:00
Jameson Ernst
e8a7f00b9b Adjust FNF enum to fix FILLZEROS 2018-01-07 23:44:03 +01:00
alexey.lysiuk
059e40e2d5 Prohibited setting of non-mod CVARs from unsafe alias 2018-01-07 15:04:50 +02:00
alexey.lysiuk
f25a5ea2bc Marked a few commands as unsafe 
This process of finding unsafe commands is not complete!
 2018-01-07 15:03:49 +02:00
alexey.lysiuk
6d37a67027 Added unsafe execution context for console commands 
Some console commands are insecure because they access user's file system
Such commands cannot be executed from MENUDEF and KEYCONF aliases
 2018-01-07 15:02:22 +02:00
Rachael Alexanderson
db5d29ac92 Merge branch 'fuzz_software' of https://github.com/dpjudas/dpdoom 2018-01-06 20:55:30 -05:00
Magnus Norddahl
a23e5f49f6 - Add "fuzz software" to GL that renders fuzz like the scaled fuzz mode in the software renderer 2018-01-07 02:29:55 +01:00
Rachael Alexanderson
d0c72392f4 Merge commit 'refs/pull/12/head' of https://github.com/raa-eruanna/qzdoom 2018-01-06 20:07:25 -05:00
Rachael Alexanderson
87069ac8f6 Merge branch 'zmd5' of ../gzdoom 2018-01-06 20:01:39 -05:00
Rachael Alexanderson
9fd78e90ad - export 'GetChecksum' as part of FLevelLocals in ZScript 2018-01-06 19:59:49 -05:00
Marisa Kirisame
8825ede9d1 Added missing vm.h include, moved A_IsPlayingSound to p_actionfunctions.cpp. 2018-01-07 01:19:44 +01:00
Marisa Kirisame
864ec0af9f Exported S_IsActorPlayingSomething and S_GetMSLength to ZScript. 2018-01-07 00:42:37 +01:00
Rachael Alexanderson
d372d8a4e6 Merge remote-tracking branch 'dpdoom/bloom_psprite_fix' 2018-01-06 18:01:17 -05:00
Rachael Alexanderson
d78a164dc6 Merge remote-tracking branch 'dpdoom/spotlights' 2018-01-06 18:00:53 -05:00
Rachael Alexanderson
ed4079c480 Merge remote-tracking branch 'gzdoom/master' 2018-01-06 18:00:45 -05:00
Magnus Norddahl
56db2b02cc - Fix psprite not appearing when invulnerability effect is active with bloom turned on 2018-01-06 17:21:02 +01:00
alexey.lysiuk
83cd53c9b1 Added partial bounds check for instruction pointer in ACS VM 
This change adds verification of instruction pointer for indirect usages only, i.e. via NEXT...() macros
 2018-01-06 13:26:51 +02:00
alexey.lysiuk
44f01e1dc6 Added bounds check for local variables in ACS VM 2018-01-06 12:13:15 +02:00
Magnus Norddahl
f88d9a02df Remove bloom effect on psprites 2018-01-06 05:11:12 +01:00
alexey.lysiuk
df0cddb35d Do not output empty conversation replies to console 
https://forum.zdoom.org/viewtopic.php?t=58992
 2018-01-05 16:26:31 +02:00
Jonathan Russell
67e3106254 - add the default spotlight apertures in FMapThing 2018-01-04 23:31:10 +00:00
Jonathan Russell
e754fe04ef - removed the 0 check on the UDMF property, so 0 can be a valid aperture 2018-01-04 23:22:45 +00:00