zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 20:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
5832 commits 131 branches 149 tags 201 MiB
Commit graph

1105 commits

Author SHA1 Message Date
Edward Richardson
9e68983b44 Added standard teleports to line prediction 
- Added standard teleports to line prediction
- Menudef for line special prediction
 2014-09-26 15:48:45 +12:00
Edward Richardson
6cd4fd8151 Added menu options for network settings 2014-09-26 15:48:44 +12:00
Edward Richardson
97586c317e Further refinements to network balancing 
- Added delay times of all players to the scoreboard
- Removed balancing from packet-server (tried it, didn't work)
- Calculations remove an extra tic to account for possible bias
 2014-09-26 15:48:42 +12:00
Edward Richardson
542b8a7171 Added network load balancing 
- Guests can now attempt to match latency with the arbitrator.
(net_loadbalance)
- Added althud feature to show arbitrator and local latency.
(hud_showlag 1 is on for netgames, 2 is always on)
 2014-09-26 15:48:42 +12:00
MajorCooke
b1f87295b8 - Added A_DamageSelf. 
- A_DamageSelf(int amount, name damagetype)
 2014-09-25 16:47:41 -05:00
Chris Robinson
b8e3f99ce6 Merge remote-tracking branch 'zdoom/master' into openal 
Conflicts:
	src/s_sound.cpp
 2014-09-22 18:24:55 -07:00
Christoph Oelckers
4682736585 - fixed: non-tiled mid textures on a fog boundary require some special clamping to be performed in the shader. 2014-09-21 11:08:17 +02:00
Christoph Oelckers
cbf353ca52 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-21 08:12:32 +02:00
MajorCooke
44683657f2 - Added jpalomo's A_SetSpeed patch. 2014-09-20 17:34:57 -05:00
Christoph Oelckers
835dbe5bd0 - removed the 'layout' qualifier from the uniform buffer declaration. It's not really needed because the layout of a single vec4 array cannot possibly change, and Intel drivers are complaining for unknown reasons. 2014-09-20 09:10:01 +02:00
MajorCooke
33f83cc7f9 Added Blue Shadow's A_SpawnItemEx changes: (2/2) 
SXF_TRANSFERALPHA and SXF_TRANSFERRENDERSTYLE
 2014-09-19 14:17:24 -05:00
Christoph Oelckers
07ef7d3d59 Merge branch 'master' into v2.x 2014-09-14 23:07:30 +02:00
Christoph Oelckers
60ff6c5f07 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-14 23:06:57 +02:00
Chris Robinson
cd46f95902 Merge remote-tracking branch 'zdoom/master' into openal 2014-09-13 11:52:47 -07:00
Christoph Oelckers
f9741f1047 - added a compatibility option for Hexen's MAP04 to change the z-position of 4 quartz flasks that get lowered into a pool of lava but were incorrectly positioned 48 map units above the floor. 2014-09-13 12:20:06 +02:00
Chris Robinson
ff6eb6df5c Merge remote-tracking branch 'zdoom/master' into openal 
Conflicts:
	src/s_sound.cpp
 2014-09-09 14:45:53 -07:00
Christoph Oelckers
acf6c259d8 - changed the handling of alpha textures. The only special case they need is with palette-less textures and this can be handled far more easily and robustly with a predefined translation instead of passing another parameter through all the layers of the texture management code. This also fixes problems with paletted PNGs that get used as an alpha texture because the old method clobbered the image's palette. 2014-09-09 13:21:36 +02:00
Christoph Oelckers
d5633701b4 - swapped order of textures in burn shader to avoid some problems with the texture samplers. 
- fixed: texture sampler state for the burn texture was never set.
 2014-09-09 10:17:44 +02:00
Christoph Oelckers
9b8869e78d Merge branch 'master' into v2.x 
Conflicts:
	src/gl/textures/gl_material.cpp
 2014-09-09 01:30:11 +02:00
Christoph Oelckers
86d9c7ec8e - add some compatibility settings to fix rendering glitches in BTSX_E1 MAP12. 2014-09-09 01:27:41 +02:00
Christoph Oelckers
0ff061b928 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-08 22:55:37 +02:00
Christoph Oelckers
3d2646cbae Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-08 13:02:39 +02:00
Christoph Oelckers
cfd24f438f - jpalomo's A_Saw flags submission. 2014-09-08 13:02:05 +02:00
Braden Obrzut
49382a2a14 - Added detection for The Adventures of Sqaure (based off MTrop's submission). 
- IWADINFO no longer requires a mapinfo to be specified.
 2014-09-04 19:36:08 -04:00
Christoph Oelckers
b96dd6c421 - fixed: The missing fourth component of the texture coordinate must be filled with 1.0, not 0.0 before applying the texture matrix. Not doing so will cancel out the translation part of the matrix. 2014-09-02 10:31:48 +02:00
Christoph Oelckers
12160bd29c - remove some obsolete code from decal rendering. 
- avoid rebinding the same texture multiple times, as there's considerable overhead in the texture manager.
- check gl_sort_textures only once per scene, not per draw list.
 2014-08-30 15:34:14 +02:00
Christoph Oelckers
8f238f8d32 - fixed: the Revenant's frame duration in its missile state were wrong. 2014-08-27 11:06:12 +02:00
Christoph Oelckers
7a727b6807 Merge branch 'master' into v2.x 2014-08-21 13:44:41 +02:00
Christoph Oelckers
816999109e Merge branch 'master' of https://github.com/rheit/zdoom 2014-08-21 13:42:43 +02:00
Christoph Oelckers
eebd5c9d4d - fixed bad edit in linedef translation. 2014-08-21 13:38:47 +02:00
Christoph Oelckers
df0d3543a8 - fixed: *ALL* original ceiling crushers, not just type 49, require a distance of 8 to the floor for the destination height. For the silent types this required a new action special, Ceiling_CrushAndRaiseSilentDist. This change only affects the XLAT mapping, the Hexen format types behave as before. 
- removed the redundant internal ceilCrushAndRaiseDist ceiling movement type. It was precisely the same as ceilCrushAndRaise in all details.
 2014-08-21 13:01:12 +02:00
Christoph Oelckers
c98e3ca99d Merge branch 'master' into v2.x 2014-08-03 10:58:41 +02:00
Christoph Oelckers
1b55c17379 Merge branch 'master' of https://github.com/rheit/zdoom 2014-08-03 10:08:05 +02:00
Christoph Oelckers
a1b579e5fc - added menu entry for newly added hud_showweapons CVAR. 2014-08-03 01:20:12 +02:00
Christoph Oelckers
a8e9c1832f - decided to restrict the 2.0 beta to OpenGL 4.x with GL_ARB_buffer_storage extension and removed all code for supporting older versions. 
Sadly, anything else makes no sense.
All the recently made changes live or die, depending on this extension's presence.
Without it, there are major performance issues with the buffer uploads. All of the traditional buffer upload methods are without exception horrendously slow, especially in the context of a Doom engine where frequent small updates are required.
It could be solved with a complete restructuring of the engine, of course, but that's hardly worth the effort, considering it's only for legacy hardware whose market share will inevitably shrink considerably over the next years.
And even then, under the best circumstances I'd still get the same performance as the old immediate mode renderer in GZDoom 1.x and still couldn't implement the additions I'd like to make.

So, since I need to keep GZDoom 1.x around anyway for older GL 2.x hardware, it may as well serve for 3.x hardware, too. It's certainly less work than constantly trying to find workarounds for the older hardware's limitations that cost more time than working on future-proofing the engine.

This new, trimmed down 4.x renderer runs on a core profile configuration and uses persistently mapped buffers for nearly everything that is getting transferred to the GPU. (The global uniforms are still being used as such but they'll be phased out after the first beta release.
 2014-08-01 22:42:39 +02:00
Christoph Oelckers
7967082e60 - use the light buffer to handle dynamic lighting. 2014-08-01 20:59:39 +02:00
Christoph Oelckers
01a1e10084 Merge branch 'master' into Glew_Version_For_Real 2014-07-31 00:59:56 +02:00
Christoph Oelckers
09ae52e26b Merge branch 'master' of https://github.com/rheit/zdoom 2014-07-31 00:44:59 +02:00
Christoph Oelckers
ef8f66c9a1 - removed the code for hardware alpha testing again because it didn't work anymore with how things are set up now. 
- we need to check all GL versions when trying to get a context because some drivers only give us the version we request, leaving out newer features that are not exposed via extension.
- added some status info about uniform blocks.
 2014-07-30 23:13:16 +02:00
Randy Heit
ea7ba9dba3 Add per-actor friction 
- This is multiplied by the sector's friction.
- This is intentionally not serialized yet, while awaiting feedback.
 2014-07-28 23:15:50 -05:00
Christoph Oelckers
754c96a540 - added default precision settings to shader include because some old ATI drivers complain if they aren't there - even though the spec doesn't require them... 2014-07-27 16:09:47 +02:00
Chris Robinson
7e7219a84b Merge remote-tracking branch 'zdoom/master' into openal 2014-07-27 06:59:26 -07:00
Christoph Oelckers
6d4eb7f62d - changed handling of DF_NO_COOP_WEAPON_SPAWN dmflag so that weapons are not determined by class type but by a newly added flag WEAPONSPAWN, to allow CustomInventory replacements to act like weapons when being spawned. 2014-07-27 10:07:37 +02:00
Christoph Oelckers
637aa9d77e - some adjustments to allow testing the different rendering methods. 2014-07-26 18:43:54 +02:00
Christoph Oelckers
0e647e0f2b Merge branch 'master' into Glew_Version_For_Real 2014-07-26 10:37:00 +02:00
Christoph Oelckers
8465a5f5d7 Merge branch 'master' of https://github.com/rheit/zdoom 2014-07-26 10:23:41 +02:00
Christoph Oelckers
a21f01bc5f - added jpalomo's submission to make freelook a 3-state setting, like crouch and jump. This required moving around the flags a bit so demo compatibility had to be bumped. It may also require adjustment for launchers that can set the dmflags. 2014-07-26 10:15:07 +02:00
Christoph Oelckers
f64428dd2a Merge branch 'master' into Glew_Version_For_Real 2014-07-17 09:31:18 +02:00
Christoph Oelckers
b78b566b0a Merge branch 'master' of https://github.com/rheit/zdoom 2014-07-17 09:30:50 +02:00
Christoph Oelckers
eb9d2d9917 - reactivate compatibility profile so that immediate mode drawing can be used on older hardware not supporting persistently mapped buffers. 
- reactivate alpha testing per fixed function pipeline
- use the 'modern' way to define clip planes (GL_CLIP_DISTANCE). This is far more portable than the old glClipPlane method and a lot more robust than checking this in the fragment shader.
 2014-07-17 02:37:18 +02:00
Chris Robinson
e8233d7e87 Merge remote-tracking branch 'zdoom/master' into openal 2014-07-16 08:31:12 -07:00
Braden Obrzut
bd5bf2a40a - Expand environment variables for autoload paths. 
- Forgot to save the French translation file for the last commit, so a few more corrections there.
 2014-07-15 21:26:26 -04:00
Braden Obrzut
bfbea40415 - Fixed some typos with chex quest obituaries and French translation error. 2014-07-15 21:20:05 -04:00
Christoph Oelckers
b8bcbe819b - removed texture based dynamic lighting. For GL 3.x the shader approach is always better. 
- fixed: sky fog was not unset.
 2014-07-15 20:49:21 +02:00
Christoph Oelckers
fc0cf4f998 - GZDoom now runs on an OpenGL core profile. :) 
It's probably still necessary to replace GLEW with another loader library. GLEW is pretty much broken on core OpenGL without some hacky workarounds...
 2014-07-15 02:26:23 +02:00
Christoph Oelckers
6046b11b4f - all shaders now compile in core profile. 2014-07-15 01:05:53 +02:00
Christoph Oelckers
eedc5a69be - replaced builtin position vertex attribute. 2014-07-15 01:02:48 +02:00
Christoph Oelckers
1b7f5a2e6a - replaced builtin texture coordinate vertex attribute. 2014-07-15 00:59:01 +02:00
Christoph Oelckers
5a322742c3 - remove use of builtin and deprecated color vertex attribute. 2014-07-15 00:37:13 +02:00
Christoph Oelckers
5193f6cfef - remove use of builtin deprecated varyings in shaders. 2014-07-15 00:19:41 +02:00
Christoph Oelckers
ed8a21fd86 - replaced deprecated alpha testing with shader code. 2014-07-14 21:14:43 +02:00
Christoph Oelckers
84a49e37ee - handle normals for spheremapped mirror surfaces using non-deprecated features. 
- move all WGL references out of global header files so that global wgl header include is no longer necessary
 2014-07-14 19:54:07 +02:00
Christoph Oelckers
ce3653f6e1 - remove all uses of builtin matrices. 2014-07-13 23:13:40 +02:00
Christoph Oelckers
dbb05c5f33 - remove use of builtin texture matrices. 
- make matrix class single precision.
 2014-07-13 20:41:20 +02:00
Christoph Oelckers
00fcf4bc06 - for some reason using world coordinates for clipping in the shader is somewhat imprecise so the clip plane heights have to be adjusted a bit for it. 2014-07-13 13:25:42 +02:00
Christoph Oelckers
60dc2e1122 - some shader fixes. 2014-07-13 13:01:35 +02:00
Christoph Oelckers
d868f60f6c - since the clip planes for plane mirrors did not work anymore I reimplemented them using shader based logic. It still needs to be seen if this affects performance on older hardware. 2014-07-13 12:14:12 +02:00
Christoph Oelckers
a936629cec - use default fragment shader for burn and stencil shader, with the time consuming parts disabled by a #define, to avoid code duplication. 2014-07-10 10:33:07 +02:00
Christoph Oelckers
f710518903 - use a uniform array to store vertex data to render dynamic stuff on GL 3.x hardware without the ARB_buffer_storage extension. 
Due to the way the engine works it needs to render a lot of small primitives with frequent state changes.
But due to the performance of buffer uploads it is impossible to upload each primitive's vertices to a buffer separately because buffer uploads nearly always stall the GPU.
On the other hand, in order to reduce the amount of buffer uploads all the necessary state changes would have to be saved in an array until they can finally be used. This method also imposed an unacceptable overhead.
Fortunately, uploading uniform arrays is very fast and doesn't cause GPU stalls, so now the engine puts the vertex data per primitive into a uniform array and uses a static vertex buffer to index the array in the vertex shader.
This method offers the same performance as immediate mode but only uses core profile features.
 2014-06-30 18:10:55 +02:00
Christoph Oelckers
1efc2938b7 - implement model vertex buffer and draw MD2 models using it instead of using the GLCommands from the model. 2014-06-29 23:24:16 +02:00
Christoph Oelckers
9d1dbf4eab - fixed: FBufferedUniform1f didn'T work because it used an int as its buffered value. 2014-06-29 14:08:44 +02:00
Christoph Oelckers
ffcb6cb70a - added second vertex coordinate attribute for model interpolation. 2014-06-29 11:00:21 +02:00
Christoph Oelckers
08054ddc34 Merge branch 'master' into Glew_Version_For_Real 2014-06-29 08:53:43 +02:00
Chris Robinson
1a40c95f84 Rename some FMOD references to be generic sound system 
Since they relates to other sound backends as well, there's no need to single
out FMOD in these places.
 2014-06-26 16:58:18 -07:00
Chris Robinson
d761dd1ff6 Merge remote-tracking branch 'zdoom/master' into openal 2014-06-25 17:37:20 -07:00
Christoph Oelckers
e15f80f640 Merge branch 'master' of https://github.com/rheit/zdoom 2014-06-23 09:27:30 +02:00
Christoph Oelckers
e56e525d0f - A_FireCustomMissile transfer tranlsation flag, code submission by jpalomo 2014-06-22 08:55:21 +02:00
Christoph Oelckers
6457ced53f Merge branch 'master' into Glew_Version_For_Real 2014-06-19 11:57:36 +02:00
Christoph Oelckers
d30bf6768e Merge branch 'master' of https://github.com/rheit/zdoom 2014-06-19 11:20:38 +02:00
Chris Robinson
b94a2949e5 Don't use air absorption for being underwater 2014-06-18 23:41:45 -07:00
Chris Robinson
cd550cf9b6 Merge remote-tracking branch 'origin/master' into openal 2014-06-17 22:08:03 -07:00
Edward Richardson
a3a7ee569f Multi-intermission waits for all players + changes 
- Added a segment of code that now makes the intermission wait for all
players before advancing, instead of continuing on any player. A "ready
icon" shows to reflect this.

- The Deathmatch intermisson couldn't show the ready icon (because it
just used the ingame scoreboard), so a proper intermission was added,
which reflects the same design as the coop scoreboard.

- The colour column wasted more space then it should have needed, so it
was replaced with player colour backgrounds.

- Slight y offset adjustments to make everything fit in 320x200
properly.
 2014-06-17 19:46:10 +12:00
Chris Robinson
7ff7c151a8 Merge remote-tracking branch 'origin/master' into openal 
Conflicts:
	src/CMakeLists.txt
 2014-06-15 12:04:15 -07:00
Christoph Oelckers
2ad47935ef Merge branch 'master' into Glew_Version_For_Real 2014-06-01 12:43:17 +02:00
Christoph Oelckers
7fedaf9221 Merge branch 'master' of https://github.com/rheit/zdoom 2014-06-01 12:39:13 +02:00
Edward Richardson
e8513a64ed Rebuild nodes for hellfact map04 2014-06-01 15:32:43 +12:00
Christoph Oelckers
3c5d07e9c6 Merge branch 'master' of https://github.com/rheit/zdoom 2014-05-31 11:05:44 +02:00
Christoph Oelckers
8f5683e23d - moved secret found message to string table and removed the CVAR crutch that dates from a time when modifying string table content wasn't as easy as it is now. 
- added 'showsecretsector' CVAR to show the sector number with the secret found message.
 2014-05-29 17:50:14 +02:00
Christoph Oelckers
39775cc904 - mystery of desaturation shader solved: The old code passed '1-desaturation' to the shader, the new code 'desaturation', so for the 'mix' function to work its arguments must be swapped. 2014-05-21 15:25:25 +02:00
Christoph Oelckers
54425ee2ef - fixed: Desaturation factor was applied incorrectly. 
- Also fixed some very strange thing in the shader's desaturate function. For unknown reasons using the 'mix' function there did not work.
- fixed: The fog boundary special shader could not be used.
 2014-05-21 13:40:46 +02:00
Christoph Oelckers
6e6be8ed5b Merge branch 'master' into Glew_Version_For_Real 2014-05-18 12:47:48 +02:00
Christoph Oelckers
4e64ad847b Merge branch 'master' of https://github.com/rheit/zdoom 2014-05-15 09:46:47 +02:00
Christoph Oelckers
802a478766 - Heretic doesn't really need dontcrunchcorpses because there was already some alternative handling for that situation. 2014-05-14 14:03:15 +02:00
Christoph Oelckers
51ed68dc72 - forgot to save this... 2014-05-14 13:02:04 +02:00
Christoph Oelckers
388f09f786 - fixed: In Heretic corpses do not get crunched to gibs, they just get their size reduced to 0. Handled by a new gameinfo flag. This also gets set for Chex quest which has the gib sprite replaced by something different. Using a Crush state will override this global flag. 2014-05-14 12:54:03 +02:00
Christoph Oelckers
cf45f2d718 - added missing shader files. 2014-05-12 22:24:26 +02:00
Christoph Oelckers
4d005bdfa0 shader rework 
All those special shaders have been merged together.
Mostly working but the non-shader lighting seems a bit broken.
 2014-05-12 14:45:41 +02:00
Christoph Oelckers
b9a6fe80a4 Do not use the shader to handle STYLEF_RedIsAlpha. 
Turns out that the name doesn't accurately describe what it does.
It is correct for images that come with their own palette or are true color.
But for images using the game palette it doesn't use the red channel to determine translucency but the palette index! Ugh...

This means it cannot be done with a simple operation in the shader because it won't get a proper source image. The only solution is to create a separate texture.
 2014-05-11 23:56:53 +02:00
Christoph Oelckers
7793bbbcc9 Further cleanup of lighting code. 
- remove thing color from lighting calculations.
- implement alpha textures and inverse sprites for infrared as texture modes. This still requires some handling for the alpha texture mode for non-shader rendering because there is no way in the fixed pipeline to do it. The inverted texture effect can be done with a texture combiner.
- fixed: ThingColor for sprites was set in the wrong place. It must be in the Process function, not in the lighting calculation.
- added functions for isolated calculation of sprites' dynlight color.
 2014-05-11 17:56:38 +02:00
Christoph Oelckers
52056a05bd - changed handling of DynLight in shader to serve as a global dynamic light color for all lighting modes. 2014-05-11 16:49:17 +02:00
Christoph Oelckers
53f4cd0108 - added objectcolor uniform. This will be used to hold the thingcolor for shader based rendering. 2014-05-11 16:06:25 +02:00
Christoph Oelckers
09f4071436 Ok, it had to be done: Removed shader support for pre GLSL 1.3/GL 3.0 hardware. The compromises needed to accomodate these are just too bad and would block any attempt at streamlining the code. 2014-05-11 13:27:51 +02:00
Christoph Oelckers
b09405a8bd - changed rendering of glowing walls so that it doesn't require an additional vertex attribute, just pass the floor and ceiling planes as uniforms. 2014-05-10 17:09:43 +02:00
Christoph Oelckers
6988156d0f Merge branch 'master' of https://github.com/rheit/zdoom 2014-05-08 09:49:00 +02:00
Christoph Oelckers
63a0e01c6a Merge branch 'interpview_optin' 2014-05-08 09:17:00 +02:00
Christoph Oelckers
67ebbe3ed4 made some changes to turn the CF_INTERPVIEW flag when changing angles into an op-in feature instead of making it automatic. 2014-05-08 09:15:56 +02:00
Christoph Oelckers
cc4305e86c Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-30 01:29:26 +02:00
Christoph Oelckers
94c4f38c58 - added constants for sound channels 5-7. 2014-04-28 01:26:30 +02:00
Christoph Oelckers
97c7f2c5ce Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-18 12:13:29 +02:00
Christoph Oelckers
7cb828d763 Merge branch 'slowstate' of https://github.com/Gaerzi/zdoom 2014-04-18 09:46:23 +02:00
Gaerzi
60fe07df74 Added slow states to relevant Strife monsters 
Namely, acolyte, shadow acolyte, reaver, stalker, and turret. Info on
which states needed the slow flag was obtained with Quasar's permission
by looking at G_InitNew() in g_game.c and the info.c state tables from
Chocolate Strife.
Also added fast flag to acolyte states that needed it, based on the same
source.
 2014-04-17 17:42:16 +02:00
Christoph Oelckers
29231fa3b7 Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-16 11:34:32 +02:00
Gaerzi
94d47efbb5 Added slow monsters to Strife's easiest skill 2014-04-15 21:02:20 +02:00
Christoph Oelckers
745b147d18 - fixed typo in xlat files (they don't use exactly C syntax.) 2014-04-15 16:40:53 +02:00
Christoph Oelckers
dbefac81d8 Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-15 09:26:05 +02:00
Gaerzi
580094a792 More editing flags 
PSX-inspired flags to change the render styles of monsters (and other
things).
 2014-04-10 12:32:23 +02:00
Christoph Oelckers
e983649731 Merge branch 'master' of https://github.com/rheit/zdoom 2014-03-31 16:02:43 +02:00
alexey.lysiuk
a97b068ed7 Enable fighting between different types of gargoyles and golems 
In vanilla Heretic:
- Gargoyles are able to fight with Fire Gargoyles
- Golems are able to fight with Nitro Golems, both regular and ghosted versions
 2014-03-30 13:27:27 +03:00
alexey.lysiuk
6a958b032c Add NOBLOOD flag to Heresiarch actor 
Heresiarch entity in vanilla Hexen doesn't spawn blood when hit
 2014-03-18 12:29:14 +02:00
alexey.lysiuk
3c8e9b6dc0 Fix incorrect Maulotaur melee attack sound 
It was STFHIT instead of STFPOW
 2014-03-16 12:29:04 +02:00
Christoph Oelckers
4a23b97963 Merge branch 'master' of https://github.com/rheit/zdoom 2014-03-01 14:41:00 +01:00
Randy Heit
e7f427aa60 Merge branch 'maint' 2014-02-24 19:26:50 -06:00
Randy Heit
a60918f601 Add NoPushWindowCheck compatibility flag 
- For maps like xtheateriii that expect non-blocking push lines to
  activate when you are standing on them and run into a completely different
  line, there is now this compatiblity.txt-only flag.
 2014-02-24 17:43:28 -06:00
Christoph Oelckers
2490324652 Merge branch 'master' of https://github.com/Gaerzi/zdoom 2014-02-18 09:59:07 +01:00
Gaerzi
d7478bcd68 New Freedoom names 
- Added freedoom2.wad as valid alias name (freedoom1.wad already
existed).
- Renamed titles to Freedoom: Phase 1 and Freedoom: Phase 2.
- Reordered to put Phase 1 above Phase 2 in the IWAD picker.
 2014-02-18 00:40:14 +01:00
Christoph Oelckers
3e318e4555 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	.gitignore
	src/CMakeLists.txt
 2014-02-16 21:08:44 +01:00
Braden Obrzut
efa9e0c3ee Merge branch 'maint' 2014-01-18 18:10:48 -05:00
Braden Obrzut
e5d7077d74 - Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods. 
- Fixed: Heretic shareware used a different border for the statusbar.
 2014-01-18 15:09:12 -05:00
Christoph Oelckers
fd767233aa - fixed typo: glColor must be gl_Color in shader. 2013-12-08 10:01:03 +01:00
Christoph Oelckers
d46315c44b - some finetuning of subtractive effect. 2013-12-05 15:39:46 +01:00
Christoph Oelckers
95163e378e - added a fog layer when drawing sprites with render style reverse subtract. 2013-12-05 15:06:10 +01:00
Christoph Oelckers
3fbcfa7551 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-30 01:34:10 +01:00
Christoph Oelckers
cbed4624fa - added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.) 2013-11-29 13:24:38 +01:00
Christoph Oelckers
4122e4041a Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-20 09:16:12 +01:00
Randy Heit
fe67ae5e54 Merge branch 'maint' 2013-11-19 21:01:15 -06:00
Randy Heit
62ffe7e4e2 Add NOGRAVITY to every Raven actor with FLOATBOB 
- Fixed: Heretic and Hexen completely skip all normal Z processing on
  mobjs with FLOATBOB set. To emulate that, we need to add NOGRAVITY to
  everything with that flag set.
 2013-11-19 19:42:13 -06:00
Braden Obrzut
97d7b1e59e Merge branch 'origin/maint' 
Conflicts:
	src/sound/fmodsound.cpp
 2013-10-23 19:39:22 -04:00
Christoph Oelckers
a338248e3e - converted project to Visual Studio 2008 format. 
I own a full professional version of 2008 and 2005 is having some stability issues with Windows 7 so it makes no sense to stick to the old compiler.
 2013-10-03 12:08:57 +02:00
Christoph Oelckers
daf5b97ff9 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/version.h
 2013-09-28 23:37:41 +02:00
Christoph Oelckers
a144221174 - changed the invisible waiting frame of the ExplosiveBarrel to use TNTA10 instead of the real barrel frame. This is so that sprite checks do not erroneously determine that there's still something to see. GZDoom's dynamic light code has problems with this. 2013-09-20 10:43:10 +02:00
Christoph Oelckers
4d3f6cae2e Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-27 23:53:40 +02:00
Christoph Oelckers
8e8f6cf5a6 - A_AlertMonsters flags submission by NeuralStunner. 2013-08-20 20:33:03 +02:00
Christoph Oelckers
42c9b68d47 Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-14 00:32:35 +02:00
Christoph Oelckers
62830f7927 - added separate automap color for non-counting monsters. 
- fixed: using a nonexistent CVAR in a ColorPicker menu item caused a crash.
 2013-08-14 00:32:05 +02:00
Christoph Oelckers
16f239536a Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-12 21:16:41 +02:00
Christoph Oelckers
ef22bb2521 Merge branch 'maint' 2013-08-12 01:55:12 +02:00
Christoph Oelckers
3300566493 - P_DropItem's chance parameter had an incorrect default value. 2013-08-12 01:54:45 +02:00
Christoph Oelckers
9455608e21 Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-11 21:05:36 +02:00
Christoph Oelckers
fabf8272e6 Merge branch 'maint' 2013-08-11 21:04:17 +02:00
Christoph Oelckers
c0174ea7cd - Added A_DropItem for DECORATE. 2013-08-11 20:48:08 +02:00
Christoph Oelckers
752f44502c Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-11 14:49:36 +02:00
Christoph Oelckers
36b487fd78 Merge branch 'maint' 2013-08-11 11:32:44 +02:00
Christoph Oelckers
1acbe17876 - specte typo in language.ptb. 2013-08-10 21:15:06 +02:00
Christoph Oelckers
d438c6c456 - fixed typo in Strife spectre's obituary message and added it to the DECORATE definition of the spectre. 2013-08-10 20:42:34 +02:00
Christoph Oelckers
c88bf3108c Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-10 10:21:00 +02:00
Christoph Oelckers
3bcc4078b1 Merge branch 'maint' 2013-08-10 10:19:20 +02:00
Christoph Oelckers
1c889dc9fa - let APowerRegeneration use the Strength property to define the amount of regeneration it gives. 2013-08-10 09:51:48 +02:00
Christoph Oelckers
ad7c53855e Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-09 13:05:14 +02:00
Christoph Oelckers
21bce3b0c4 Merge branch 'maint' 2013-08-09 12:51:26 +02:00
Christoph Oelckers
5d0369d4ed - Ability to set A_VileAttack's initial attack's damage type - by BlueShadow. 2013-08-09 12:18:58 +02:00
Christoph Oelckers
34b71baad1 - added Player.Aircapacity property which is used as a multiplier for the level's air supply. 2013-08-09 11:57:14 +02:00
Christoph Oelckers
9f35788164 - added custom automap overlay colors. 
- extended am_drawmapback so that map backgrounds can only be drawn if used with custom colorsets and Raven's, assuming that these sets were specifically made for the accompanying backgrounds.
 2013-08-09 11:00:24 +02:00
Christoph Oelckers
62e55d710a Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-02 22:14:22 +02:00
Christoph Oelckers
8f45e906d4 Merge branch 'automap_colors' 2013-08-02 18:16:05 +02:00
Christoph Oelckers
42848f41dc - fixed typo in MENUDEFS. 2013-08-02 18:15:39 +02:00
Christoph Oelckers
aa72857c72 - implemented automap color parser for MAPINFO (code not tested yet!) 2013-08-02 16:56:42 +02:00
Christoph Oelckers
845020c617 - ovthingcolors were not properly set. 
- added all the missing color CVARs for the overlays which previously duplicated use of one of the other CVARs.
 2013-07-31 23:13:20 +02:00
Christoph Oelckers
ef6fca823e Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/version.h
 2013-07-30 15:20:38 +02:00
Christoph Oelckers
e01c4e0201 Merge branch 'maint' 2013-07-30 13:18:08 +02:00
Christoph Oelckers
16456bec56 - added separate colors for the various types of 2-sided walls for the overlay automap. They previously all mapped to the same CVAR. 2013-07-30 13:17:20 +02:00
Christoph Oelckers
81334809c4 - changed autoloading of *.deh lumps: it is now controlled by a CVAR with 3 options: never load *.deh lumps, load all of them or only load the last one. *.deh loading is disabled by default. 2013-07-30 09:32:33 +02:00
Christoph Oelckers
cf31ccbbaf Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-28 18:23:50 +02:00
Christoph Oelckers
c253d40fbb - externalize labels for automap statistics display to the string table. 2013-07-28 16:18:57 +02:00
Christoph Oelckers
b499742d46 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-25 17:31:27 +02:00
Christoph Oelckers
897a17309b - added menu option for sprite display on automap. 2013-07-25 17:22:45 +02:00
Christoph Oelckers
cbc0b70e7c - TransferStencilColor A_SpawnItemEx patch / by Ryan Cordell. 2013-07-24 20:15:17 +02:00
Christoph Oelckers
ba2faee125 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-22 23:01:58 +02:00
Christoph Oelckers
f3d8790995 Merge branch 'maint' of https://github.com/rheit/zdoom into maint 2013-07-22 22:54:45 +02:00
Christoph Oelckers
83bd8ba1b8 - added NeuralStunner's player.userange submission, but changed it to use the value directly from the PlayerPawn data. 
- bumped savegame version for addition of APlayerPawn::userange.
 2013-07-22 22:37:50 +02:00
Christoph Oelckers
aad509c800 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-14 14:47:12 +02:00
Christoph Oelckers
531da15ac2 Merge branch 'maint' 2013-07-14 14:44:11 +02:00
Christoph Oelckers
10dd75f902 - externalized "New save game" line for save screen. 2013-07-14 09:31:49 +02:00
Christoph Oelckers
453f4ace5c - added compatibility setting for stuff in Cheogsh2 MAP04's megasphere cage which is positioned too low. 2013-07-14 09:01:00 +02:00
Christoph Oelckers
edd2142a0f Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-02 22:11:55 +02:00
Randy Heit
3d61365879 Merge branch 'maint' 2013-07-02 14:51:49 -05:00
Randy Heit
5af1e6f734 - Added a compatibility option to fix Super Sonic Doom's first bonus 
stage leaving you frozen when you finished it.
 2013-07-02 14:15:08 -05:00
Christoph Oelckers
503dc1d9a1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	wadsrc/CMakeLists.txt
 2013-07-02 09:59:59 +02:00
Braden Obrzut
cc616a417d Merge branch 'maint' 2013-07-01 16:58:14 -04:00
Braden Obrzut
02ff428d54 - Allow generator expressions to be turned off during pk3 building with CMake. 
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
 2013-07-01 16:57:46 -04:00
Christoph Oelckers
ddae9757a8 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-26 09:32:43 +02:00
Christoph Oelckers
f0feee3b4e Merge branch 'maint' 2013-06-26 01:03:19 +02:00
Christoph Oelckers
fb1734ba50 - fix previous commit and add compat option for Cheogh's blue key. 2013-06-26 00:57:26 +02:00
Christoph Oelckers
4622ab865b - merged the two blocks for void.wad in compatibility.txt. 2013-06-25 11:55:49 +02:00
Christoph Oelckers
5a24190796 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-24 02:31:18 +02:00
Christoph Oelckers
e4f78f225c Merge fix. 2013-06-24 02:26:23 +02:00
Christoph Oelckers
631fd69719 - fixed: GoldWandPuff2 requires the PUFFONACTORS flag. 2013-06-24 02:25:16 +02:00
Christoph Oelckers
5fd3b1cf19 - added _mental_*s compatibility fix for Ultimate Simplicity, map07 2013-06-23 17:38:51 -05:00
Christoph Oelckers
faeba3933e Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 18:52:45 +02:00
Christoph Oelckers
7d56311152 - added Ryan Cordell's A_CheckRange submission. 2013-06-23 18:45:17 +02:00
Christoph Oelckers
5bbb18b6dd - added _mental_*s compatibility fix for Ultimate Simplicity, map07 2013-06-23 18:39:01 +02:00
Christoph Oelckers
e00847f64b - GZDoom solution file 
- missing GL resources for gzdoom.pk3.
 2013-06-23 11:13:01 +02:00
Christoph Oelckers
71e65ed116 - GZDoom differences to /wadsrc. 2013-06-23 09:30:04 +02:00
Christoph Oelckers
c4b7335312 - fixed: UDMF's Doom namespace needs to retain Boom's sector special flags. 
- fixed: UDMF's ZDoomTranslated namespace needs to set the DUMMYSWITCHES flag so that it remains compatible with Doom-format ZDoom maps.


SVN r4325 (trunk)
 2013-06-03 07:14:42 +00:00
Randy Heit
2d13a45773 - Added read access to an actor's melee range from DECORATE and ACS, via Blue Shadow. 
SVN r4305 (trunk)
 2013-06-01 02:23:27 +00:00
Christoph Oelckers
dbf68e3f2c - fixed the Peasants DECORATE definition. 
SVN r4298 (trunk)
 2013-05-30 21:07:29 +00:00
Christoph Oelckers
a7c2346b32 - added a FloatBobPhase property for DECORATE. Now, if FloatBobPhase is anything but -1 it will be used directly as the initial phase, allowing to define actors that bob in sync. The allowed range of phases is 0 - 63. The main reason for this is that each actor spawn called the pr_spawnmobj RNG just to randomize this value which causes problems with non-interactive actors, in particular GZDoom's dynamic lights. 
SVN r4296 (trunk)
 2013-05-30 08:52:29 +00:00
Christoph Oelckers
567fbace22 - re-fixed r4279. 
SVN r4282 (trunk)
 2013-05-25 18:30:23 +00:00
Christoph Oelckers
2767f31a92 - fixed: PillarAlienPower must loop its state. 
SVN r4279 (trunk)
 2013-05-25 16:22:51 +00:00
Braden Obrzut
332e39d6c8 - Fixed: Typo in WaterDropOnFloor actor's active sound. 
SVN r4276 (trunk)
 2013-05-22 21:26:06 +00:00
Braden Obrzut
1d4fbc05a5 - Fixed: glbsp nodes in a wad file inside a pk3 would not be loaded. 
- Fixed: Typo from r4270.

SVN r4273 (trunk)
 2013-05-20 20:39:34 +00:00
Randy Heit
6ada6158ef - Added a fallback for accented characters to use unaccented ones. 
- Updated Portuguese strings with the version here: http://forum.zdoom.org/viewtopic.php?p=672839#p672839

SVN r4271 (trunk)
 2013-05-17 02:35:35 +00:00
Randy Heit
71f42122bc - Added a definition for OB_MPMAULER1 and removed the needless reference to OB_MPMAULER2. 
SVN r4270 (trunk)
 2013-05-17 01:22:19 +00:00
Randy Heit
ec7f433da3 - Fixed: Strife line special 200 should also be marked as repeatable. 
SVN r4269 (trunk)
 2013-05-17 01:06:47 +00:00
Randy Heit
4692e3f69c - Fixed: Strife line special should have been marked repeatable. 
SVN r4268 (trunk)
 2013-05-17 01:02:43 +00:00
Randy Heit
6922049b83 - Redo r4259, because I guess those weren't actually whitespace changes. (Although they looked like it to me.) 
SVN r4266 (trunk)
 2013-05-14 23:34:24 +00:00
Randy Heit
1e32e75eef - Removed the music strings from the Brazilian Portuguese translations. (And apparently some whitespace changes too?) 
SVN r4260 (trunk)
 2013-05-12 18:43:28 +00:00
Randy Heit
cb7bc7e66c - Fixed: TAG_MINEKEY still contained the underscore character. 
SVN r4259 (trunk)
 2013-05-12 18:41:44 +00:00
Randy Heit
404df07629 - Fixed: The Ironlich lost its Pain state when it was converted to DECORATE. 
SVN r4252 (trunk)
 2013-05-07 01:57:05 +00:00
Randy Heit
8830d3a07a - Fixed: Ever since r1078, D'Sparil has been too quiet. 
SVN r4249 (trunk)
 2013-05-04 19:46:38 +00:00
Randy Heit
e9cd2777f3 - Fixed: r4226 had bad copy-paste angles for Demon2's XDeath. 
SVN r4241 (trunk)
 2013-04-30 04:49:24 +00:00
Randy Heit
77b57e2f98 - Fixed: Hexen's A_DemonDeath and A_Demon2Death had been converted to incorrect generic Decorate. 
SVN r4226 (trunk)
 2013-04-28 01:58:51 +00:00
Christoph Oelckers
9f71c7cb4e - added Xaser's reactiontime for ACS and DECORATE expression patch. 
SVN r4222 (trunk)
 2013-04-20 21:32:03 +00:00
Randy Heit
d99517292b - Added DONTGIB flag to Key, so key-dropping enemies can be used reliably near crushers. 
SVN r4218 (trunk)
 2013-04-16 20:26:35 +00:00
Christoph Oelckers
0d89183aa7 - ignoreteleporttags compatibility setting for a few maps. 
SVN r4208 (trunk)
 2013-04-02 19:11:50 +00:00
Randy Heit
147da94e2f - Added FDARI's CLOFF_JUMP_ON_MISS and CLOFF_AIM_VERT_NOOFFSET flags. 
SVN r4207 (trunk)
 2013-03-28 01:29:23 +00:00
Randy Heit
f9915d7cf2 - Added FDARI's A_CheckLOF, modified to use a Trace callback function. 
SVN r4201 (trunk)
 2013-03-23 02:55:59 +00:00
Randy Heit
c54ea7f6b7 - Added SXF_TRANSFERSPECIAL and SXF_CLEARCALLERSPECIAL flags for A_SpawnItemEx. 
SVN r4199 (trunk)
 2013-03-23 01:22:37 +00:00
Randy Heit
53e73783e0 - Added spawnofs_z parameter to A_RailAttack and A_CustomRailgun. 
SVN r4191 (trunk)
 2013-03-20 03:36:45 +00:00
Randy Heit
277d59b2bb - Added flags SXF_CLEARCALLERTID, SXF_MULTIPLYSPEED, and SXF_TRANSFERSCALE for A_SpawnItemEx. 
SVN r4188 (trunk)
 2013-03-20 03:07:45 +00:00
Christoph Oelckers
b0203c9f1d - added Xaser's SXF_USEBLOODCOLOR for A_SpawnItemEx submission 
SVN r4181 (trunk)
 2013-03-13 11:27:30 +00:00
Randy Heit
8410ac760a - Added A_SetDamageType. 
SVN r4180 (trunk)
 2013-03-13 04:04:48 +00:00
Braden Obrzut
3fe31668a6 - More Visual Studio with CMake fixes. 
SVN r4176 (trunk)
 2013-03-08 19:23:06 +00:00
Christoph Oelckers
33f363f4c6 - added TheFortuneTeller's NORANDOMPUFFZ submission. 
SVN r4170 (trunk)
 2013-02-27 10:35:44 +00:00
Braden Obrzut
01fed92920 - Added support for Visual Studio to the CMake project. 
SVN r4166 (trunk)
 2013-02-25 00:12:21 +00:00
Christoph Oelckers
81785124c5 - fixed: the ExplosiveBarrel's height was wrong. 
SVN r4161 (trunk)
 2013-02-22 21:18:29 +00:00
Christoph Oelckers
071002c02b - add weapon slots to key configuration menu. 
SVN r4154 (trunk)
 2013-02-20 12:22:04 +00:00
Randy Heit
2e7ef2e019 - Added Brazilian Portuguese translation. 
SVN r4149 (trunk)
 2013-02-19 02:59:40 +00:00
Randy Heit
f5891dea25 - Added time display for alt hud. 
SVN r4148 (trunk)
 2013-02-19 02:58:03 +00:00
Randy Heit
bd601a1bc8 - Added NOTRAIL flag for PowerSpeed. 
SVN r4146 (trunk)
 2013-02-19 02:44:49 +00:00
Christoph Oelckers
027a99d772 - fixed: Hexen's Floor_RaiseAndCrush is not the same action as the one used by Doom and which was used by ZDoom before r4053. Restored the old code and gave it a new special 99:Floor_RaiseAndCrushDoom. 
SVN r4125 (trunk)
 2013-02-10 08:53:03 +00:00
Randy Heit
9af00a22d3 - Fixed: Strife's slow Ceiling_CrushAndRaise lines do no actual damage. 
SVN r4124 (trunk)
 2013-02-10 00:33:22 +00:00
Randy Heit
24edfd5c86 - Fixed translations of Heretic linetype's that perform Floor_LowerToHighest with an offset. 
SVN r4123 (trunk)
 2013-02-10 00:26:47 +00:00
Randy Heit
65d2d0a5e5 - Added compatibility option for Claustrophobia 1024, map 01. 
SVN r4122 (trunk)
 2013-02-09 23:18:34 +00:00
Randy Heit
afabf7e018 - Force node building for garrison.wad from The Master Levels so that the teleporter to the 
red key won't leave you in the ground.

SVN r4071 (trunk)
 2013-02-07 21:32:06 +00:00
Randy Heit
87b8b6201c - Added WRF_DISABLESWITCH flag for A_WeaponReady to indicate that any attempts to switch the weapon 
should be discarded.

SVN r4062 (trunk)
 2013-02-05 02:27:35 +00:00
Randy Heit
5b97bf47de - Fixed: The string displayed when attempting to start a new game during a netgame is "NEWGAME", not "NETGAME". 
SVN r4051 (trunk)
 2013-01-26 03:39:43 +00:00
Randy Heit
931357358d - Reorder the althud level time map entries to match their displayed order. 
SVN r4048 (trunk)
 2013-01-26 03:19:27 +00:00
Christoph Oelckers
6a1f28e400 - fixed some issues in the alternate HUD menu. 
SVN r4046 (trunk)
 2013-01-25 14:50:09 +00:00
Randy Heit
9b5232a410 - Fixed: The health bonuses atop the pillars in the starting room of Void could not be picked 
up because they no longer physically clip through the floor.

SVN r4038 (trunk)
 2013-01-23 04:48:33 +00:00
Randy Heit
7291a56335 - Shorten text of the longest lines in the gameplay options menu. 
SVN r4035 (trunk)
 2013-01-23 03:54:14 +00:00