2109 commits

Author	SHA1	Message	Date
Christoph Oelckers	04d4bda262	- converted all constants to enums and gave the enums names.	2016-10-07 18:09:28 +02:00
Christoph Oelckers	6487681736	- started porting constants.txt	2016-10-07 17:49:00 +02:00
Christoph Oelckers	ee66d22034	Revert "- added an option to disable the pickup screen flash." ... This reverts commit 2d320a2e86. The feature has been superseded by pickup_fade_scalar and is no longer needed.	2016-10-07 08:46:06 +02:00
raa-eruanna	3ccc85876c	- Forgot to add language entries.	2016-10-06 20:05:30 -04:00
raa-eruanna	02f66fa34e	- Backported blood_fade_scalar from Skulltag ... - Added new pickup_fade_scalar which works the same way for pickups - Default for blood_fade_scalar is 1.0 instead of 0.5 from Skulltag.	2016-10-06 20:01:20 -04:00
Christoph Oelckers	fc246be03e	Merge branch 'master' of https://github.com/rheit/zdoom	2016-10-06 21:21:46 +02:00
Magnus Norddahl	bb79dcb634	SSAO math bug fixes	2016-10-06 07:36:49 +02:00
Christoph Oelckers	5b350dcdd5	- gave Boom's point pusher and puller things the NOCLIP flag so that they won't get moved around by scrollers.	2016-10-05 16:27:12 +02:00
Christoph Oelckers	2d320a2e86	- added an option to disable the pickup screen flash.	2016-10-05 09:59:19 +02:00
Magnus Norddahl	00e72028ef	Add another gbuffer with normal data and make ssao pass use it	2016-10-05 07:57:27 +02:00
Magnus Norddahl	ecb57d6cd9	Merge remote-tracking branch 'gzdoom/master' into ssao ... # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/scene/gl_scene.cpp # src/gl/shaders/gl_shader.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.zz	2016-10-04 00:01:03 +02:00
Christoph Oelckers	4eb5f10b02	- use normals to have proper light attenuation. So far only implemented for walls and flats. Models are planned but need some thinking about how to efficiently collect all required lights for an object.	2016-10-03 16:09:32 +02:00
Christoph Oelckers	2da18bfa56	Merge branch 'master' of https://github.com/rheit/zdoom	2016-10-03 00:56:55 +02:00
Major Cooke	201ae3c60f	Added OverlayID() for retrieving psprite layer numbers.	2016-10-03 00:44:06 +02:00
alexey.lysiuk	c68aa2b241	Added FXAA post-processing ... Implementation of Fast Approximate Anti-Aliasing is based on nVidia sample: https://github.com/NVIDIAGameWorks/GraphicsSamples/tree/master/samples/es3-kepler/FXAA	2016-10-03 00:15:45 +02:00
Christopher Bruns	0240cdef18	Modulate row interleaved stereo 3d offset with window height parity, because gl_FragCoord.y approaches zero at the bottom, not the top of the window.	2016-10-02 16:10:58 -04:00
Christopher Bruns	fcbf9342d6	Compute row location using gl_FragCoord.	2016-10-02 16:10:39 -04:00
Christopher Bruns	460b653709	Row interlaced 3d might be working, at least in fullscreen 1920x1080 mode.	2016-10-02 16:10:21 -04:00
Christopher Bruns	960d4d6755	Create TopBottom3D mode and begin sketching RowInterleaved3D mode.	2016-10-02 16:09:02 -04:00
Christoph Oelckers	0bce6e3925	- added ACS and DECORATE setter functions for named translations.	2016-10-02 14:09:45 +02:00
Christoph Oelckers	51ffd6d9c6	- fixed some warnings. ... - A_SetRenderStyle should not default to STYLE_None.	2016-10-02 01:00:07 +02:00
Christoph Oelckers	80f2f5829f	- added A_SetRenderStyle function which replaces A_SetTranslucent. A_SetTranslucent had to be deprecated due to obsolete semantics of the renderstyle argument.	2016-10-02 00:43:05 +02:00
Christoph Oelckers	d5e31aff1b	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-28 08:27:55 +02:00
Marisa Heit	59e52b3e9b	Fixed: Heretic platforms make a mid-move sound, unlike Doom's	2016-09-27 18:40:36 -05:00
Magnus Norddahl	979e70ca8f	Add gl_ssao_portals for controlling how many portals gets SSAO	2016-09-25 00:22:38 +02:00
Magnus Norddahl	3f11c0562c	Add ssao quality setting	2016-09-25 00:22:38 +02:00
Magnus Norddahl	d774136282	Added SceneData texture as the second colorbuffer when rendering a scene and placed fog data into it	2016-09-25 00:22:32 +02:00
Magnus Norddahl	9af34bac69	Add gbuffer pass support to FShaderManager and FRenderState	2016-09-25 00:22:32 +02:00
Magnus Norddahl	0a8cc1b74c	Fix depth blur	2016-09-25 00:22:31 +02:00
Magnus Norddahl	24ab13f1ce	Fix stripes in the reconstructed normals due to down scaling	2016-09-25 00:22:31 +02:00
Magnus Norddahl	e025f6e54b	Mark portals in scene alpha channel for the SSAO pass	2016-09-25 00:22:31 +02:00
Magnus Norddahl	c7c0ffadb5	Move SSAO pass to be before translucent rendering ... Fix depth sampling location when not using fullscreen scene	2016-09-25 00:19:16 +02:00
Magnus Norddahl	09bec67821	Resolve multisampling depth in shader	2016-09-25 00:19:16 +02:00
Magnus Norddahl	a246b58673	Change SSAO blur to be depth aware	2016-09-25 00:19:16 +02:00
Magnus Norddahl	723eb746f6	Add ssao random texture	2016-09-25 00:19:15 +02:00
Magnus Norddahl	9076d46261	Added SSAO pass	2016-09-25 00:19:15 +02:00
Christoph Oelckers	6b02ea9871	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # CMakeLists.txt	2016-09-24 09:28:09 +02:00
Major Cooke	dfa4f38c8f	Updated to new save game code.	2016-09-24 09:17:18 +02:00
Christoph Oelckers	6bfbe30b99	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/g_level.cpp # src/p_saveg.cpp # src/r_defs.h # src/version.h (note that this commit will not compile!)	2016-09-24 00:40:15 +02:00
Christoph Oelckers	d28d02839e	- fixed: An actor's default stencil color should be set in DECORATE instead of doing some hackery elsewhere to compensate for the lack of initialization.	2016-09-23 19:19:26 +02:00
Christoph Oelckers	0a98fb0be7	- integrated dynamic light definitions into regular DECORATE as another include. ... - renamed menudef.z zo menudef.zz. This was done because some tool out there stupidly assume that *.z is some sort of archive and refuse to operate on these files (shame on you, Beyond Compare!)	2016-09-22 09:32:04 +02:00
Christopher Bruns	1f79e23d5b	Implement wide side-by-side mode, using adjusted aspect ratio in projection matrix. ... Use optimal framebuffer size for side-by-side modes.	2016-09-22 09:25:46 +02:00
Christopher Bruns	9a257ac158	Implement side-by-side narrow 3D mode.	2016-09-22 09:25:46 +02:00
raa-eruanna	2339b18b01	Quick fix: prevents negative values being passed to pow.	2016-09-22 09:23:26 +02:00
raa-eruanna	72491049e0	Changes to the contrast/brightness/gamma formula for both hardware and shader gamma correction. Mainly makes a correction with the shader version where contrast/brightness being negative values would clip them inappropriately.	2016-09-22 09:23:25 +02:00
Magnus Norddahl	f7b6b1433c	Added exposure pass calculating the bloom/tonemap exposure based on what the eye is seeing	2016-09-22 09:13:32 +02:00
Christoph Oelckers	1e6b99cebd	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-22 09:06:34 +02:00
raa-eruanna	780d672b25	Adds user-definable weapon bob speed	2016-09-22 08:42:59 +02:00
Christoph Oelckers	475077f1de	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-19 09:01:34 +02:00
Christoph Oelckers	3eb1af6957	- added a GetMissileDamage function to DECORATE which can be used to properly retrieve an actor's damage value. ... The damage property should be considered deprecated inside expressions from now on.	2016-09-19 03:45:22 +02:00
Magnus Norddahl	f2a3b8978d	Added declaration in the shader that was missing	2016-09-17 00:30:03 +02:00
Gaerzi	d99d43aeba	Fixes to fuzz shaders	2016-09-17 00:30:03 +02:00
Christoph Oelckers	7e2e3e8768	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-08 00:48:27 +02:00
Magnus Norddahl	e794e59cd2	Add con_scale for scaling just the console	2016-09-08 00:39:52 +02:00
Magnus Norddahl	6414e01354	Add uiscale slider controlling what scale the On setting uses for hud_scale, hud_althudscale and con_scaletext	2016-09-08 00:39:51 +02:00
Christoph Oelckers	d2ead39bcc	- force framebuffers for camera textures on GL 3+ hardware. With all the postprocessing stuff added I don't think it's ok to use the screenbuffer for this anymore. ... - disable framebuffers for camera textures in legacy mode entirely. This depends on a GL_DEPTH24_STENCIL8 surface which most of these old chipsets do not support, and I really see no point to invest any work here. The worst that can happen is that oversized camera textures won't be processed, which, due to general performance issues, might even be a good thing.	2016-09-04 14:16:05 +02:00
Christoph Oelckers	8b01a88b76	- removed gl_lights_size and gl_lights_intensity. ... Both of these were inherited from ZDoomGL and in terms of light design in maps it makes absolutely no sense to have them user configurable. They should have been removed 11 years ago.	2016-09-04 12:45:09 +02:00
Christoph Oelckers	e7856ce1e3	- removed unused forceadditive parameter from gl_GetLight. ... - restricted gl_lights_additive to legacy code and removed menu entry for this. For modern hardware this setting is completely pointless, it offers no advantage and degrades visual quality. Its only reason for existence was that drawing additive lights with textures is a lot faster, and that's all it's being used for now.	2016-09-04 12:35:26 +02:00
Magnus Norddahl	dc39a006dc	Fix palette tonemap precision and compile error on Intel	2016-09-04 02:37:59 +02:00
Christoph Oelckers	aece9aaa58	- added xBRZ texture scaler after clearing the licensing conditions. A screenshot of the confirmation that this is ok has been added to the 'licenses' folder.	2016-09-03 14:01:51 +02:00
Christoph Oelckers	589936f570	- draw the colormap blend after postprocessing, not before it. ... - added colormap shader to postprocessing. This replaces the in-place application of fullscreen colormaps if renderbuffers are active. This way the fully composed scene gets inverted, not each element on its own which is highly problematic for additively blended things.	2016-09-01 17:14:51 +02:00
Christoph Oelckers	3389a5a74e	- removed most of the specific options for legacy hardware and consolidated them in one variable (does not work yet.)	2016-09-01 11:52:52 +02:00
Christoph Oelckers	40780ce2dd	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-28 10:10:53 +02:00
Christoph Oelckers	da5cf760b0	- forgot to save this one...	2016-08-28 10:10:32 +02:00
Christoph Oelckers	abafcd5486	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/language.enu	2016-08-28 10:00:19 +02:00
Christoph Oelckers	e04055dbb2	- added multiple message levels for 'developer' CVAR so that the important stuff won't get drowned in pointless notification spam that's of no use to anyone. ... - made 'developer' CVAR persist across launches and added some menu entries for it. - added checks for 'developer' to ACS's CheckInventory function.	2016-08-28 09:55:04 +02:00
alexey.lysiuk	2f893af857	Fixed palette tonemap mode for OpenGL 2.x	2016-08-24 11:44:33 +03:00
Magnus Norddahl	25645d901e	Add Palette LUT tonemap mode	2016-08-23 09:18:18 +02:00
Christoph Oelckers	250be72939	- added handling for drawing with uniform vertices. It draws something but in the wrong place. Right now I have no idea what's happening...	2016-08-22 15:31:23 +02:00
Christoph Oelckers	7ba5acfb35	- added quad drawer interface so that this part can be done without altering a vertex buffer. ... So far it's only the framework, the new code is not active yet.	2016-08-22 14:00:25 +02:00
Christoph Oelckers	5c267a2169	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/language.eng	2016-08-21 08:42:06 +02:00
Christoph Oelckers	ca8ef7f3f3	- moved bobbing menu strings into the correct file.	2016-08-16 11:20:22 +02:00
Christoph Oelckers	04c4147052	- renamed flag to be more descriptive.	2016-08-16 09:02:23 +02:00
Major Cooke	aa2ca77412	Added damagetype parameter and XF_NOACTORTYPE to A_Explode. ... - By default, A_Explode will refer to the actor's damagetype if using none. The flag forces the function's type if used regardless of type.	2016-08-16 08:59:27 +02:00
Magnus Norddahl	0e2d9affb2	Make sure tonemap shader never takes the sqrt of a negative number ... Fix bug where the old hardcoded exposure bias was still being used in the uncharted2 tonemap	2016-08-16 00:22:00 +02:00
Magnus Norddahl	a8d1197ea7	Make sure we never pass a negative value to pow, and optimize gamma uniform	2016-08-16 00:01:18 +02:00
Magnus Norddahl	210fce1193	Fix bloom shader missing its target	2016-08-14 09:05:50 +02:00
Christoph Oelckers	34c62c4d33	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-12 09:23:24 +02:00
Major Cooke	ec14dd94a7	A_Explode now returns the number of actors damaged and can be used in expressions. ... - Enemies that do not take damage in any way are not counted.	2016-08-12 09:17:20 +02:00
Christoph Oelckers	36a4352867	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-09 20:15:35 +02:00
Christoph Oelckers	b4e712ab01	- made disabling the push window check a real compatibility option. ... No idea why this was a hidden one, this one definitely needs to be in the menu. - set some required compatibility options for Super Sonic Doom.	2016-08-09 20:15:13 +02:00
Christoph Oelckers	675822004d	- use static buffer data and a uniform to handle the texture positioning of the present shader. ... That's again one less write access to the buffer. The uniform method was chosen because this way a buffer update can be completely avoided, and setting a single uniform is a lot cheaper and simpler to handle.	2016-08-08 16:06:02 +02:00
Christoph Oelckers	9a5cbbe6d8	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-07 22:13:55 +02:00
Christoph Oelckers	ab837b608d	- compatibility optioned triggering sector actions by indirectly initiated teleports ... There's several old maps depending on this not happening. - Set the option for Hell's Twisted Influence Part 1.	2016-08-07 22:04:16 +02:00
Magnus Norddahl	346badf25f	Moved state to FGLPostProcessState and merged vertex shaders	2016-08-06 11:51:08 +02:00
Christoph Oelckers	09e40840b5	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-05 15:15:11 +02:00
Magnus Norddahl	a893013dbb	Adds HUD quadruple scale and a scale slider for the crosshair	2016-08-05 12:20:34 +02:00
Magnus Norddahl	0457fee9c0	Added lens distortion effect to menus	2016-08-04 17:22:05 +02:00
Magnus Norddahl	6fc7596d52	Fix aspect ratio and texture clipping in lens shader	2016-08-04 15:47:15 +02:00
Christoph Oelckers	2c38e20352	- update xlat/eternity.txt for reference.	2016-08-03 13:16:14 +02:00
Magnus Norddahl	6b9529d70f	Added lens distortion shader	2016-08-02 17:32:21 +02:00
Magnus Norddahl	7709db4bb0	Fix broken viewport/backbuffer location for WriteSavePic	2016-07-31 16:23:21 +02:00
Christoph Oelckers	a69182f9ef	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-31 09:19:36 +02:00
Leonard2	8068792f4b	Fixed: A_RadiusGive had an incorrect definition	2016-07-31 09:06:14 +02:00
Christoph Oelckers	c93204cace	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-07-30 22:09:56 +02:00
Christoph Oelckers	124c109e18	Merge branch 'multisamplingbuffers' of https://github.com/dpjudas/zdoom	2016-07-30 16:35:19 +02:00
Magnus Norddahl	cfc20d1198	Added multisample support to FGLRenderBuffers and added gl_multisample to the menus	2016-07-30 15:33:30 +02:00
alexey.lysiuk	7de242930a	Removed obsolete gamma correct shader used on macOS only	2016-07-30 15:30:35 +03:00
Christoph Oelckers	0c8a4689b8	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-30 13:26:25 +02:00
Xaser Acheron	a1a0da1f13	added SWF_SELECTPRIORITY flag to A_SelectWeapon	2016-07-29 18:48:54 -05:00
Christoph Oelckers	50765f8b79	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-30 00:32:29 +02:00
Christoph Oelckers	f4cbde856b	Merge branch 'bloom' of https://github.com/dpjudas/zdoom	2016-07-30 00:30:27 +02:00
Major Cooke	13fa06fe7a	Renamed GetProximity to CountProximity. ... # Conflicts: # wadsrc/static/actors/actor.txt	2016-07-30 00:27:12 +02:00
Major Cooke	167cb28563	Added GetProximity(classname, distance, flags, ptr). ... - Behaves similarly to A_CheckProximity but returns the count of classname instead of true/false. # Conflicts: # wadsrc/static/actors/actor.txt	2016-07-30 00:26:55 +02:00
Major Cooke	dfed6ac1fb	Added SpriteAngle and SpriteRotation properties. ... - Includes four functions, A_SetSprite(Angle/Rotation) and GetSprite(Angle/Rotation). - SpriteRotation offsets the angle of the sprite, allowing for actors to move backwards or sideways for example. - SpriteAngle requires +SPRITEANGLE and sets the actor's sprite to the absolute rotation found at that angle. Overrides SpriteRotation once the flag is on.	2016-07-30 00:26:40 +02:00
Magnus Norddahl	5849c83028	Added bloom and tonemap to menus ... Added gl_renderbuffers CVAR that disables render buffers Added patch shader support to FShaderProgram Added OpenGL 2 fallback support to render buffers	2016-07-29 21:31:20 +02:00
Magnus Norddahl	0efee85bd8	Added tonemapping and sector based exposure control	2016-07-29 00:36:43 +02:00
Christoph Oelckers	b8abec4e1f	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-28 09:20:48 +02:00
MajorCooke	3d9591229e	Added A_CopySpriteFrame(from, to, flags).. ... - Copies a sprite/frame from one actor pointer to another. Sprite and/or frame copying can be disabled with flags CPSF_NO<SPRITE/FRAME>.	2016-07-28 08:39:32 +02:00
Magnus Norddahl	69f52cc898	Added bloom shaders	2016-07-27 21:50:30 +02:00
Christoph Oelckers	c9f93d9c88	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-27 11:28:55 +02:00
Magnus Norddahl	aeb7df09de	Added hardware gamma option and improved window handling on Windows	2016-07-27 11:15:19 +02:00
Blue-Shadow	69a00ddabb	Added TRANSFERTRANSLATION morph flag	2016-07-24 00:56:57 +02:00
Magnus Norddahl	41e959e102	Adds the last texture filter mode (trilinear min filter with nearest magnification)	2016-07-23 18:57:37 +02:00
Magnus Norddahl	669238db66	Fix Apple GLSL compile errors	2016-07-23 17:27:19 +02:00
Magnus Norddahl	c08fc8f5a8	Fix depth calculations for R_DoomLightingEquation and make it an exact match of what zdoom does	2016-07-23 17:27:19 +02:00
Christoph Oelckers	2cdc77de34	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-23 10:56:12 +02:00
yqco	4d6532d303	Added RGF_NORANDOMPUFFZ flag for A_CustomRailgun and A_RailAttack	2016-07-22 02:46:41 -06:00
Christoph Oelckers	881731d76b	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-21 08:28:56 +02:00
Blue-Shadow	c428e376cd	Added INFLICTORDMGTYPE flag to A_Damage* action functions ... It forces the use of the inflictor's damagetype instead of whatever is passed to the functions.	2016-07-19 08:34:55 +02:00
MajorCooke	35c30ab62f	Fixed missing constants.	2016-07-16 20:28:43 -05:00
Christoph Oelckers	bce9929c22	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-16 19:57:09 +02:00
MajorCooke	3c7e1e0528	- Added the tracer actor spawning for A_FireBullets and A_CustomBulletAttack. ... The projectiles spawning conditions rely upon the puff successfully spawning. # Conflicts: # wadsrc/static/actors/actor.txt	2016-07-16 17:34:15 +02:00
alexey.lysiuk	da9f4cc1dd	Added 'ammo display order' item to options menu	2016-07-16 16:15:59 +02:00
Christoph Oelckers	943a799aee	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-16 08:30:33 +02:00
MajorCooke	b121284fc0	Added GAF_SWITCH to GetAngle, inverting the function to get the caller's angle on the pointer instead.	2016-07-14 17:14:17 +02:00
Christoph Oelckers	2a42c20c8c	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-13 09:30:16 +02:00
m-x-d	1cf51791de	Adds //%Title property to all locks to make parsing LOCKDEFS by map editors more feasible. ... Fixes: Strife Base key Message now uses LANGUAGE string.	2016-07-12 23:52:04 +02:00
Christoph Oelckers	522b2f4706	- updated xlat/eternity.txt for reference.	2016-07-12 23:50:45 +02:00
Christoph Oelckers	279b939521	Merge branch 'master' of c:\programming\doom-dev\zdoom	2016-07-04 00:44:52 +02:00
Christoph Oelckers	0b93e9b897	Merge branch 'roll' of https://github.com/MajorCooke/zdoom	2016-07-04 00:43:16 +02:00
Christoph Oelckers	e42442732a	Merge branch 'master' of https://github.com/rheit/zdoom	2016-07-03 13:39:58 +02:00
Christoph Oelckers	148de414e0	- fixed: Checking for quest item 0 should not print an error message but silently fail.	2016-07-03 13:32:40 +02:00
Christoph Oelckers	57667c2e0b	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/language.eng	2016-06-29 14:58:32 +02:00
Christoph Oelckers	593e2f7641	- fixed spelling.	2016-06-29 13:03:39 +02:00
jayman2000	43e62c4236	Added sliders in the display options menu to control movebob and stillbob.	2016-06-29 13:02:55 +02:00
Christoph Oelckers	af20f31b94	Merge branch 'master' of https://github.com/rheit/zdoom	2016-06-21 10:46:12 +02:00
Christoph Oelckers	ce0c2863b0	- set 'maskedmidtex' compatibility option for Caverns of Darkness MAP07.	2016-06-21 10:31:25 +02:00
MajorCooke	26408a5043	Switched the pointer to AAPTR_DEFAULT.	2016-06-20 09:11:38 -05:00
MajorCooke	85a34bbb88	Added GetPlayerInput(int numinput, int ptr = AAPTR_PLAYER1). ... - Works exactly like the ACS version, but with pointers instead. The pointer can be anything, so long as it can be identified as a player.	2016-06-20 08:49:57 -05:00
MajorCooke	630dc8c8cd	Fixed execution prevention.	2016-06-19 22:18:43 -05:00
MajorCooke	dd410876cf	Added A_ClearOverlays(int start, int stop, bool safety). ... - Clears a set of overlays in ranges [start,stop]. If unspecified, wipes all non-hardcoded layers. Safety determines whether to affect core layers or not (i.e. weapon). Returns the number of layers cleared. Added no override boolean to A_Overlay and a boolean return type. - If true, and a layer already has an active layer, the function returns false. Otherwise, sets the layer and returns true.	2016-06-20 01:15:49 +02:00
Christoph Oelckers	b7d13c0711	Merge branch 'master' of https://github.com/rheit/zdoom	2016-06-17 16:18:24 +02:00
Christoph Oelckers	7ccdbf9b62	Merge branch 'PSprites'	2016-06-16 16:16:16 +02:00
Xaser Acheron	de0301a704	split bfg self-damage code into its own function, A_RadiusDamageSelf	2016-06-16 00:43:07 +02:00
Xaser Acheron	481ef7a5b5	added SMMU-BFG11k-style 'damrad' property to A_BFGSpray	2016-06-16 00:43:07 +02:00
Xaser Acheron	8e8248284a	added BFGF_HURTSOURCE and BFGF_MISSILEORIGIN to A_BFGSpray	2016-06-16 00:43:06 +02:00
MajorCooke	2d4eb8dde4	- Added limit parameter to A_RailAttack and A_CustomRailgun.	2016-06-14 18:20:43 -05:00
Christoph Oelckers	9eb18a9e45	Merge branch 'master' of https://github.com/rheit/zdoom	2016-06-11 17:15:55 +02:00
MajorCooke	fb286d1737	- Changed endsize to sizestep. Endsize affected more things than I thought it would.	2016-06-11 08:05:29 -05:00
Leonard2	ebe3f23677	Added GetCVar(string name) ... Works like ACS's GetCVar	2016-06-11 10:15:49 +02:00
MajorCooke	f787056198	- Added endsize parameter and SPF_NOTIMEFREEZE for A_SpawnParticle. ... SPF_NOTIMEFREEZE processes particles with this flag regardless of time freeze. The endsize parameter changes the scale of the particle to that size throughout its lifetime linearly.	2016-06-11 10:00:50 +02:00
Leonard2	afa708c138	Allow psprite layers to be manipulated directly from the player's own body	2016-06-03 19:18:58 +02:00
Leonard2	543414d31f	Added 2 new layer flags: PSPF_CVARFAST and PSPF_POWDOUBLE ... These flags allowed to easily restore a lost part of the targeter layers behavior	2016-06-03 00:50:11 +02:00
Christoph Oelckers	9cf1d96698	- added identification for delaweare.wad to the list of supported IWADs.	2016-06-02 12:04:35 +02:00
Christoph Oelckers	18ebe92cfc	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/g_level.cpp	2016-06-01 11:45:57 +02:00
MajorCooke	bb91723174	- Added GetCrouchFactor(ptr). ... Gets the crouch factor of a player. Can be set to target/master/tracer, as long as it's a player. Defaults to the first player.	2016-05-29 12:43:46 +02:00
MajorCooke	2719905ade	- Added source and inflictor parameters to all A_Damage/Kill functions. ... - Source is the actor to blame for the cause of damage (monster infighting for example). For missiles, modders should consider setting to AAPTR_TARGET. - Inflictor is the actor doing the damage itself. Note that by changing this, it will take into account the flags on the pointed actor.	2016-05-29 12:40:17 +02:00
Roadcrosser	334962da2c	Corrected death message not being gender neutral.	2016-05-29 12:38:36 +02:00
Leonard2	2f5ae3b51e	Changed the default layer indices and renamed them ... Note that this doesn't compile yet	2016-05-28 01:19:41 +02:00
Leonard2	c82620129c	Added A_OverlayFlags ... Allows psprites to follow the weapon and/or the player's bobbing	2016-05-28 01:19:40 +02:00
Christoph Oelckers	a0dc4ae738	Merge branch 'master' of https://github.com/rheit/zdoom	2016-05-24 13:53:52 +02:00
MajorCooke	1b1195df6a	- Added limit parameter to A_RadiusGive. ... - The function ends operation if the number of successfully given actors reaches this count.	2016-05-23 21:11:26 -05:00
Leonard2	8c205ebac3	Added A_OverlayOffset ... Like A_WeaponOffset except it can access any psprites	2016-05-20 17:04:45 +02:00
Leonard2	1ecfb5897b	Added A_Overlay	2016-05-20 17:04:45 +02:00
Christoph Oelckers	ea62d4c2d1	Merge branch 'master' of https://github.com/rheit/zdoom	2016-05-18 21:47:42 +02:00
Christoph Oelckers	f22adcc398	- be more thorough with Eternal Doom MAP03. The compatibility option does not seem to fully solve the problem, so let's just clear the tags in the bogus stair sectors.	2016-05-18 21:06:07 +02:00
Christoph Oelckers	ae3f50d1b2	- set a compatibility option to build the stairs in Eternal Doom MAP03 correctly.	2016-05-18 13:11:31 +02:00
MajorCooke	cd3a3d4472	Not like this makes a difference.	2016-05-18 11:19:24 +02:00
MajorCooke	115dbd0b58	- Added A_WeaponOffset(x = 0, y = 32, flags). ... - Places the weapon offset by the defined x and y. Both are floats. This stacks with weapon bobbing. - WOF_KEEPX: Don't change the X offset. - WOF_KEEPY: Don't change the Y offset. - WOF_ADD: Add onto instead of replacing the coordinates.	2016-05-18 11:19:24 +02:00
Christoph Oelckers	03b31796cc	Merge branch 'master' of https://github.com/rheit/zdoom	2016-05-13 10:09:24 +02:00
MajorCooke	2ba26693d1	- Added 3D Floor + Portal awareness, along with flags to turn off detection of both features.	2016-05-12 22:15:06 +02:00
MajorCooke	b91ed5dc5d	Added GetZAt DECORATE function. ... - float GetZAt(x, y, angle, flags, pick_pointer); - Gets the floor z at x distance ahead and y distance to the side in relative form from the calling actor pointer. Flags are as follows (GZF_ prefix): - CEILING: Returns the ceiling z instead of floor. - ABSOLUTEPOS: x and y are absolute positions. - ABSOLUTEANG: angle parameter does not add the pointer's angle to the angle parameter.	2016-05-12 22:15:05 +02:00
MajorCooke	39f64383cb	Changed RTF_THRUSTZ to match RADF_THRUSTZ's bitmap.	2016-05-11 19:41:33 +02:00
MajorCooke	952219a018	Added RTF_THRUSTZ for A_RadiusThrust. ... - Allows thrusting with Z velocity.	2016-05-11 19:41:33 +02:00
Christoph Oelckers	3334b28a02	- don't let the light go completely black with software-emulated lighting.	2016-05-04 14:30:10 +02:00
Christoph Oelckers	9f91fa8f43	- make the warp2 shader's formula match the software renderer's. ... This fixes some jerkiness with vertical scrollers due to a bad sine period and makes the overall appearance of the effect what it was originally supposed to be. The old warp2 shader was not created by replicating the formula but by trial and error until it looked close enough. A version of the old warp2 shader with a fixed sine period is still available as a custom hardware shader.	2016-05-04 13:47:40 +02:00
alexey.lysiuk	f9022f3054	Fixed compilation of gamma correction shader with particular OpenGL setup	2016-05-02 16:13:54 +03:00
alexey.lysiuk	333560086d	Calculate color values for gamma correction directly in shader ... Gamma table texture is no longer needed	2016-05-02 11:24:42 +03:00
alexey.lysiuk	44b019413c	Implemented gamma correction in OS X native backend using shader effect	2016-05-02 10:04:09 +03:00
MajorCooke	0bf7c3e362	- Removed FlatAngle. This will come back hopefully in another commit sometime in the future.	2016-05-01 17:19:39 -05:00
MajorCooke	f41dcc75d1	FlatAngle can now be defined directly via properties.	2016-05-01 16:33:00 -05:00
MajorCooke	a8248433e9	- Updated <pitch>/flat/roll/wall sprites submission to 2.9+. (ZDoom compatibility submission. ) ... - FLATSPRITE: An actor becomes flat as if they were a decal on the floor. - PITCHFLATSPRITE: A flat sprite tilts up and down based on pitch. - WALLSPRITE: Similar to a Y billboarded sprite. The degree of the flattening is determined by the FlatAngle property. - ROLLSPRITE: The sprite of the actor is affected by the Roll property.	2016-05-01 08:45:50 -05:00
Christopher Bruns	c4590a2615	Fix locale string for "sprite billboard faces camera" menu option.	2016-04-30 18:15:28 -04:00
Christopher Bruns	ed6cf6cf1e	Add menu option for new "sprites face camera" mode. ... # Conflicts: # wadsrc/static/menudef.z	2016-04-30 18:15:28 -04:00
Christoph Oelckers	70bf649364	- added clip planes for line portals and mirrors. This should eliminate the remaining problems with some visible geometry in front of the portal, it is also necessary to handle sprite splitting across line portals properly.	2016-04-29 12:26:57 +02:00
Christoph Oelckers	dc772a9f34	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-29 11:48:46 +02:00
Christoph Oelckers	4a72c7d2f1	- fixed: Decals may not be serialized before thinkers. ... Since decals may have thinkers attached this will crash when such a savegame gets loaded, because the thinker lists get reset in P_SerializeThinkers, deleting any thinker that already was processed. I also added an error message that immediately aborts the save process if such an out-of-sequence thinker is attempted to be written out. This obviously breaks savegame compatibility again...	2016-04-29 11:44:17 +02:00
Christoph Oelckers	21283b18f4	- preparations for using clip planes on line portals.	2016-04-29 01:48:06 +02:00
Christoph Oelckers	60a78a0d9b	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-28 17:35:52 +02:00
MajorCooke	6f11a65893	- Converted rollIntensity from int to double. ... - It was already a double in the save version serialization so nothing had to be changed there.	2016-04-27 12:58:18 -05:00
Christoph Oelckers	15480feb96	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-27 13:47:56 +02:00
MajorCooke	c972caa9f3	- Added rollIntensity and rollWave to A_QuakeEx. ... - Instead of moving the camera around, it rolls the camera. - This only has an effect in GZDoom.	2016-04-27 13:42:15 +02:00
Christoph Oelckers	f5afa30ee6	- added GetAngle(bool relative, int target) DECORATE function.	2016-04-27 11:52:52 +02:00
Christoph Oelckers	61b165ccc4	- fixed the camera height setting for the camera actors. ... The scripting branch changed camera semantics to default to an actor's center - which for monsters and decorations makes sense - but not for simple mapspots that get used as camera. For those the CameraHeight must be explicitly set to 0.	2016-04-27 11:38:54 +02:00
Christoph Oelckers	86f38475b0	- shaders for last commit.	2016-04-27 02:10:42 +02:00
Christoph Oelckers	09f54b0940	- cleaned up the clip plane management for portals. ... Unfortunately the math behind the old clip planes is utterly impenetrable and so poorly documented that I have no idea how to set that up, so it is deactivated for now. It wasn't working anyway.	2016-04-27 00:41:00 +02:00
Christoph Oelckers	f066457a48	- add shader patching to allow running the engine with GLSL 1.2. ... - made some initial preparations for the shader-less fallback path.	2016-04-26 15:26:52 +02:00
Christoph Oelckers	fc38728309	- made some changes to the shaders to allow downpatching them to GLSL 1.2: ... * disable the dynamic light code if no buffers are available * added a duplicate of the getTexel function which cannot be patched without creating syntax problems. * fixe int<->float conversion warning, which on some compilers may be an error.	2016-04-26 11:31:27 +02:00
Christoph Oelckers	172290224b	- make modes 2 and 3 of Teleport_NoFog compatible with Eternity by defaulting to mode 1 when no line is available.	2016-04-25 01:01:28 +02:00
Christoph Oelckers	2914cdc939	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/r_defs.h	2016-04-24 12:19:07 +02:00
Randy Heit	593f6c29ad	Use 2 decimal places for volume sliders, since they move in 0.05 increments	2016-04-23 22:38:55 -05:00
Christoph Oelckers	f420ccd287	- made Teleport_NoFog compatible with Hexen and Eternity. ... ZDoom defaulted to Boom's (buggy) angle adjustment. Changed it so that * Mode 0 is like Hexen, performing no adjustment at all. This still should match all known maps using this special. * Mode 1 remains unchanged. * Mode 2 replicates Boom's broken angle adjustment and is used in the xlat file. * Mode 3 implements the correct angle adjustment that Boom originally intended. (Note: Should some map require something different it should be handled with compatibility.txt instead of reverting this back to the broken way it was before.)	2016-04-23 21:32:40 +02:00
Christoph Oelckers	20d3a72307	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-22 09:15:37 +02:00
Christoph Oelckers	ed070cfe06	- updated xlat/eternity.txt.	2016-04-21 13:01:57 +02:00
Randy Heit	074bce643a	Fixed: A_SetAngle had accidentally had the "action" specifier removed	2016-04-20 20:03:05 -05:00
Christoph Oelckers	082042818b	- refactored sector portal data so that it does not rely on actors. ... This is necessary because otherwise the level data cannot be serialized before the actors.	2016-04-20 19:20:11 +02:00
Christoph Oelckers	b0a0fb5ff0	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-20 05:23:14 +02:00
Randy Heit	60966f472f	Revert "Revert "Remove "action" from Actor functions that don't actually need it"" ... - This reverts commit 06216d733e. - I don't know what I was thinking. Since stateowner is always available to the wrapper function, and this code is only generated for the wrapper function, it's a nonissue. The state is already located before calling any function that uses it.	2016-04-19 21:09:15 -05:00
Randy Heit	06216d733e	Revert "Remove "action" from Actor functions that don't actually need it" ... - This reverts commit 39df62b20e. - Anything that needs to lookup a state also needs stateowner. See FxMultiNameState::Emit(). I will need to be more selective when de-actionifying functions.	2016-04-19 20:56:43 -05:00
Randy Heit	5d3e413d42	Make A_Stop an action function again ... - A_Stop takes no parameters, so it should be an action function to avoid creating the wrapper when called.	2016-04-19 20:46:30 -05:00
Randy Heit	39df62b20e	Remove "action" from Actor functions that don't actually need it ... - An actor function really only needs to be an action function if: 1. It can be called with no parameters specified, either because it takes none or because all its parameters are optional. This lets SetState() call it directly without creating a wrapper function for it. 2. It wants access to the callingstate or stateowner parameters. Most functions don't care about them, so passing them is superfluous.	2016-04-19 20:28:49 -05:00
Christoph Oelckers	d667f8f23f	- some British English.	2016-04-19 09:58:08 +02:00
Randy Heit	c795f29cc4	Reduce calling overhead for A_SetUser* functions by making them non-action functions	2016-04-18 23:18:34 -05:00
Christoph Oelckers	30a530b178	- fixed: TAG_BLASTERP was on the wrong actor.	2016-04-19 02:06:36 +02:00
Christoph Oelckers	8b35c08aa0	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-19 01:02:30 +02:00
Christoph Oelckers	e48c4d3e44	- added tag strings for Heretic's powered weapon versions.	2016-04-19 01:00:09 +02:00
Christoph Oelckers	bac3f1ee9b	- removed redundant quote.	2016-04-13 21:10:42 +02:00
nashmuhandes	ee3712ffeb	Exported all OpenGL menu options into the LANGUAGE lump.	2016-04-13 19:34:57 +02:00
Christopher Bruns	c6fa01dfbf	Reimplement blue/yellow and quadbuffered stereo, this time with an additional CVAR gate on quadbuffered, for better hardware compatibility.obj ... Something is terribly wrong with the separation in all stereo modes now though.	2016-04-09 15:40:55 -04:00
Christoph Oelckers	7486e24cd9	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt	2016-04-04 12:07:57 +02:00
Christoph Oelckers	fd27c8db9e	Merge branch 'master' into floatcvt ... # Conflicts: # src/dobjtype.cpp # src/dobjtype.h # src/version.h	2016-04-04 01:21:24 +02:00
Randy Heit	0cc2705b99	Added A_LogFloat	2016-04-03 16:12:35 -05:00
Christoph Oelckers	251172c7f0	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/r_data/r_interpolate.cpp	2016-03-30 18:24:22 +02:00
Christoph Oelckers	0eb35d6c6e	Merge branch 'master' into floatcvt ... # Conflicts: # src/dobjtype.cpp # src/dobjtype.h	2016-03-30 09:47:25 +02:00
Randy Heit	b6e3358b1c	Add A_SetUserVarFloat and A_SetUserArrayFloat	2016-03-29 22:41:37 -05:00
Christoph Oelckers	609defe078	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/r_defs.h	2016-03-24 12:48:05 +01:00
Christoph Oelckers	70d87f94f2	Merge branch 'master' into floatcvt ... # Conflicts: # src/p_acs.cpp # src/r_utility.cpp # src/thingdef/thingdef_codeptr.cpp # src/version.h	2016-03-23 14:15:24 +01:00
MajorCooke	b16e696157	- Added offset and angle parameters to A_CheckBlock. ... - Includes 2 flags, affixed by CBF_: AbsolutePos, and AbsoluteAngle. - AbsolutePos: Absolute position of where to check. - AbsoluteAngle: Angle parameter is used as is, not added onto the actor's current angle.	2016-03-23 14:05:31 +01:00
Christoph Oelckers	0d1fbcf65f	- flattened the following commits by Major Cooke: ... * Added falloff parameter to A_QuakeEx. - Treated just like A_Explode's 'fullradiusdamage' parameter, where the quake will fall off from this distance on out to the edge. Default is 0, which means no falloff. - Credits to MaxED and Michaelis for helping. * - Added HighPoint parameter to QuakeEx. - Allows fine tuning of where the quake's maximum or minimum occurs, in tics. This must be a range between [1, duration). - For up or down scaling quakes, this sets the quake to reach maximum sooner or start minimizing later. - For both, this indicates when the strongest will occur. Default is 0, or in the middle. The original commits were nearly impossible to find in the convoluted commit tree, so I think it's preferable to have one clean commit instead.	2016-03-23 14:03:10 +01:00
Christoph Oelckers	f60eac8dc0	- floatified FMapThing, dropoffz and GetBobOffset	2016-03-23 12:21:52 +01:00
Christoph Oelckers	eee5143b26	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/r_defs.h	2016-03-22 22:12:51 +01:00
Christoph Oelckers	af427b80bd	- did some cleanup and consolidation on damage factor code while converting it all to floating point. ... - made armor properties floating point.	2016-03-22 16:35:41 +01:00
Christoph Oelckers	19b85f806e	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/actor.h	2016-03-22 12:44:40 +01:00
Christoph Oelckers	cf79e1cb6d	- fixed some leftover fixed point remnants in g_hexen. ... - made the full-coordinate version of P_SpawnPlayerMissile use float coordinates.	2016-03-22 00:30:56 +01:00
Christoph Oelckers	48afdd7dcb	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/CMakeLists.txt # src/actor.h	2016-03-21 01:34:39 +01:00
Christoph Oelckers	51b05d331d	- replaced AActor::vel and player_t::Vel with a floating point version. ... - Converted P_MovePlayer and all associated variables to floating point because this wasn't working well with a mixture between float and fixed. Like the angle commit this has just been patched up to compile, the bulk of work is yet to be done.	2016-03-20 00:54:18 +01:00
Christoph Oelckers	f4f489b33d	Merge branch 'master' of https://github.com/rheit/zdoom	2016-03-14 22:02:58 +01:00
Christoph Oelckers	51ab60178a	- added portal overlays to automap.	2016-03-13 12:33:58 +01:00
j-palomo	0269aeea80	Fixed: MNU_COLORPICKER defined twice in language.eng	2016-03-13 02:56:20 +01:00
Christoph Oelckers	f0192a2349	Merge branch 'master' of https://github.com/rheit/zdoom	2016-03-12 16:55:59 +01:00
alexey.lysiuk	c7c2beee2c	Fixed A_Blast parameter type and default values ... Default values for strength and speed parameter are fixed type, not integers Also strength parameter needs to have floating point type	2016-03-12 13:11:46 +02:00
Christoph Oelckers	346fae82c7	- fixed beta Lost Soul's states.	2016-03-12 10:54:14 +01:00
Christoph Oelckers	03e3410d7f	Merge branch 'master' of https://github.com/rheit/zdoom	2016-03-08 21:29:45 +01:00
Christoph Oelckers	7c47e6ddb2	- how about updating the reference first before adding this stuff... Overlooked those two because my Eternity repo was not fully up to date.	2016-03-08 16:05:53 +01:00
Christoph Oelckers	6787dfeafb	- updated xlat/eternity.txt	2016-03-08 16:01:26 +01:00
Christoph Oelckers	c2e7123a36	Merge branch 'master' of https://github.com/rheit/zdoom	2016-03-08 13:12:03 +01:00
MajorCooke	af50a79e55	- Fixed: ScaleY was not defaulting to ScaleX when specified as 0, which is how the behavior originally was in 2.8. This behavior can now be toggled with a new boolean, 'usezero'.	2016-03-07 09:02:34 -06:00
Christoph Oelckers	5c1ec2c0bf	- added some more British English text variants.	2016-03-04 01:46:37 +01:00
Christoph Oelckers	ec4b3da93d	- added some more British English text variants.	2016-03-04 01:39:55 +01:00
Christoph Oelckers	0bcbacea53	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/posix/sdl/hardware.cpp	2016-03-04 01:21:59 +01:00
Michael Labbe	a28c8091fc	UI support for 21:9 ... - Can specify aspect ratio 21:9 in video menu - menu_screenratios cvar can now force 21:9	2016-03-03 17:31:12 -06:00
Christoph Oelckers	d8c009bb41	- fixed: A_Blast read the blast radius as an int, but used it as fixed_t. Also changed the definition of this parameter to float.	2016-03-03 10:23:04 +01:00
MaxED	81a5273b58	Added "Miscellaneous Options" -> "Save/Load confirmation" option (defaults to true). When disabled, confirmation dialog won't be shown when performing quicksave/quickload.	2016-03-03 09:59:26 +01:00
MajorCooke	59ad6206de	Added CBF_NOACTORS to A_CheckBlock. ... - Self explanatory, doesn't count actors as blocking them.	2016-03-02 20:35:54 -06:00
MajorCooke	fb3769a730	Added offsetforward to A_CheckLOF. ... - offsetforward is to A_SpawnItemEx's x offset property, just like offsetwidth is to y offset.	2016-03-03 02:58:43 +01:00
Christoph Oelckers	6f28735b45	Merge branch 'zmaster'	2016-03-03 02:53:07 +01: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	c160121f45	Add float casts to DECORATE for the sake of completeness	2016-03-01 11:36:15 -06:00
Christoph Oelckers	e3c06e3df7	Merge commit '165d26baa1569685651baf4575e12e73c8cbfd2e' ... # Conflicts: # bzip2/bzip2.vcproj # game-music-emu/game-music-emu.vcproj # gdtoa/gdtoa.vcproj # jpeg-6b/jpeg-6b.vcproj # src/p_spec.cpp # src/r_defs.h # tools/fixrtext/fixrtext.vcproj # tools/lemon/lemon.vcproj # tools/updaterevision/updaterevision.vcproj # tools/zipdir/zipdir.vcproj # wadsrc/static/xlat/eternity.txt # wadsrc/wadsrc.vcproj # zlib/zlib.vcproj	2016-03-01 17:23:35 +01:00
Randy Heit	55142078d8	Normalize line endings	2016-03-01 09:47:10 -06:00
Christoph Oelckers	44a6cafd4b	- we are using C++11 now, so all those old VC 2005 project files are of no use anymore.	2016-03-01 09:38:49 +01:00
Christoph Oelckers	6bcaa51968	- updates eternity.xlat.	2016-02-29 21:40:37 +01:00
Christoph Oelckers	bb4bd76257	Merge branch 'zmaster'	2016-02-26 11:54:08 +01:00
Randy Heit	7f57f68ce1	Added GetSpawnHealth() and GetGibHealth() for DECORATE	2016-02-25 10:08:08 -06:00
Christoph Oelckers	205bbac411	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-25 13:01:51 +01:00
Christoph Oelckers	0f871a1d21	- fixed some language issues with the menu.	2016-02-25 09:27:30 +01:00
Christoph Oelckers	954f03e531	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/actor.h	2016-02-25 01:40:36 +01:00
Christoph Oelckers	5b99691fd4	- updated xlat/eternity.txt	2016-02-25 01:09:01 +01:00
Christoph Oelckers	43ae0155bd	Merge branch 'menudef_fix' of https://github.com/Blue-Shadow/zdoom	2016-02-24 14:12:25 +01:00
Blue-Shadow	81cca69303	Fixed "Detailed save messages" option's value ... The value for that option was displayed as "Unknown", instead of "On" or "Off".	2016-02-24 14:52:29 +03:00
Christoph Oelckers	8362a4516f	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-24 11:26:35 +01:00
Christoph Oelckers	8e2a629e5a	- missed a semicolon,	2016-02-24 11:19:58 +01:00
Christoph Oelckers	51da78ba29	- added a compatibility option to allow multiple exits to be triggered. ... This is required by Daedalus's travel tubes which contain a faulty script with some leftover debug code.	2016-02-24 10:35:29 +01:00
Randy Heit	1ffb7ad109	Add min and max to DECORATE	2016-02-23 16:26:00 -06:00
Christoph Oelckers	fe9a12173c	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-22 12:06:34 +01:00
Christoph Oelckers	8f53632317	- externalized the GZDoom-exclusive strings in Menudefs.enu	2016-02-21 11:37:31 +01:00
alexey.lysiuk	939823a141	Restored layout of Video Options menu ... Screen size option was missed during the last merge	2016-02-21 10:19:15 +02:00
Randy Heit	e7b9e7e955	Rename A_Int/A_Bool/A_State to int/bool/state ... - This is an effort to emphasize that these are just type casts. Now they look like function-style casts with no action function styling. They do no magic joojoo at all. The only reason they exist is because the DECORATE parser can only parse return statements that call a function, so these satisfy that requirement. i.e. *return int(666);* is identical to *return 666;* (if the parser could handle the latter).	2016-02-20 22:05:17 -06:00
Christoph Oelckers	dfd7e08307	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/menudef.txt	2016-02-21 01:55:15 +01:00
John Palomo Jr	92697659be	Expose SafeCommand confirmation string to language.	2016-02-20 20:04:30 +01:00
John Palomo Jr	c557c463e4	Converted all of the strings in menudef into language strings.	2016-02-20 20:04:29 +01:00
Christoph Oelckers	6e6ddfbc25	Merge remote-tracking branch 'remotes/zdoom/master'	2016-02-19 16:14:52 +01:00
Randy Heit	a31bd78abe	Fix definitions of A_State/A_Int/A_Bool ... - These aren't action functions, so PARAM_ACTION_PROLOGUE is inappropriate.	2016-02-19 00:29:19 -06:00
Randy Heit	eace79ccad	Add some functions for use with DECORATE return ... - Since DECORATE's return statement can only return the results of function calls (I do not want to spend the time necessary to make it return arbitrary expressions), here are three functions to get around this limitation: * A_State - Returns the state passed to it. You can simulate A_Jump functions with this. * A_Int - Returns the int passed to it. * A_Bool - Returns the bool passed to it. - e.g. If you want to return the number 3, you use this: return A_Int(3); If you want to jump to a different state, you use this: return A_State("SomeState");	2016-02-18 22:15:03 -06:00
Randy Heit	fbbaae781b	Merge remote-tracking branch 'origin/master'	2016-02-18 22:05:40 -06:00
Randy Heit	b2ccd0bd28	Use action function return value to make state jumps happen ... - The A_Jump family of action functions now return the state to jump to (NULL if no jump is to be taken) instead of jumping directly. It is the caller's responsibility to handle the jump. This will make it possible to use their results in if statements and do something other than jump. - DECORATE return statements can now return the result of a function (but not any random expression--it must be a function call). To make a jump happen from inside a multi-action block, you must return the value of an A_Jump function. e.g.: { return A_Jump(128, "SomeState"); } - The VMFunction class now contains its prototype instead of storing it at a higher level in PFunction. This is so that FState::CallAction can easily tell if a function returns a state. - Removed the FxTailable class because with explicit return statements, it's not useful anymore.	2016-02-18 20:39:40 -06:00
Edoardo Prezioso	f650bbfe15	- Revert unneeded change to the frame letter.	2016-02-18 00:17:07 +01:00
Edoardo Prezioso	db6f534df5	- Fixed wrong Pain Elemental missile sequence.	2016-02-17 21:53:23 +01:00
Edoardo Prezioso	4ccbc65f7b	- Fixed mismatching Mancubus missile sequence.	2016-02-17 21:44:33 +01:00
Gaerzi	ec88a30a00	fix duration according to vanilla	2016-02-17 16:08:40 +01:00
Christoph Oelckers	b60069bb26	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/p_spec.cpp # src/r_bsp.cpp # src/r_data/r_interpolate.cpp # wadsrc/static/xlat/eternity.txt	2016-02-14 18:20:56 +01:00
Christoph Oelckers	d5a1004c41	- some preparations for portal stuff: ... * set up linked sector portals so that everything that will eventually have to be considered is present, even though the software renderer currently can't handle those adequately. * tag all skybox things with a type so that they can easily be distinguished at run time. * fill in the linked portal types in xlat/eternity.txt.	2016-02-14 13:12:03 +01:00
Christoph Oelckers	a5f6c6c747	Updated console font by GFD.	2016-02-14 09:27:20 +01:00
Christoph Oelckers	6df435c8c5	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-11 22:58:16 +01:00
MajorCooke	e04fe06226	GetDistance Non-Action (Double version) ... - Added GetDistance(bool checkz, ptr = aaptr_target). - Returns the distance of an actor. Must be target, master or tracer.	2016-02-10 17:13:50 -06:00
Christoph Oelckers	646f7a1f90	Merge branch 'ChaseDontTurnScript' of https://github.com/MajorCooke/zdoom	2016-02-10 22:47:41 +01:00
Christoph Oelckers	1098093ead	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-10 20:49:32 +01:00
Christoph Oelckers	91f0a8791c	- fixed type mismatch in A_RadiusGive declaration.	2016-02-10 19:30:17 +01:00
Christoph Oelckers	012f10400c	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-10 00:49:35 +01:00
Christoph Oelckers	6ce0c9f78e	- split up PClass::Derive and its child functions because part of them is also needed when initializing an inherited native class with the properties of its parent - but calling the base version in PClass is not possible. ... - moved a few AActor properties out of the EXE so that I could easily test if it works.	2016-02-10 00:17:00 +01:00
Christoph Oelckers	0678a469de	Merge remote-tracking branch 'remotes/zdoom/master' ... # Conflicts: # src/win32/i_system.cpp # tools/re2c/re2c.vcproj	2016-02-08 21:47:19 +01:00
coelckers	1ca2293983	Merge pull request #538 from MajorCooke/CountInv ... CountInv(itemtype, ptr_select)	2016-02-08 21:06:30 +01:00
Christoph Oelckers	c940c2ba81	- fixed: The counters for the whirlwind were initialized too late, the first time they are needed is in P_CheckMissileSpawn, which gets called from inside P_SpawnMissile. Also took the opportunity and moved them to properties that are accessible from DECORATE.	2016-02-08 13:34:54 +01:00
Christoph Oelckers	43b4d452db	Merge branch 'ChaseThresholdScript' of https://github.com/MajorCooke/zdoom ... # Conflicts: # src/version.h	2016-02-08 13:06:08 +01:00
Christoph Oelckers	760db90d71	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # CMakeLists.txt	2016-02-06 05:21:48 +01:00
Braden Obrzut	dce3f0f757	- Bump CMake version requirement to 2.8.7. This means that generator expressions must be supported as well as empty else and endif expressions (like most sane languages). ZDoom probably didn't work with 2.4 anymore anyway.	2016-02-05 21:19:29 -05: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	dda73b531c	Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/p_setup.cpp # src/r_defs.h # src/version.h This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.	2016-02-05 12:31:41 +01:00
MajorCooke	35b7a5ccc1	Updated for scripting branch merge.	2016-02-04 22:41:02 -06:00
MajorCooke	1f8d425a1e	- Added CountInv(itemtype, [ptr_select]). ... - Returns an inventory item count.	2016-02-04 21:45:31 -06:00
MajorCooke	3399ed60e0	Updated to scripting branch merge.	2016-02-04 20:17:46 -06:00
Christoph Oelckers	c995158d52	Merge branch 'maint' of https://github.com/rheit/zdoom	2016-02-05 01:49:12 +01:00
Randy Heit	b3b0886b64	Merge branch 'scripting' ... Conflicts: src/actor.h src/g_doom/a_doomweaps.cpp src/g_hexen/a_blastradius.cpp src/p_enemy.cpp src/p_enemy.h src/thingdef/thingdef.h src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/constants.txt	2016-02-04 15:17:22 -06:00
Randy Heit	b8a24902bc	Move extra font characters into filter directories	2016-02-04 13:23:36 -06:00
Christoph Oelckers	87f3a8f0cc	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-03 13:04:16 +01:00
MajorCooke	a1c1de9edb	Fixed merge conflicts.	2016-02-02 18:26:20 -06:00
Christoph Oelckers	66f053f131	- on second thought: this shouldn't explode the speakers with too high values.	2016-02-02 15:02:06 +01:00
Christoph Oelckers	e12174ffc1	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-02 14:53:48 +01:00
Christoph Oelckers	c002c2fde9	- added a mastervolume setting for DUMB because its default volume is far less than all the other music options.	2016-02-02 14:45:32 +01:00
Christoph Oelckers	456e71ec4b	Merge branch 'master' into Clip3DLights	2016-01-31 21:36:16 +01:00
Christoph Oelckers	e73e26c15a	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-31 21:11:21 +01:00
coelckers	c3cc98b5f3	Merge pull request #523 from alexey-lysiuk/osx_fullscreen ... Final touches to fullscreen mode on OS X	2016-01-31 16:56:35 +01:00
MajorCooke	eb2829ad5e	- Added CBF_DROPOFF to A_CheckBlock. Checks for actors stuck in tall ledges or dropoffs.	2016-01-31 09:45:41 -06:00
Christoph Oelckers	4d7e7deea8	Merge branch 'master' into Clip3DLights	2016-01-31 10:10:32 +01:00
alexey.lysiuk	bb00c9b588	Added menu option to control fullscreen toggle shortcut on OS X	2016-01-31 10:34:17 +02:00
Christoph Oelckers	8bc7a0a24e	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-30 23:01:36 +01:00
Christoph Oelckers	fc57180d7e	- added necessary state to implement 3D light splitting using hardware clipping planes.	2016-01-30 23:01:11 +01:00
John Palomo Jr	d8f7785ad9	Added dimamount and dimcolor to display options menu.	2016-01-30 16:44:50 -05:00
Christoph Oelckers	afcd755c7a	- changed autoaim menu option to a slider which allows a more precise control of the property. ... - having a value of 5000 as the default for autoaim makes no sense, since this is an angle value that will always be clamped to [0..35]. So now 35 is both the default and the maximum.	2016-01-30 13:43:39 +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	d0b194563a	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/p_3dfloors.cpp	2016-01-29 16:36:24 +01:00
Christoph Oelckers	058bfdea26	- forgot to commit this with the source changes for A_Face*.	2016-01-29 00:58:18 +01:00
Christoph Oelckers	b5c3ced9a9	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-27 21:27:26 +01:00
MajorCooke	275cdcd958	Renamed A_FaceVelocity to A_FaceMovementDirection.	2016-01-27 10:12:13 -06:00
coelckers	c5379c749e	Merge pull request #428 from MajorCooke/A_CheckSPecies ... Added A_CheckSpecies(state jump, name species, ptr = AAPTR_DEFAULT)	2016-01-27 16:45:16 +01:00
MajorCooke	6dcbc930d6	NoRandomTurn, not NoDirectionTurn, inside the macro.	2016-01-27 09:39:46 -06:00
MajorCooke	ece6fa776c	- Renamed CHF_DONTANGLE to CHF_NODIRECTIONTURN. ... - A_Wander now shares CHF_NODIRECTIONTURN and CHF_NORANDOMTURN instead of having its own flags.	2016-01-27 09:35:19 -06:00
Christoph Oelckers	238990c871	don't leave any gaps in the used clip planes.	2016-01-27 12:32:39 +01:00
Christoph Oelckers	47db3252f4	- it's really not necessary to waste two clip planes for reflective surfaces because only one can be active at any time.	2016-01-27 12:30:55 +01:00
Christoph Oelckers	4b0ce7a8db	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-27 11:21:39 +01:00
Christoph Oelckers	2a1fa60aa6	Merge branch 'CheckProxExpPruned' of https://github.com/MajorCooke/zdoom	2016-01-26 18:49:03 +01:00
MajorCooke	1c0ef1d367	Removed CPXF_NODISTANCE.	2016-01-26 10:00:20 -06:00
Christoph Oelckers	66ce8915fb	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-26 15:00:54 +01:00
alexey.lysiuk	204bf2c375	Made secret on Plutonia: Revisited MAP27 accessible without vanilla wallrunning ... Increased duration of lift's lowered state See http://forum.zdoom.org/viewtopic.php?t=47878	2016-01-26 13:49:04 +02:00
Randy Heit	c63f65d441	Merge remote-tracking branch 'origin/master' into scripting ... Conflicts: src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/constants.txt	2016-01-22 20:53:27 -06:00
Christoph Oelckers	6691358b0a	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-22 19:15:24 +01:00
MajorCooke	793fc90716	Once more homogenized! ... - DECORATE: color, flags, lifetime, size, angle, xyz offset/vel/accel, startalpha, fadestep. - ACS: Similar, minus the angle parameter.	2016-01-21 19:59:33 -06:00
MajorCooke	28502b9a80	- Reorganized A_SpawnParticle parameters. ... - Decorate order is now color, x/y/zoff, velx/y/z, lifetime, angle, flags, size, startalphaf, fadestepf, accelx/y/z. - ACS order is now color, xyz offset, xyz velocity, lifetime, fullbright, size, startalpha, fadestep, xyz accel	2016-01-21 18:34:39 -06:00
Christoph Oelckers	1a631670fb	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-22 01:11:08 +01:00
Christoph Oelckers	841c7b275e	Merge branch 'ParticleFlags' of https://github.com/MajorCooke/zdoom ... Conflicts: wadsrc/static/actors/actor.txt	2016-01-22 00:58:42 +01:00
Christoph Oelckers	3b4ed8d7cd	- made A_SpawnParticle's fadestep parameter a fixed point value as well.	2016-01-22 00:54:09 +01:00
MajorCooke	13dc6be5a1	- Added flags for A_SpawnParticle and angle parameter. ... - SPF_FULLBRIGHT makes the particle full bright. - SPF_RELATIVE encapsulates the following flags: - SPF_RELPOS: Position is relative to angle. - SPF_RELVEL: Velocity is relative to angle. - SPF_RELACCEL: Acceleration is relative to angle. - SPF_RELANG: Add caller's angle to angle parameter for relativity.	2016-01-21 16:36:58 -06:00
Christoph Oelckers	39014b1732	- make the startalpha parameter of A_SpawnParticle a float to be consistent with other functions that want an alpha value.	2016-01-21 20:13:55 +01:00
Randy Heit	1ac0d0690c	Re-remove testglobalvar from constants.txt so scripting branch runs again	2016-01-21 12:46:12 -06:00
Randy Heit	9744b9e0d9	Merge branch 'master' into scripting ... Conflicts: src/actor.h src/dobject.h src/dobjgc.cpp src/p_local.h src/thingdef/thingdef_codeptr.cpp	2016-01-21 12:45:06 -06:00
MajorCooke	9638cbb844	Updated A_CheckProximity Expansion Pruned Edition.	2016-01-21 11:39:13 -06:00
Christoph Oelckers	995721836b	Merge branch 'SpawnParticle' of https://github.com/Edward850/zdoom ... Conflicts: src/actor.h	2016-01-21 17:04:52 +01:00
Christoph Oelckers	8f7be01dd4	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/r_data/r_interpolate.cpp	2016-01-21 12:09:12 +01:00
MajorCooke	93aff2413f	Fixed an issue which caused A_Teleport to set the caller and itself to SpotZ's z position.	2016-01-20 18:18:00 -06:00
MajorCooke	d20a7516c9	Updated A_FaceVelocity to remove conflicts.	2016-01-20 15:51:11 -06:00
Edward Richardson	e5c67cee83	Merge branch conflicts fix ... - CONFLICT (content): Merge conflict in src/p_acs.cpp - Updated position variables	2016-01-21 10:49:57 +13:00
Christoph Oelckers	bf747075e8	Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_hexen/a_clericstaff.cpp src/p_enemy.cpp src/p_interaction.cpp src/p_local.h src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp	2016-01-17 20:57:55 +01:00
Christoph Oelckers	cfcd2668cc	Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting ... Conflicts: src/p_pspr.cpp src/thingdef/thingdef_codeptr.cpp	2016-01-17 20:00:45 +01:00
Christoph Oelckers	fbaab5044d	Merge commit '38df0665e3a2018cf1d0028a36357df6c7e908e9' into scripting ... Conflicts: src/d_dehacked.cpp src/decallib.cpp src/g_hexen/a_clericstaff.cpp src/p_interaction.cpp src/p_local.h src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/constants.txt wadsrc/static/actors/shared/inventory.txt	2016-01-17 19:50:34 +01:00
Christoph Oelckers	5207aa6cc0	Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting ... Conflicts: src/p_local.h src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/shared/inventory.txt	2016-01-17 19:09:05 +01:00
Christoph Oelckers	65080a65c9	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-16 09:07:20 +01:00
alexey.lysiuk	e405fb4624	Set compatibility for Return to Hadron ... Updated version of Return to Hadron (dated 2016.01.03) has new version of E1M9: Prototype This map requires vanilla's P_PointOnLineSide() function to avoid issue with sleepy shotgun guys http://forum.zdoom.org/viewtopic.php?t=49544	2016-01-15 15:54:35 +02:00
Christoph Oelckers	9e33599536	- at least get the terms being used right. Of course it's not EDF (which would way beyond the scope of what's intended here) but only Extradata, that's being supported. ... (For EDF an external converter would make more sense.)	2016-01-12 09:13:55 +01:00
Christoph Oelckers	7c8d48bbfc	Merge branch 'edf-gl' ... Conflicts: src/actor.h src/p_spec.cpp	2016-01-12 00:02:17 +01:00
Christoph Oelckers	65022b780a	- implemented 'copy portal to wall' linedef type.	2016-01-11 22:44:53 +01:00
Christoph Oelckers	196c9bc34d	- cleaned up the skybox type detection logic.	2016-01-11 20:29:24 +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	feeaf29c46	- set translations for Eternity's linked portals for testing.	2016-01-10 10:05:05 +01:00
Christoph Oelckers	bdfac02f69	- EDF parser for linedefs and sectors. Also extended the Eternity xlat table to handle the parameterized types to the point EDF needs.	2016-01-10 10:05:05 +01:00
MajorCooke	bfd9e2bc1c	- Added CHF_STOPIFBLOCKED and CHF_DONTTURN macro. ... - CHF_STOPIFBLOCKED simply prevents the actor from changing directions for movement. - CHF_DONTTURN implies NORANDOMTURN, NOPOSTATTACKTURN and STOPIFBLOCKED.	2016-01-07 19:20:02 -06:00
MajorCooke	da9c3ff9d2	Added A_Wander Flags. ... - WF_NORANDOMTURN and WF_DONTANGLE do the same as their CHF_ counterparts for A_Wander.	2016-01-07 17:38:45 -06:00
MajorCooke	f357a36c5c	- New A_Chase flags. ... - CHF_NORANDOMTURN: Actor will not randomly turn during chasing to pursue its target. It will only turn if it cannot keep moving forward. - CHF_DONTANGLE: Actor does not adjust its angle to match the movement direction. - CHF_NOPOSTATTACKTURN: Actor will not make its first turn after exiting its attacks.	2016-01-07 17:38:25 -06:00
MajorCooke	ccc694bbcd	- Added the following flags, all affixed with CPXF_: ... - NODISTANCE: Disables distance checking. - CHECKSIGHT: The qualifying actor must be in sight in order to count. - SET<TARGET/MASTER/TRACER>: Gets the first qualifying actor and sets the calling actor's specified pointer to it. - SETONPTR: If the function is being aimed at another actor other than the caller, sets that actor's pointers instead. Requires a SET* flag to work. - FARTHEST: The actor farthest from the checking actor is set as the pointer. Requires a SET* flag to work. - CLOSEST: The closest qualifying actor is set as the pointer. Requires a SET* flag to work.	2016-01-07 17:09:02 -06:00
Christoph Oelckers	1b20a06ec4	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-06 17:16:06 +01:00
Christoph Oelckers	006d3022ca	- changed the BFG decal for Freedoom to blue. With the software renderer this will be displayed as gray due to lack of blue in the palette. (Itz's still better than green, though.)	2016-01-05 17:10:47 +01:00
Christoph Oelckers	a5a069a4b0	- use DMENUPIC as titlepic in doom2bfg.	2016-01-05 14:06:07 +01:00
Christoph Oelckers	68501dc784	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-05 12:23:50 +01:00
Christoph Oelckers	99bf013652	- added new IWAD name HERETICSR.WAD so that commercial Heretic and Shadows of the Serpent Riders can coexist.	2016-01-05 11:16:38 +01:00
coelckers	d7501a1414	Merge pull request #457 from j-palomo/turn180_controlmenu ... Added turn180 to the controls menu.	2016-01-05 10:09:40 +01:00
Christoph Oelckers	d68c97b42a	Merge branch 'zmaster'	2016-01-04 21:06:54 +01:00
Christoph Oelckers	111479063f	- fixed a potential overflow issue with calculating a portal's origin point. ... - fixed: Sector_SetPortal's Eternity translation was not correct. The ZDoom variant allows specifying the plane as part of the portal, Eternity does not. Added a new 'plane' type 3 which just means 'any'.	2016-01-04 21:05:09 +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
John Palomo Jr	b8b81e9809	Added turn180 to the controls menu.	2016-01-01 13:27:44 -05:00
Christoph Oelckers	3bad7f9b55	Merge branch 'master' of https://github.com/rheit/zdoom	2016-01-01 00:46:00 +01:00
Randy Heit	1d759283c0	Cleanup the zoom/reload/userX handling for A_WeaponReady ... - There was lots of code duplication. Consolidated it. - Renamed WRF_UserX to WRF_AllowUserX for consistancy.	2015-12-31 16:46:19 -06:00
Randy Heit	afbf88cc63	Remove WRF_ALLUSER.	2015-12-31 16:46:18 -06:00
MajorCooke	eed6680a67	Added support for weapon states User#. ... - Added keybinds for the user state triggering. - Added WRF_USER# flags which must be specified in order to use. - # can be 1-4.	2015-12-31 16:46:16 -06:00
Christopher Bruns	8e237e6146	Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d	2015-12-30 17:41:49 -05:00
Christoph Oelckers	86797b419f	Merge branch 'master' of https://github.com/rheit/zdoom	2015-12-30 12:28:55 +01:00
Christoph Oelckers	1def61e3e3	- allow changing the reverb and resampling mode setting for WildMidi. ... - fixed: WildMidi did not initialize the reverb data structures. - removed the menu option for midi_timiditylike.	2015-12-30 10:14:18 +01:00
Christoph Oelckers	e0f9a59a9a	- add WildMidi config file CVAR to menu.	2015-12-29 22:14:40 +01:00
alexey.lysiuk	69813993b0	- added missing hqNx modes to options menu	2015-12-25 10:00:31 +02:00
MajorCooke	452c82cbe2	- Added TF_SENSITIVEZ to A_Teleport. Fail teleportation instead of adjusting the actor to fit if they cannot. ... - When checking whether to use spot z or floorz, use spot floorz instead of ref for consistency.	2015-12-17 10:34:38 -06:00
Christoph Oelckers	37e8221067	Merge branch 'master' of https://github.com/rheit/zdoom	2015-12-15 22:07:10 +01:00
Christoph Oelckers	68a72d64a4	Merge branch 'master' of https://github.com/rheit/zdoom	2015-12-14 09:06:42 +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
Christopher Bruns	10088544c3	Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d ... Conflicts: src/win32/i_system.cpp	2015-12-09 18:34:20 -05:00
Edward Richardson	c099cd4581	SpawnParticle functions ... - Added A_SpawnParticle Decorate and SpawnParticle ACS functions.	2015-12-08 22:58:24 +13:00
Christoph Oelckers	5b4323ec6c	Merge branch 'master' of https://github.com/rheit/zdoom	2015-12-08 09:35:06 +01:00
Braden Obrzut	62d41a58a8	Merge branch 'DecProx3' of git://github.com/MajorCooke/zdoom into master	2015-12-07 00:53:06 -05:00
Christoph Oelckers	41f91148a1	Merge branch 'master' of https://github.com/rheit/zdoom	2015-12-02 09:31:27 +01:00
MajorCooke	8594bfaa8b	A_CustomPunch Extension ... - Added Melee/Miss parameters just like A_CustomMeleeAttack.	2015-11-30 11:42:08 -06:00
MajorCooke	4fb48b332b	Added A_CheckProximity. ... - Checks to see if a certain actor class, in numbers, is close to the actor/pointer via distance, based upon count. Can check for ancestry, disable Z searching, perform less than or equal to instead of greater or equal to, exact counts, check a pointer instead of itself and differentiate between live monsters and dead.	2015-11-28 10:53:34 -06:00
Christoph Oelckers	888f356e58	- use the recently added text input menu item to add the config file for GUS, the patch set for Fluidsynth and the timidity.exe path for Timidity++ to the menu. Even though there is no proper file select box, this is still better than nothing. ... - changed the text input item so that it realigns itself to show the entire text when in text input mode.	2015-11-28 12:43:01 +01:00
Christoph Oelckers	6e22be89e4	Merge branch 'master' of https://github.com/rheit/zdoom	2015-11-27 16:59:50 +01:00
Christoph Oelckers	fca469b053	- moved the notification messages for SendToCommunicator into LANGUAGE. ... As a side effect this will now allow using custom messages with this function as well by using the arg2 parameter as part of the message's name (arg2=0 will use TXT_COMM0, arg1 TXT_COMM1 and so on.)	2015-11-26 10:25:05 +01:00
MajorCooke	d730b06da7	Added A_CheckSpecies(state jump, name species, ptr = AAPTR_DEFAULT) ... - Performs a state jump if the defined species name for the pointed actor matches the criteria.	2015-11-26 01:33:02 -06:00
MajorCooke	a1e3112850	Removed FVF_RESETPITCH.	2015-11-25 23:15:59 -06:00
MajorCooke	ab5b1f479a	Updated A_FaceVelocity. ... - Now includes anglelimit and pitchlimit. - Anglelimit and pitchlimit only allows the actor to turn this much, similar to A_FaceTarget's limit. FVF_RESETPITCH also respects the pitch limit. - (offset, anglelimit, pitchlimit, flags, ptr)	2015-11-25 21:49:25 -06:00
Christoph Oelckers	01917d9f15	- fixed incorrect state settings in Macil.	2015-11-25 13:06:39 +01:00
coelckers	da39c86967	Merge pull request #401 from MajorCooke/RadiusGiveMinRange ... A_RadiusGive Mindist Parameter + RGF_OBJECTS Fix	2015-11-25 12:27:54 +01:00
MajorCooke	75855dc64a	A_FaceVelocity(offset, flags, ptr) ... - Changes the caller's angle and pitch according to the direction of velocity they're travelling. - FVF_NOPITCH and FVF_NOANGLE disable changing of pitch/angle respectively and should be counted as mutually exclusive, or the function does nothing. - FVF_INTERPOLATE - Interpolate's the angle and pitch changes. - FVF_RESETPITCH will, if there's no z velocity, reset the pitch to 0. Otherwise, the pitch remains unchanged.	2015-11-25 01:44:19 -06:00
Christopher Bruns	151b47c3ae	Merge branch 'master' of https://github.com/coelckers/gzdoom into merge_down ... Conflicts: src/win32/i_system.cpp	2015-11-03 20:21:27 -05:00
Christoph Oelckers	a5b43dfb66	Merge branch 'master' of https://github.com/rheit/zdoom	2015-11-03 23:55:41 +01:00
Christopher Bruns	0874455faf	Initial implementation of five 3D modes -- some bugs remain.	2015-10-30 20:51:35 -04:00
Braden Obrzut	a8ac748123	Merge commit 'e2d874e343da34df6edfad0bb47370cbe10f4bae'	2015-10-25 15:00:43 -04:00
alexey.lysiuk	c93bc2561e	Added Toggle Run action to Customize Controls menu	2015-10-15 10:33:28 +03:00
MajorCooke	75100d76fb	- Added Threshold Manipulation. ... - Added 'threshold' and 'defthreshold' to DECORATE expression exposure. - ChaseThreshold sets the default threshold for how long a monster must chase one target before it can switch targets. Default is 100, must not be negative. - A_SetChaseThreshold can be used to alter the current or default threshold of an actor <pointer>. - Changing current threshold has no effect on what the default will be once it hits 0 and something makes it infight with another.	2015-10-12 11:06:55 -05:00
coelckers	c1496ea1bf	Merge pull request #390 from MajorCooke/SetPainThreshold ... - Added A_SetPainThreshold for the calling actor('s pointer).	2015-10-11 15:55:32 +02:00
MajorCooke	455b70630d	- Added A_JumpIfCloser NoZ boolean. Disables Z distance checking if true.	2015-10-10 10:11:59 -05:00
MajorCooke	154e023800	- Added A_CheckBlock(state block, int flags, int ptr). ... - Performs a jump if an actor or a line is in the way. - Can be used without a jump state if the desire is only to have a pointer change. - CBF_NOLINES disables jumping if a line is involved. - CBF_SET* flags set the target, master or tracer to whoever is blocking, for the actor calling the function. - CBF_SETONPTR causes the pointer changing flags to apply to the pointed actor instead of itself.	2015-10-04 16:00:40 -05:00
MajorCooke	af9478f818	- Added Warp properties RadiusOffset and Pitch. ... - RadiusOffset is a multiplier of the target actor's radius added onto the offsets x and y. - Pitch is added to the warping actor's current pitch, provided WARPF_USEPITCH is supplied. - Fixed WARPF_TOFLOOR not working as intended.	2015-10-03 17:28:54 -05:00
MajorCooke	28622cecaf	- Added mindist parameter to A_RadiusGive. ... - Actors must be this far away to receive items. Mindist must be less than distance. - Fixed RGF_OBJECTS not discriminating players and monsters from shootable or vulnerable actors.	2015-09-29 11:40:44 -05:00
Christoph Oelckers	f58b67b11d	. added MBF dog sounds to Dehacked sound table.	2015-09-28 09:09:52 +02:00
Christoph Oelckers	4e1723eeb7	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: wadsrc/static/compatibility.txt	2015-09-19 12:32:22 +02:00
Christoph Oelckers	9d68fd8fe9	Merge branch 'master' of https://github.com/rheit/zdoom	2015-09-18 17:37:34 +02:00
MajorCooke	6730525855	- Added A_SetPainThreshold for the calling actor('s pointer).	2015-09-17 09:07:13 -05:00
alexey.lysiuk	4de57cd296	Fixed compatibility issues on MAP25 of Eternal Doom ... See http://forum.zdoom.org/viewtopic.php?f=2&t=49577	2015-09-17 10:14:54 +03:00
alexey.lysiuk	6ee0672885	Fixed missing hit sound for Heretic weapon Dragon Claw ... See http://forum.zdoom.org/viewtopic.php?f=2&t=49459	2015-09-16 13:38:47 +03:00
alexey.lysiuk	f4b637db62	Changed compatibility fix for Nuke Mine E1M2 ... http://forum.zdoom.org/viewtopic.php?f=7&t=34013	2015-09-15 19:30:32 +03:00
alexey.lysiuk	66437e32f6	Added compatibility setting for Return to Hadron E1M9 ... See http://forum.zdoom.org/viewtopic.php?f=2&t=49544	2015-09-15 19:29:43 +03:00
alexey.lysiuk	ee7eb3253a	Added compatibility flag for point-on-line algorithm ... It's possible to use original but buggy implementations of P_PointOnLineSide() and P_PointOnDivlineSide() function See http://forum.zdoom.org/viewtopic.php?f=2&t=49544	2015-09-15 16:45:20 +03:00
Christoph Oelckers	0f425c4c3c	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: wadsrc/static/compatibility.txt	2015-09-15 12:53:28 +02:00
Xaser Acheron	8948f5dc2b	Added FPF_NOAUTOAIM to A_FireCustomMissile	2015-09-08 10:40:21 -05:00
MajorCooke	143a4c78a9	- Added A_SetFloatSpeed. ... - Sets the FloatSpeed of the actor/pointer.	2015-09-06 19:57:43 -05:00
Christoph Oelckers	213216368a	- more DECORATE fixing of Doom monsters, this time the Mancubus. ... It looks like the definitions that got added on November 4th, 2006 had some issues that mostly went unnoticed over time...	2015-09-06 16:36:32 +02:00
Christoph Oelckers	23cc7da268	Merge branch 'master' of https://github.com/rheit/zdoom	2015-09-06 16:01:18 +02:00
Christoph Oelckers	bca50c58b3	- removed A_NoBlocking call from Commander Keen.	2015-09-06 16:00:47 +02:00
alexey.lysiuk	68ea99016c	Compatibility fix for Whispers of Satan MAP29 ... Insta-death pit (sector 1497) is now working as intended independently from compatibility settings	2015-09-06 15:45:10 +03:00
Christoph Oelckers	61e09da1be	Merge branch 'master' of https://github.com/rheit/zdoom	2015-09-06 08:41:27 +02:00
Christoph Oelckers	c7f3a3a7c2	Merge branch 'master' of https://github.com/rheit/zdoom	2015-09-02 23:16:33 +02:00
Christoph Oelckers	1a275a7e8e	- removed the initial extra state of Heretic's Mummy's projectile to restore the original sound behavior.	2015-09-02 23:15:41 +02:00
Braden Obrzut	1a25e35f3c	Merge branch 'spider-radius'	2015-08-29 11:01:49 -04:00
Edward Richardson	0ed4549683	Correct the mastermind's radius	2015-08-30 02:47:45 +12:00
Christoph Oelckers	0a8255f34b	Merge branch 'master' of https://github.com/rheit/zdoom	2015-08-27 12:49:23 +02:00
Christoph Oelckers	d87b6d6337	Merge branch 'WarpHeightOffset' of https://github.com/MajorCooke/zdoom	2015-08-26 08:46:20 +02:00
MajorCooke	f9e70a82c6	- Added A_SetSpecies(<species>,<pointer>).	2015-08-24 12:45:10 -05:00
Christoph Oelckers	2d58a28cc3	- fixed: In Heretic an active Tome of Power should not freeze a teleporting player. ... This was implemented by adding a new inventory flag INVENTORY.NOTELEPORTFREEZE so that the effect can both be activated for other items and deactivated for the two that currently have it.	2015-08-16 08:50:22 +02:00
Christoph Oelckers	5a7afad0b3	Merge branch 'master' of https://github.com/rheit/zdoom	2015-08-12 10:08:01 +02:00
Christoph Oelckers	2ed3cec4db	- externalized strings from Raven intermission screen.	2015-08-11 22:30:29 +02:00
MajorCooke	87cc3f77f9	- Removed WARPF_ADDHEIGHT.	2015-08-10 16:05:44 -05:00
MajorCooke	54af1e379e	- Removed WARPF_MULHEIGHT. Enable its ability by default. ... - WARPF_ADDHEIGHT will simply change HeightOffset from multiplying to adding by default.	2015-08-10 15:03:29 -05:00
MajorCooke	ad14caa800	- Added A_Warp heightoffset property. Only has an effect by two flags. ... - WARPF_ADDHEIGHT adds the pointed actor's height to heightoffset, and adds to the pointed actor's z position. - WARPF_MULHEIGHT multiplies the pointed actor's height by heightoffset, and adds to the pointed actor's z position. Overridden by ADDHEIGHT.	2015-08-10 11:19:54 -05:00
MajorCooke	e7aa5c690a	Minor oversight...	2015-08-10 06:48:24 -05:00
MajorCooke	fcf1d56b1a	- Added SXF_IS<TARGET/MASTER/TRACER>. ... - The spawned actor becomes the calling actor's specified pointers respectively.	2015-08-09 14:06:22 -05:00
Christoph Oelckers	57150c8718	- fixed incorrect Strife player death sound.	2015-08-01 23:15:57 +02:00
Christoph Oelckers	40a2665726	- fixed incorrect Strife player death sound.	2015-08-01 11:56:44 +02:00
Christoph Oelckers	36974431ba	Merge branch 'master' into scripting ... Conflicts: src/thingdef/thingdef_codeptr.cpp	2015-08-01 09:42:31 +02:00
Christoph Oelckers	44d25afaef	Merge branch 'master' of https://github.com/rheit/zdoom	2015-08-01 09:38:37 +02:00
Benjamin Moir	efce2a200c	Added WARPF_USETID to A_Warp	2015-07-31 22:24:01 +09:30
MajorCooke	b4f05ee89b	- Significant A_RadiusGive update. ... - Added filter and species parameter. - Added new flags: RGF_INCLUSIVE, RGF_ITEMS, RGF_KILLED, RGF_EXFILTER, RGF_EXSPECIES, and RGF_EITHER. - RGF_ITEMS: Items can receive inventory. - RGF_KILLED: Actors who are truly dead might not be corpses, and vice versa. - RGF_EXFILTER: Blacklists the specified actor filter. All but the filtered actor can receive the item. - RGF_EXSPECIES: Blacklists the specified species. All but the filtered species can receive the item. - RGF_EITHER: The actor can receive the item if it satisfies either the filter or the species. Only useful when both are used. - RGF_INCLUSIVE: An actor marked as more than one pointer to the calling actor can ignore the exclusion pointers, but only if at least one is missing. I.e. an actor who is a target and tracer of the calling actor can still receive the item, if the calling actor doesn't pass RGF_NOTARGET and NOTRACER at the same time. RGF_INCLUSIVE only works with the pointer filtering flags. By default, if not specified, the actor will not be loopholed the item if they are under any one of the three filters. - Fixed discrepancies and dependencies upon several flags and actor conditions which caused the function to fail.	2015-07-22 16:46:14 -05:00
Christoph Oelckers	d8ea128f38	Merge branch 'master' into scripting ... Conflicts: src/p_effect.cpp src/p_effect.h src/p_local.h src/p_map.cpp src/thingdef/thingdef_codeptr.cpp	2015-07-16 20:37:17 +02:00
Christoph Oelckers	d58d38a1d3	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/p_3dfloors.cpp	2015-07-13 21:36:19 +02:00
Randy Heit	9edf409ea2	Add British English "translation", because u's matter	2015-06-30 13:11:33 -05:00
Christoph Oelckers	76c401a41e	- added 'nopushwindowcheck' for Hexen's MAP30 which abuses a glitch with a 'projectile impact' line on a two-sided wall.	2015-06-18 10:20:04 +02:00
Christoph Oelckers	7ba577e1b0	Merge branch 'master' into scripting ... Conflicts: src/g_heretic/a_hereticweaps.cpp src/thingdef/thingdef_codeptr.cpp	2015-06-07 09:43:54 +02: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
Braden Obrzut	c9214c1ce9	- Fixed: Hexen's status bar top graphic was drawn 1 pixel too low. ... - Fixed: Artiflash played on initial save loading. I seem to recall this looking like an intentional change, but perhaps I broke it since it's completely pointless to play the animation only on the first load of a save game if nothing has been loaded beforehand.	2015-05-20 13:10:08 -04:00
Christoph Oelckers	48ae605b7d	Merge branch 'master' into scripting ... Conflicts: src/thingdef/thingdef_codeptr.cpp	2015-05-02 22:44:31 +02:00
Christoph Oelckers	db8cd859a6	Merge branch 'master' of https://github.com/rheit/zdoom	2015-05-02 21:29:29 +02:00
MajorCooke	dc00d61f4d	- Added TF_OVERRIDE to A_Teleport. ... - Overrides the NOTELEPORT flag so actors with velocity don't need to disable it in order to perform A_Teleport, which could be screwed up by a teleporting line or sudden ACS interference. - Ensure that the result is set to false if it fails prematurely. Wasn't sure if this was needed, but with the upcoming if/else statements, better safe than sorry.	2015-05-01 08:32:07 -05:00
Christoph Oelckers	bb85625d52	Merge branch 'master' of https://github.com/rheit/zdoom	2015-05-01 00:08:42 +02:00
Christoph Oelckers	1b29c3b6cf	Merge branch 'master' into scripting ... Conflicts: src/p_interaction.cpp tools/lemon/lemon.c	2015-04-30 16:13:32 +02:00
MajorCooke	1ecc048441	- Change the pointer to be at the end instead of the start.	2015-04-30 08:28:41 -05:00
MajorCooke	492ef1b716	- Added A_JumpIfHigherOrLower. ... - (int ptr = AAPTR_TARGET, state high, state low, float offsethigh = 0, float offsetlow = 0, bool includeHeight = true) - Jumps if the pointer of the calling actor is higher or lower than itself, adding offsethigh or offsetlow depending on the circumstance. - includeHeight works twofold. - Includes the height of the calling actor if the pointer is higher to truly determine if they are completely above them or not. - Includes the height of the pointer if the pointer is lower. - Disable it to only check z differences without adding height.	2015-04-30 08:15:48 -05:00
Christoph Oelckers	5f1c4d157c	Merge branch 'master' into scripting ... Conflicts: src/g_shared/a_sharedglobal.h src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_data.cpp	2015-04-30 12:30:36 +02:00
coelckers	691855e19b	Merge pull request #304 from MajorCooke/morphundoalways ... - Added MORPH_UNDOALWAYS for morph powerups.	2015-04-30 09:05:41 +02:00
coelckers	c2e91293d2	Merge pull request #310 from MajorCooke/telefogfix ... - Allow teleport fogs to set the teleporting actors as their targets, so...	2015-04-30 09:02:10 +02:00
Christoph Oelckers	2e0f999fea	Merge branch 'master' into scripting ... Conflicts: src/p_effect.cpp src/p_effect.h src/p_local.h src/p_map.cpp src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/actor.txt wadsrc/static/actors/shared/inventory.txt zdoom.vcproj	2015-04-28 14:45:13 +02:00
Christoph Oelckers	8447990889	Merge commit '2719ce86dc07c9f7b1ad6d61a9a49c974896abf2' into scripting ... Conflicts: src/info.h src/thingdef/thingdef_codeptr.cpp (until right before the main work for multiple tags.)	2015-04-28 13:32:50 +02:00
Christoph Oelckers	f7834061df	Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting ... Conflicts: src/dobjtype.cpp src/p_conversation.cpp src/p_local.h src/p_things.cpp src/thingdef/thingdef_properties.cpp (This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)	2015-04-28 13:08:18 +02:00
Christoph Oelckers	ddced06be2	Merge commit '6e45c565a0bc8d05279b0b2458a3fb718ae0924c' into scripting ... Conflicts: src/p_mobj.cpp (This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)	2015-04-28 12:59:20 +02:00
Christoph Oelckers	0474560ac6	Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting ... Conflicts: src/d_main.cpp src/info.cpp src/p_local.h (Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.	2015-04-28 12:54:01 +02:00
Christoph Oelckers	065c0a79cd	Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting ... Conflicts: src/d_main.cpp src/info.cpp src/info.h src/p_acs.cpp src/p_interaction.cpp src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_properties.cpp (scripting branch update part 5)	2015-04-28 12:48:33 +02:00
Christoph Oelckers	792cad89b3	Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting ... Conflicts: src/g_hexen/a_clericstaff.cpp src/g_hexen/a_hexenspecialdecs.cpp src/p_acs.cpp src/p_enemy.cpp src/p_interaction.cpp src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_expression.cpp (Scripting branch update part 4)	2015-04-28 11:59:33 +02:00
Christoph Oelckers	d6e3fc0567	Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting ... Conflicts: src/info.cpp src/thingdef/thingdef_expression.cpp wadsrc/static/actors/constants.txt (Scripting branch update part 2)	2015-04-28 09:57:01 +02:00
Christoph Oelckers	56989d3422	Merge commit 'ec5817869592660af6837b9f4e20ed140972a2b2' into scripting ... Conflicts: src/p_enemy.cpp src/p_enemy.h wadsrc/static/actors/constants.txt (Scripting branch update part 1)	2015-04-28 09:34:51 +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	3ddc3d8feb	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/CMakeLists.txt	2015-04-27 09:41:06 +02:00
Christoph Oelckers	020808ff40	- updated pistol pickup sprite with one from original beta graphics.	2015-04-27 08:57:36 +02:00
Christoph Oelckers	aecff68a4d	- cleanup of sound system startup and menu handling: ... * added global functions that check whether FMod and OpenAL are present, without initializing the sound backend. * make sound init code more fault tolerant. It will now try to switch between FMod and OpenAL if the currently active one cannot be found but the other one can. * added 'ifoption' checks for sound backend to menu code. * only show sound backends which are present and hide the options for the ones which are not.	2015-04-26 12:13:21 +02:00
Christoph Oelckers	ab1d90038c	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/p_3dfloors.cpp	2015-04-25 19:45:27 +02:00
Christoph Oelckers	1f2a431d15	Merge branch 'master' into openal	2015-04-24 09:21:06 +02:00
Chronos Ouroboros	6a6836b1e7	Added SpiralOffset to railgun functions.	2015-04-23 15:11:54 -03:00
Randy Heit	7ee1853403	Remove OpenAL and Sound Manager output options for FMOD ... - OpenAL never actualy worked properly and was removed in later FMODs. - Sound Manager was deprecated by Apple long ago and is not supported for 64-bit applications. It was also removed in later FMODs.	2015-04-22 19:09:33 -05:00
Christoph Oelckers	45f893f8fc	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-16 18:08:23 +02:00
Blue-Shadow	ccb49a4242	Fixed: missing '=' in conversation ID defs ... Conversation ID definitions in strifeteaser1 were missing the equal sign between the ID and actor class name.	2015-04-14 19:13:25 +03:00
Christoph Oelckers	fe769bbdc5	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-08 00:40:40 +02:00
MajorCooke	1799ae91c9	- Allow teleport fogs to set the teleporting actors as their targets, so modders can create interactions between the two. ... - Fixed: P_MoveThing had source and destination fog spawning backwards. - Fixed a case where the NOTELEPORT flag would be ignored on A_Teleport. - Added pointer selection to A_Teleport. Defaults to AAPTR_DEFAULT (calling actor). State jumps will only be done by the calling actor.	2015-04-07 11:14:02 -05:00
Christoph Oelckers	268e7df992	- fixed: We must not allow the engine to start without a default MAPINFO definition. ... Both 'Adventures of Square' IWADs were missing an entry for base MAPINFO and as a result did not define the common editor numbers. To prevent this, a new mindefaults MAPINFO was added to zdoom.pk3 which now gets loaded if IWADINFO does not specify a game-specific file. This minimum setting sets all gamedefaults to a reasonable base value and defines all other things that are required to be defined.	2015-04-07 14:09:55 +02:00
Christoph Oelckers	1d0706cb61	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-07 08:54:17 +02:00
Christoph Oelckers	cf7c04b605	- more autoload name changing: hacx.1/2 -> hacx.hacx1/2 and chex.1/3 -> chex.chex1/3	2015-04-07 08:41:45 +02:00
Christoph Oelckers	2cc6e74b31	- renamed Hacx's autoload sections to remove minor version numbers.	2015-04-06 21:43:55 +02:00
Christoph Oelckers	3241b1d3db	- add new config section names to iwadinfo.txt	2015-04-06 11:31:08 +02:00
Randy Heit	c36222d2ef	Externalized default key bindings	2015-04-05 21:40:53 -05:00
Randy Heit	62d036a63e	Added gametype-based filter ... - For when IWADs are too specific, filter by the base gametype too. - Minor small edits to the sndinfo.txt files so that zipdir will notice the changes, since it doesn't check path names when checking for file differences.	2015-04-05 20:24:49 -05:00
Christoph Oelckers	b45c88fc4f	- changed shaders.	2015-04-05 20:20:56 +02:00
Christoph Oelckers	8762ab48d3	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-05 09:47:27 +02:00
Randy Heit	89054f5d60	Use filtering and LOADACS to autoload strfhelp.o ... - No more special case for STRFHELP in the executable!	2015-04-04 18:40:48 -05:00
Christoph Oelckers	b6a4511dd1	- move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences.	2015-04-05 00:31:15 +02:00
Christoph Oelckers	a5c75c1b1a	- added some missing autoload sections (Hacx 1.2 vs. Hacx 2, Hexen vs Deathkings and Heretic vs. Shadows of the Serpent Riders.) and filter names for Strifeteaser1 and Strifeteaser2 which are needed for exporting the conversation IDs to MAPINFO	2015-04-04 20:44:27 +02:00
Christoph Oelckers	b0c0012d60	- add dynamic lights to editor number table and remove them from DECORATE definitions.	2015-04-04 10:42:44 +02:00
Christoph Oelckers	39b5bcc4f0	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-04 10:38:28 +02:00
Christoph Oelckers	a65c9bec40	- move video options override out of menudef.z. ... This is to allow easier merging with future ZDoom changes It was done this way only to avoid having to deal with SVN's poor merging capabilities but with Git this is no longer an issue. The OpenGL submenus will remain where they are, though.	2015-04-04 10:37:31 +02:00
Christoph Oelckers	5f2f11a43b	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-04 10:32:23 +02:00
Christoph Oelckers	747e160c96	Merge branch 'master' of https://github.com/rheit/zdoom	2015-04-04 10:30:37 +02:00
Christoph Oelckers	338a220df8	- add empty editor number mapping for GZDoom's dynamic lights so that these will no longer produce errors when loaded with ZDoom.	2015-04-04 10:30:09 +02:00
Christoph Oelckers	51591d10b0	- handle slope things through new definition tables as well. Since these get processed outside P_SpawnMapThing it required some restructuring so that the actual spawn data is present when slope things get processed. ... - removed FMapThing::Serialize because it isn't used anywhere - it was rather broken anyway.	2015-04-04 10:25:01 +02:00
Randy Heit	a5e67f7332	Split sndinfo.txt up into multiple files using filter directories. ... - This means the original need for $ifdoom, $ifheretic, etc directives is no more, but they need to stay for compatibility with third-party wads that use them.	2015-04-03 22:58:58 -05:00
Christoph Oelckers	2ec8e2c2ac	- moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them.	2015-04-04 00:39:09 +02:00
Christoph Oelckers	9e5bf38123	- handle all special mapthing items (player starts, polyobj spots) via the new MAPINFO method instead of hard coding them in the spawn function. ... (Note: The buildmap loading code should be adjusted to the new functionality as well eventually.)	2015-04-03 21:17:10 +02:00
MajorCooke	087d564343	- Added MORPH_UNDOALWAYS for morph powerups.	2015-04-03 12:16:27 -05:00
Christoph Oelckers	463d495b80	- strife was broken, too...	2015-04-03 16:44:41 +02:00
Christoph Oelckers	8b06b24035	- took editor numbers out of DECORATE definitions.	2015-04-03 16:34:07 +02:00
Christoph Oelckers	9617b4afa8	- fix more search&replace mess.	2015-04-03 16:31:28 +02:00
Christoph Oelckers	937d793353	- fixed Hexen editor numbers.	2015-04-03 15:34:41 +02:00
Christoph Oelckers	bd77f83bab	- added editor number definitions to MAPINFO.	2015-04-03 13:54:38 +02:00
Christoph Oelckers	f0886ce1f1	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/version.h	2015-04-03 09:45:04 +02:00
Randy Heit	ef562c0341	Add dot sprites for Hexen beta flies	2015-04-02 17:53:15 -05:00
Randy Heit	d37f9cbcae	Add flies (doomed #112) from the Hexen retail beta ... ...because it brought back memories of adding Strife support. - The search function is radically different, but the flying mechanics are the same.	2015-04-02 17:52:54 -05:00
Christoph Oelckers	60d9f38084	Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/v_video.cpp	2015-04-01 11:59:20 +02:00
Christoph Oelckers	d481ba7b5a	- fixed: The replacement actors for A_SetTelefog should not require inheriting from TeleportFog.	2015-03-31 22:11:16 +02:00
Christoph Oelckers	6eb4e2a224	Merge branch 'master' of https://github.com/rheit/zdoom	2015-03-31 18:25:31 +02:00
Christoph Oelckers	4d59190446	- redit commit 5f56fb5a16 without altering the line endings throughout thingdef_codeptr.cpp. ... * Changed the behavior of SetActorTeleFog. - Don't force "null" to resolve to no actor since "none" is already defined as NULL (via FindClass). (This change also applies to the decorate properties.) - Passing an empty actor name will keep the existing fog since there's otherwise no way set only one fog. Since "none" works to remove the fog, I see no reason not to have this option.	2015-03-31 09:24:16 +02:00
Randy Heit	9cd6aae902	Added Archvile ghosts compatibility flags for some more maps	2015-03-26 22:02:10 -05:00