From 601280bb64fe49de64d957210b1986dc267d80c3 Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Tue, 28 Oct 2014 09:31:37 +0000
Subject: [PATCH] Game configurations, UDMF: added "midtex3dimpassible" linedef
flag. Linedef Edit form: resized controls to show all flags without
scrolling. Updated ACS and DECOTARE ZDoom configurations.
---
Build/Configurations/Includes/UDMF_misc.cfg | 2 +-
Build/Configurations/Includes/ZDoom_misc.cfg | 1 +
Build/Scripting/ZDoom_ACS.cfg | 5 +-
Build/Scripting/ZDoom_DECORATE.cfg | 63 +++++++++++-------
Source/Core/Resources/Screenshot.png | Bin 578 -> 363 bytes
.../Core/Resources/ScreenshotActiveWindow.png | Bin 508 -> 294 bytes
.../Windows/LinedefEditFormUDMF.Designer.cs | 36 +++++-----
Source/Core/Windows/LinedefEditFormUDMF.resx | 3 -
8 files changed, 63 insertions(+), 47 deletions(-)
diff --git a/Build/Configurations/Includes/UDMF_misc.cfg b/Build/Configurations/Includes/UDMF_misc.cfg
index 0f5be276f..8b20e8968 100644
--- a/Build/Configurations/Includes/UDMF_misc.cfg
+++ b/Build/Configurations/Includes/UDMF_misc.cfg
@@ -80,7 +80,7 @@ linedefflags
secret = "Secret";
blocksound = "Block sound";
dontdraw = "Hidden";
- transparent = "Transparent (opacity is 25%)";
+ transparent = "Transparent (25% opacity)";
mapped = "Initially shown on automap";
}
diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg
index a3a1b545c..7992ecada 100644
--- a/Build/Configurations/Includes/ZDoom_misc.cfg
+++ b/Build/Configurations/Includes/ZDoom_misc.cfg
@@ -37,6 +37,7 @@ linedefflags_udmf
clipmidtex = "Clip middle texture";
wrapmidtex = "Wrap middle texture";
midtex3d = "Walkable middle texture";
+ midtex3dimpassible = "Impassible middle texture";
blockprojectiles = "Block projectiles";
blockhitscan = "Block hitscans";
blockuse = "Block use actions";
diff --git a/Build/Scripting/ZDoom_ACS.cfg b/Build/Scripting/ZDoom_ACS.cfg
index e3906d19d..2138b3c69 100644
--- a/Build/Scripting/ZDoom_ACS.cfg
+++ b/Build/Scripting/ZDoom_ACS.cfg
@@ -62,6 +62,7 @@ keywords
Bool = "Bool expression";
Break = "Break";
CancelFade = "void CancelFade(void)\nIf either FadeTo or FadeRange is currently in progress,\nCancelFade stops it and turns off the palette flash.";
+ CanRaiseActor = "bool CanRaiseActor(int tid)\nChecks to see if the actor or actors with the specified tid are viable for resurrection.\nIf tid is 0, the check is done on the activator of the script.";
Case = "Case expression";
Ceiling_CrushAndRaise = "Ceiling_CrushAndRaise(tag, speed, crush, crushmode)";
Ceiling_CrushAndRaiseA = "Ceiling_CrushAndRaiseA(tag, dspeed, uspeed, crush, crushmode)";
@@ -242,6 +243,7 @@ keywords
Int = "Int expression";
//IsMultiplayer = "int IsMultiplayer(void)";
//IsOneFlagCTF = "int IsOneFlagCTF(void)";
+ IsPointerEqual = "bool IsPointerEqual(int ptr_select1, int ptr_select2[, int tid1[, int tid2]])";
IsTIDUsed = "bool IsTIDUsed (int tid)";
Light_ChangeToValue = "Light_ChangeToValue(tag, value)";
Light_Fade = "Light_Fade(tag, value, tics)";
@@ -272,7 +274,7 @@ keywords
Net = "Script expression Net";
NoiseAlert = "NoiseAlert(target_tid, emiter_tid)";
Open = "Script expression Open";
- PickActor = "bool PickActor(int source, fixed angle, fixed pitch, fixed distance, int tid[, int actorMask = MF_SHOOTABLE[, int wallMask = ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN]])";
+ PickActor = "bool PickActor(int source_tid, fixed angle, fixed pitch, fixed distance, int tid[, int actorMask = MF_SHOOTABLE[, int wallMask = ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN[, bool forcetid = false]]])";
Pickup = "Script expression Pickup";
Pillar_Build = "Pillar_Build(tag, speed, height)";
Pillar_BuildAndCrush = "Pillar_BuildAndCrush(tag, speed, height, crush, crushmode)";
@@ -502,6 +504,7 @@ constants
{
AAPTR_DEFAULT;
AAPTR_FRIENDPLAYER;
+ AAPTR_GET_LINETARGET;
AAPTR_MASTER;
AAPTR_NULL;
AAPTR_PLAYER_GETCONVERSATION;
diff --git a/Build/Scripting/ZDoom_DECORATE.cfg b/Build/Scripting/ZDoom_DECORATE.cfg
index 7cffa2717..f5a69ce53 100644
--- a/Build/Scripting/ZDoom_DECORATE.cfg
+++ b/Build/Scripting/ZDoom_DECORATE.cfg
@@ -48,14 +48,14 @@ keywords
A_RaiseChildren = "A_RaiseChildren";
A_RaiseMaster = "A_RaiseMaster";
A_RaiseSiblings = "A_RaiseSiblings";
- A_Remove = "A_Remove(int pointer, int flags)";
- A_RemoveChildren = "A_RemoveChildren[(bool all)]";
- A_RemoveMaster = "A_RemoveMaster";
- A_RemoveSiblings = "A_RemoveSiblings[(bool all)]";
- A_RemoveTarget = "A_RemoveTarget";
- A_RemoveTracer = "A_RemoveTracer";
+ A_Remove = "A_Remove(int pointer, int flags)\nFlags: RMVF flags.";
+ A_RemoveChildren = "A_RemoveChildren[(bool = false[, int flags = 0])]\nFlags: RMVF flags.";
+ A_RemoveMaster = "A_RemoveMaster[(int flags = 0)]\nFlags: RMVF flags.";
+ A_RemoveSiblings = "A_RemoveSiblings[(bool all = false[, int flags = 0])]\nFlags: RMVF flags.";
+ A_RemoveTarget = "A_RemoveTarget[(int flags)]\nFlags: RMVF flags.";
+ A_RemoveTracer = "A_RemoveTracer[(int flags)]\nFlags: RMVF flags.";
A_SentinelBob = "A_SentinelBob";
- A_Teleport = "A_Teleport[(string teleportstate[, string targettype[, string fogtype[, int flags[, float mindist[, float maxdist]]]]])]";
+ A_Teleport = "A_Teleport[(string teleportstate = 'Teleport'[, string targettype = 'BossSpot'[, string fogtype = 'TeleportFog'[, int flags = 0[, float mindist = 0[, float maxdist = 0]]]]])]";
A_VileChase = "A_VileChase";
A_Wander = "A_Wander";
//Generic monster attacks
@@ -131,10 +131,10 @@ keywords
A_JumpIfHealthLower = "A_JumpIfHealthLower(int health, int offset OR string state[, int pointer])";
A_JumpIfInventory = "A_JumpIfInventory (string inventorytype, int amount, int offset OR string state[, int owner])";
A_JumpIfInTargetInventory = "A_JumpIfInTargetInventory(string item, int count, int offset OR string state[, pointer forward])";
- A_JumpIfInTargetLOS = "A_JumpIfInTargetLOS(int offset OR string state[, float fov[, int flags[, float dist_max[, float dist_close]]]])";
+ A_JumpIfInTargetLOS = "A_JumpIfInTargetLOS(int offset OR string state[, float fov = 0[, int flags = 0[, float dist_max = 0[, float dist_close = 0]]]])\nflags: JLOSF flags.";
A_JumpIfMasterCloser = "A_JumpIfMasterCloser(int distance, int offset OR string state)";
A_JumpIfNoAmmo = "A_JumpIfNoAmmo(int offset OR string state)";
- A_JumpIfTargetInLOS = "A_JumpIfTargetInLOS(int offset OR string state[, float fov[, int flags[, float dist_max[, float dist_close]]]])";
+ A_JumpIfTargetInLOS = "A_JumpIfTargetInLOS(int offset OR string state[, float fov = 0[, int flags = 0[, float dist_max = 0[, float dist_close = 0]]]])\nflags: JLOSF flags.";
A_JumpIfTargetInsideMeleeRange = "A_JumpIfTargetInsideMeleeRange(int offset OR string state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is within melee range of the caller.";
A_JumpIfTargetOutsideMeleeRange = "A_JumpIfTargetOutsideMeleeRange(int offset OR string state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is beyond melee range of the caller.";
A_JumpIfTracerCloser = "A_JumpIfTracerCloser (int distance, int offset OR string state)";
@@ -297,7 +297,8 @@ keywords
Light = "Light(string lightname)";
Offset = "Offset(int x, int y)";
//Special functions
- CheckClass = "bool CheckClass(string classname[, int ptr_select = AAPTR_DEFAULT[, bool match_superclass = false]])";
+ CheckClass = "bool CheckClass(string classname[, int ptr_select = AAPTR_DEFAULT[, bool match_superclass = false]])";
+ IsPointerEqual = "bool IsPointerEqual(int ptr_select1, int ptr_select2)";
}
constants
@@ -351,30 +352,30 @@ constants
AAPTR_TRACER;
AAPTR_PLAYER;
AAPTR_PLAYER_GETTARGET;
- AAPTR_PLAYER_GETCONVERSATION;
- SXF_ABSOLUTEANGLE;
+ AAPTR_PLAYER_GETCONVERSATION;
+ SXF_TRANSFERTRANSLATION;
SXF_ABSOLUTEPOSITION;
+ SXF_ABSOLUTEANGLE;
SXF_ABSOLUTEVELOCITY;
- SXF_CLEARCALLERSPECIAL;
- SXF_CLEARCALLERTID;
- SXF_CLIENTSIDE;
- SXF_MULTIPLYSPEED;
- SXF_NOCHECKPOSITION;
- SXF_NOPOINTERS;
SXF_SETMASTER;
- SXF_SETTARGET;
- SXF_SETTRACER;
+ SXF_NOCHECKPOSITION;
SXF_TELEFRAG;
- SXF_TRANSFERALPHA;
SXF_TRANSFERAMBUSHFLAG;
SXF_TRANSFERPITCH;
SXF_TRANSFERPOINTERS;
- SXF_TRANSFERRENDERSTYLE;
+ SXF_USEBLOODCOLOR;
+ SXF_CLEARCALLERTID;
+ SXF_MULTIPLYSPEED;
SXF_TRANSFERSCALE;
SXF_TRANSFERSPECIAL;
+ SXF_CLEARCALLERSPECIAL;
SXF_TRANSFERSTENCILCOL;
- SXF_TRANSFERTRANSLATION;
- SXF_USEBLOODCOLOR;
+ SXF_TRANSFERALPHA;
+ SXF_TRANSFERRENDERSTYLE;
+ SXF_SETTARGET;
+ SXF_SETTRACER;
+ SXF_NOPOINTERS;
+ SXF_ORIGINATOR;
//weapon flags
WRF_NOBOB;
WRF_NOFIRE;
@@ -419,6 +420,8 @@ constants
MSF_Standard;
MSF_Classic;
MSF_DontHurt;
+ TF_TELEFRAG;
+ TF_RANDOMDECIDE;
//combo flags
Monster;
Projectile;
@@ -486,6 +489,7 @@ constants
SEEINVISIBLE;
//Defenses
INVULNERABLE;
+ BUDDHA;
REFLECTIVE;
SHIELDREFLECT;
DEFLECT;
@@ -495,6 +499,7 @@ constants
DONTMORPH;
DONTSQUASH;
NOTELEOTHER;
+ HARMFRIENDS;
DOHARMSPECIES;
DONTHARMCLASS;
DONTHARMSPECIES;
@@ -543,6 +548,7 @@ constants
BLOODLESSIMPACT;
BLOODSPLATTER;
FOILINVUL;
+ FOILBUDDHA;
SEEKERMISSILE;
SCREENSEEKER;
SKYEXPLODE;
@@ -634,6 +640,7 @@ constants
INVENTORY.RESTRICTABSOLUTELY;
INVENTORY.NOSCREENFLASH;
INVENTORY.TOSSED;
+ INVENTORY.ALWAYSRESPAWN;
//Weapons
WEAPON.NOAUTOFIRE;
WEAPON.READYSNDHALF;
@@ -693,6 +700,7 @@ constants
CLOFF_SKIPOBSTACLES;
CLOFF_SKIPTARGET;
DMSS_AFFECTARMOR;
+ DMSS_FOILBUDDHA;
DMSS_FOILINVUL;
DMSS_KILL;
DMSS_NOFACTOR;
@@ -705,6 +713,13 @@ constants
JLOSF_CLOSENOJUMP;
JLOSF_DEADNOJUMP;
JLOSF_CHECKMASTER;
+ JLOSF_TARGETLOS;
+ JLOSF_FLIPFOV;
+ JLOSF_ALLYNOJUMP;
+ JLOSF_COMBATANTONLY;
+ JLOSF_NOAUTOAIM;
+ JLOSF_CHECKTRACER;
+ KILS_FOILBUDDHA;
KILS_FOILINVUL;
KILS_KILLMISSILES;
KILS_NOMONSTERS;
diff --git a/Source/Core/Resources/Screenshot.png b/Source/Core/Resources/Screenshot.png
index 139976998143bd646aa07230ca4c3752e3d07204..18db7f4f527cf75dd984bed25e5da31c7a502a98 100644
GIT binary patch
delta 299
zcmV+`0o4A&1nUBjNq-GVL_t(|+G2EZap_@TU`PUDK?c&mdmx_205ss;`Sa)hgTUXv
ze~H2%0MY}}%L1}lUtgbrk&%%k>;L`x2ciT)1~33k1q<H1dW0y=>e@DNJuFD3F)(w9
zlIj9f1GssF!SvS63mA4U><6<athos0gMhbh0)_!h$Q&*Xc7GJjAW#sZ4`+kqKx%Lr
zuzK}O6wNSzECy18(+k)%V>1M&0jx~_$qPhSlnC$;pBAu2<CM)$Np=A^5P>O^q4!Zc
zm?j0oT`=?QWQP7XoeXc^zGX<@P9tbLDB1Jz@xcvv<M75!<iE&&hE#!UqMXmf#Kds(
x=1mau4I?l|wIl!;=|C((Vs?H5ay&qQ0RRDG)x?~$4-EhS002ovPDHLkV1i#)h0Oo}
delta 515
zcmV+e0{s2!0>T84Nq^)?L_t(|+LV*uYtv8^$3M-Iv`tN#uEo`{O@`=$3PlGp1VN$f
z-%!LKp!nopFc62J4D`tt@gEQbVWPgsUSvY4h%!16WYo^FMAt53iCI!_R$4k|aXs+m
zo_i1Hd%yRdb7I9}@jh@_AVYulOW+BD;Agp9ZblXa!M+e#lz$WD%F)e*LV;K;*4Oo6
z7)DDbB0#Y29A221<n+l?j2}KqJoL$CO|0bxzAB+)l9*D+R&|Yw52rghau*vDnMt;+
z2Jw+5quL;8DUGbS$SH%=p&ag7jl{uxw}RaSx2JAUUMk@_9)%Of$x9mU@HmR5vng$}
zp4M6M?cN0T_kTL)!ei7OmwfUFoY6>VA`nktG(az{@@@XjE&{20qihbd_|;)U_t<b9
z5lw(8kc90|4hz$78C%eME4cOX8H0h3zvM9_|KLhZWo$IV?9;oH=AM&Pb-W>?H^FQ5
z73xZj-=AGZYG;{O=lJse1s?U5T*)L{WiLUyBnRHT#C!=_f$E1vs_mjHX&4wFbk~L7
zdcr@;*iPPKzEI$I`G0?+=u93g&+M%Iprhci{fJrX9=2_BDRu3?Z5*||VHh0(>%29U
zYv!6<HE-@~4kSsUQmI6)6%!M6M>y97a(#}o6^Z{NzyJzLBan4a`osVL002ovPDHLk
FV1h7Y{H6c^
diff --git a/Source/Core/Resources/ScreenshotActiveWindow.png b/Source/Core/Resources/ScreenshotActiveWindow.png
index 1eb2afe877f71fcd0f5f967d51c2ce17c15392ec..a1fb4d66c702d2c5065dabf50f7f3311a4426e9a 100644
GIT binary patch
delta 230
zcmV<C02%-M1EvCyNPhsxNkl<Zc-mt8|NlP&C4iAq16bfDF*1^Bk}43tfV%)>z|E^i
zh|;O9Z3CimfOsbhvIH}iC@C&b0pg=525|ETgXyiC7clHz*bin;SaT7~2LW&21PoJ{
zkU3l&>?oQ+pddsa&IZYW)ZjE=_3D`@nqdH045S8YG=c&#++SXrD9^7v_!R6rAYO<P
z2CPi~$xjC$Ai%>&dP)L$0qTwaBw|p&7$AoMC|=#6@k<Q214>B92JiqW2_WVn(ts~0
gNqN9>BS3%w0AdGKfi`neoB#j-07*qoM6N<$f?!r#v;Y7A
delta 446
zcmV;v0YUzz0{jDzNPhvINkl<Zc-q91%St0b7=^!->CVNpNhhFDj1tB;pn^9L5nQ;@
z$C!;PVOBnYo7o0@0$)H71_I7(#GL~{5Jm6;A{rGHjJDW4ZMvtLs3c<oku3b-P=~6Y
zQ>Us<`CQkfnesI&;D1x{`97+Yk+}3%&diKYGBz|yx;I0>v42S<V%(hGW2*v14-pd%
zPiNPBTVC?o=OorerNFp8iFsoYD7mCUaXN)gQc+2_#`)TrA}SR0_T+1OpG2g}!Q$)!
z+Xs0}!(w=FfTRdxcBN6m8js?cyQs#6eOvnuyt+LvGVSzJG)$7AFE9}%7?ulxAZ_=c
z<*zu|{9Pqbb$<lqv5Wm<g9pvx!8GJ*5MmM`c-}SGTH2szORMkT`_3xyl8t>}(c!;j
zzM#^R(#fv;AfH<!p=wwiZS@6ysq3g01^(`tbQh-BRC65u`H4lbY*)l^uKs&WFGw$8
zaw9FmBk!R^U4n7RMVXi9vl1g!4vdmhJ2JL(U{~-uM>oj4grl#)Bp!KtzWoIm<%k@-
oltda7FuW*N-ofYm#(x3~0NweIf3K$D7XSbN07*qoM6N<$f;vOj1^@s6
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs b/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
index 64e48f055..752e59f98 100644
--- a/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
@@ -240,7 +240,7 @@ namespace CodeImp.DoomBuilder.Windows
// label7
//
label7.AutoSize = true;
- label7.Location = new System.Drawing.Point(15, 30);
+ label7.Location = new System.Drawing.Point(15, 24);
label7.Name = "label7";
label7.Size = new System.Drawing.Size(71, 14);
label7.TabIndex = 11;
@@ -249,7 +249,7 @@ namespace CodeImp.DoomBuilder.Windows
// label14
//
label14.AutoSize = true;
- label14.Location = new System.Drawing.Point(330, 30);
+ label14.Location = new System.Drawing.Point(330, 24);
label14.Name = "label14";
label14.Size = new System.Drawing.Size(73, 14);
label14.TabIndex = 15;
@@ -258,7 +258,7 @@ namespace CodeImp.DoomBuilder.Windows
// label6
//
label6.AutoSize = true;
- label6.Location = new System.Drawing.Point(199, 30);
+ label6.Location = new System.Drawing.Point(199, 24);
label6.Name = "label6";
label6.Size = new System.Drawing.Size(38, 14);
label6.TabIndex = 17;
@@ -305,7 +305,7 @@ namespace CodeImp.DoomBuilder.Windows
this.actiongroup.Controls.Add(label2);
this.actiongroup.Controls.Add(this.action);
this.actiongroup.Controls.Add(this.browseaction);
- this.actiongroup.Location = new System.Drawing.Point(8, 247);
+ this.actiongroup.Location = new System.Drawing.Point(8, 253);
this.actiongroup.Name = "actiongroup";
this.actiongroup.Size = new System.Drawing.Size(533, 142);
this.actiongroup.TabIndex = 1;
@@ -486,11 +486,11 @@ namespace CodeImp.DoomBuilder.Windows
| System.Windows.Forms.AnchorStyles.Right)));
this.udmfactivates.AutoScroll = true;
this.udmfactivates.Columns = 2;
- this.udmfactivates.Location = new System.Drawing.Point(18, 19);
+ this.udmfactivates.Location = new System.Drawing.Point(18, 17);
this.udmfactivates.Name = "udmfactivates";
- this.udmfactivates.Size = new System.Drawing.Size(509, 133);
+ this.udmfactivates.Size = new System.Drawing.Size(509, 130);
this.udmfactivates.TabIndex = 0;
- this.udmfactivates.VerticalSpacing = 1;
+ this.udmfactivates.VerticalSpacing = 0;
this.udmfactivates.OnValueChanged += new System.EventHandler(this.udmfactivates_OnValueChanged);
//
// flagsgroup
@@ -500,7 +500,7 @@ namespace CodeImp.DoomBuilder.Windows
this.flagsgroup.Controls.Add(this.flags);
this.flagsgroup.Location = new System.Drawing.Point(8, 3);
this.flagsgroup.Name = "flagsgroup";
- this.flagsgroup.Size = new System.Drawing.Size(533, 174);
+ this.flagsgroup.Size = new System.Drawing.Size(533, 186);
this.flagsgroup.TabIndex = 0;
this.flagsgroup.TabStop = false;
this.flagsgroup.Text = " Flags";
@@ -514,9 +514,9 @@ namespace CodeImp.DoomBuilder.Windows
this.flags.Columns = 3;
this.flags.Location = new System.Drawing.Point(18, 17);
this.flags.Name = "flags";
- this.flags.Size = new System.Drawing.Size(509, 152);
+ this.flags.Size = new System.Drawing.Size(509, 164);
this.flags.TabIndex = 0;
- this.flags.VerticalSpacing = 1;
+ this.flags.VerticalSpacing = 0;
this.flags.OnValueChanged += new System.EventHandler(this.flags_OnValueChanged);
//
// tabs
@@ -562,9 +562,9 @@ namespace CodeImp.DoomBuilder.Windows
this.settingsGroup.Controls.Add(label14);
this.settingsGroup.Controls.Add(this.renderStyle);
this.settingsGroup.Controls.Add(label7);
- this.settingsGroup.Location = new System.Drawing.Point(8, 183);
+ this.settingsGroup.Location = new System.Drawing.Point(8, 195);
this.settingsGroup.Name = "settingsGroup";
- this.settingsGroup.Size = new System.Drawing.Size(533, 58);
+ this.settingsGroup.Size = new System.Drawing.Size(533, 52);
this.settingsGroup.TabIndex = 3;
this.settingsGroup.TabStop = false;
this.settingsGroup.Text = " Settings";
@@ -577,7 +577,7 @@ namespace CodeImp.DoomBuilder.Windows
this.alpha.ButtonStep = 1;
this.alpha.ButtonStepFloat = 0.1F;
this.alpha.ButtonStepsWrapAround = false;
- this.alpha.Location = new System.Drawing.Point(243, 25);
+ this.alpha.Location = new System.Drawing.Point(243, 19);
this.alpha.Name = "alpha";
this.alpha.Size = new System.Drawing.Size(65, 24);
this.alpha.StepValues = null;
@@ -592,7 +592,7 @@ namespace CodeImp.DoomBuilder.Windows
this.lockNumber.ButtonStep = 1;
this.lockNumber.ButtonStepFloat = 1F;
this.lockNumber.ButtonStepsWrapAround = false;
- this.lockNumber.Location = new System.Drawing.Point(405, 25);
+ this.lockNumber.Location = new System.Drawing.Point(405, 19);
this.lockNumber.Name = "lockNumber";
this.lockNumber.Size = new System.Drawing.Size(65, 24);
this.lockNumber.StepValues = null;
@@ -602,7 +602,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.renderStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.renderStyle.FormattingEnabled = true;
- this.renderStyle.Location = new System.Drawing.Point(92, 26);
+ this.renderStyle.Location = new System.Drawing.Point(92, 20);
this.renderStyle.Name = "renderStyle";
this.renderStyle.Size = new System.Drawing.Size(86, 22);
this.renderStyle.TabIndex = 12;
@@ -612,9 +612,9 @@ namespace CodeImp.DoomBuilder.Windows
//
this.activationGroup.Controls.Add(this.missingactivation);
this.activationGroup.Controls.Add(this.udmfactivates);
- this.activationGroup.Location = new System.Drawing.Point(8, 395);
+ this.activationGroup.Location = new System.Drawing.Point(8, 401);
this.activationGroup.Name = "activationGroup";
- this.activationGroup.Size = new System.Drawing.Size(533, 158);
+ this.activationGroup.Size = new System.Drawing.Size(533, 152);
this.activationGroup.TabIndex = 1;
this.activationGroup.TabStop = false;
this.activationGroup.Text = " Activation ";
@@ -1335,7 +1335,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "LinedefEditFormUDMF";
- this.Opacity = 0;
+ this.Opacity = 1;
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.resx b/Source/Core/Windows/LinedefEditFormUDMF.resx
index c6f1dc879..d9fdec64b 100644
--- a/Source/Core/Windows/LinedefEditFormUDMF.resx
+++ b/Source/Core/Windows/LinedefEditFormUDMF.resx
@@ -177,9 +177,6 @@
<metadata name="argspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="flags.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
--
GitLab