zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,233 Commits 86 Branches 139 Tags 124 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
Rachael Alexanderson 32287511e2 - change type 9854 to SpotLightFlickerRandomAttitive since its old definition was just a duplicate of another one. 2018-02-04 04:11:02 -05:00
Jonathan Russell acf83c2a74 - fixing the last commit... 2018-01-04 23:13:14 +00:00
Jonathan Russell 254501d3e8 - fixing last commit, which didn't seem to work correctly 2018-01-04 23:09:48 +00:00
Jonathan Russell 7f7c720883 - added UDMF properties for spotlights (args have all been used up for dynlights) 2018-01-04 22:41:57 +00:00
Rachael Alexanderson 30c6cf82ca - added ability to change slider color using mapinfo's gameinfo 2017-10-14 13:05:15 -04:00
alexey.lysiuk e1dddf8c3e Removed obsolete mapinfo entry from common Doom GAMEINFO definition 2017-07-30 12:24:04 +03:00
Rachael Alexanderson 72517244be - set bluramount to 0 by default 2017-07-02 17:08:01 -04:00
Rachael Alexanderson 7600fdb200 Merge https://github.com/coelckers/gzdoom 2017-05-22 13:10:19 -04:00
Christoph Oelckers 42e62d9005 - fixed: Harmony requires special scaling treatment for the fullscreen HUD's icons. 2017-05-21 21:30:46 +02:00
Rachael Alexanderson a59336908c Merge https://github.com/coelckers/gzdoom 2017-05-02 03:13:40 -04:00
Christoph Oelckers 050acc9271 - added rudimentary support for SVE.wad from the Strife Veteran edition so that the extended single player campaign is usable: 
* all new things got either an sctor definition or are explicitly deleted through the 'doomednums' section in MAPINFO. CTC related actors are non-functional!
* added a 'noskillflags' option to 'doomednums' so that the lightmap definition things in the maps can be repurposed as dynamic lights.
* added the new dagger powerup.
* added MAPINFO entries for the added maps.
 2017-05-01 21:25:54 +02:00
Rachael Alexanderson 997a62de36 Merge https://github.com/coelckers/gzdoom 2017-04-14 23:09:21 -04:00
Christoph Oelckers edebea4f8d - allow specifying a custom class for message box display. 2017-04-14 23:28:54 +02:00
Rachael Alexanderson 9da596cd9c Merge https://github.com/coelckers/gzdoom 2017-03-28 16:29:07 -04:00
Christoph Oelckers b9485d4edf - ported the Hexen status bar to zscript. 
Note that DrawBar with a background texture does not work yet because the clipping rectangle is not done yet.
 2017-03-28 11:00:05 +02:00
Christoph Oelckers a6bf93c624 - implemented the Heretic status bar. 2017-03-27 21:01:40 +02:00
Rachael Alexanderson 2338fe7e66 Merge commit 'c8eabe5' 2017-03-26 21:57:23 -04:00
Christoph Oelckers 488fface50 - started port of Doom status bar to ZScript. 
Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
 2017-03-25 21:40:17 +01:00
Christoph Oelckers 3e67a8bafa - let hud_scale act like an override to uiscale, just like con_scale does. 
- better handling of ForceScale for the fullscreen HUD that doesn't mess around with CVARs.
- moved the mug shot into the status bar, because this is global state that needs to be shared between different pieces of code which want to display a mug shot.
- SBARINFO should work off the current status bar settings instead of the ones stored in its script object
 2017-03-25 18:32:47 +01:00
Rachael Alexanderson b747b0c3c6 - made gl_menu_blur into a menu option 
- made bluramount also into a gameinfo option
- negative gl_menu_blur cvar now uses gameinfo option, 0 disables it
- removed gl_menu_blur_enabled since gl_menu_blur==0 does that anyway
- made gl_menu_blur default to -1 to use gameinfo option
- add default gameinfo bluramount options
 2017-03-24 14:59:25 -04:00
Christoph Oelckers 622b4a6457 - switched over to the scripted intermission screens. 2017-03-18 21:19:32 +01:00
Rachael Alexanderson a5edd421bd - Added Deejay's par times for Thy Flesh Consumed 2017-01-16 19:17:22 +01:00
Christoph Oelckers 1e950d75bd - made dynamic light attenuation completely opt-in. This can be done either by setting a MAPINFO option for lights that do not automatically specify it and with a light property. The light property will always take precedence, if set. 2016-12-07 23:17:18 +01:00
Christoph Oelckers fbc8d0e83c Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 
# Conflicts:
#	wadsrc/static/zscript.txt
 2016-12-03 18:51:10 +01:00
Christoph Oelckers 211d9d92a1 Merge branch 'master' into zscript 2016-12-02 21:14:56 +01:00
Christoph Oelckers 87d2991256 - removed all cluster music definitions so that the default from the gameinfo section can be used to change it. 2016-12-02 20:13:30 +01:00
Christoph Oelckers 6e223ebc21 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 
# Conflicts:
#	src/CMakeLists.txt
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/decorate.txt
 2016-11-15 11:36:59 +01:00
Christoph Oelckers 9e2830a3db - converted the rest of actors/shared. 
- moved damagetype definitions to MAPINFO. These were in DECORATE which is not correct. The old code is left for compatibility.
 2016-10-14 10:46:15 +02:00
Christoph Oelckers a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master' 
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
 2016-03-01 18:50:45 +01:00
Randy Heit 55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Christoph Oelckers f8e5a0ebf0 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/g_doomedmap.cpp
#	src/info.h
#	src/p_saveg.cpp
#	src/p_setup.cpp
#	src/p_spec.cpp
#	src/r_defs.h
#	wadsrc/static/mapinfo/eternity.txt
#	wadsrc/static/xlat/eternity.txt
 2016-02-06 00:41:00 +01:00
Christoph Oelckers e88901f4b7 - added the EE-Extradata parser I wrote for GZDoom so I can use the Vaporware demo map for testing portal stuff. 2016-02-05 23:51:28 +01:00
Christoph Oelckers 4267e3c40b Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-30 01:08:35 +01:00
Christoph Oelckers 409525cde6 - removed some overlooked 'player5start' entries in GAMEINFO sections. 
This property no longer exists, these are now being set in the 'doomednums' block.
 2016-01-29 22:09:16 +01:00
Christoph Oelckers 76b0971067 Merge branch 'master' into edf-gl 2016-01-10 10:31:00 +01:00
Christoph Oelckers 4fd0a726b1 - more work on EDF handling. Vaporware demo is now loading. 2016-01-10 10:05:06 +01:00
Christoph Oelckers 1b20a06ec4 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-06 17:16:06 +01:00
Christoph Oelckers a5a069a4b0 - use DMENUPIC as titlepic in doom2bfg. 2016-01-05 14:06:07 +01:00
Christoph Oelckers 0e9eb2f305 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 11:55:07 +01:00
Christoph Oelckers bd95c5eadf - fixed: the ambient sound things need both the args from the DoomEdNum mapping and the actual map. 2016-01-04 11:52:07 +01:00
Christoph Oelckers 37e8221067 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-15 22:07:10 +01:00
Christoph Oelckers af2ce6ef42 - fixed: The 'mindefaults' game configuration must define the player starts 5-8. 2015-12-14 09:06:13 +01:00
Christoph Oelckers fbefe13bb2 Merge branch 'master' of https://github.com/rheit/zdoom 2015-06-04 09:27:17 +02:00
Christoph Oelckers 0b3a22d6d2 - fixed: The ending flat for No Rest For The Living was wrong. 2015-05-26 09:03:53 +02:00
Christoph Oelckers b4cdcef159 Merge branch 'zmaster' 2015-04-27 18:20:37 +02:00
Christoph Oelckers 98029a12ec Merge branch 'master' of https://github.com/rheit/zdoom into zmaster 2015-04-27 18:19:44 +02:00
Christoph Oelckers ae16e5d195 - Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition. 2015-04-27 18:18:46 +02:00
Christoph Oelckers 6b1e7522e6 - Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition. 2015-04-27 15:14:01 +02:00
Christoph Oelckers d46ba7bfb7 - added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.) 2015-04-27 10:24:49 +02:00
Christoph Oelckers fe769bbdc5 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-08 00:40:40 +02:00