Merge remote-tracking branch 'udb/master'

This commit is contained in:
spherallic 2023-05-29 11:04:31 +02:00
commit 69c667073a
4 changed files with 104 additions and 1 deletions

View file

@ -633,8 +633,10 @@ namespace CodeImp.DoomBuilder.Windows
private void FillControlsList(Action a)
{
actioncontrol.Items.Clear();
// Fill combobox with special controls
actioncontrol.Items.Add(new KeyControl(Keys.Tab, "Tab"));
if(a.AllowMouse)
{
actioncontrol.Items.Add(new KeyControl(Keys.LButton, "LButton"));

View file

@ -2298,6 +2298,54 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.RedrawDisplay();
}
[BeginAction("moveselectionup")]
public void MoveSelectionUp()
{
offset.y += General.Map.Grid.GridSize;
// Update
UpdateGeometry();
UpdateRectangleComponents();
General.Map.Map.Update();
General.Interface.RedrawDisplay();
}
[BeginAction("moveselectiondown")]
public void MoveSelectionDown()
{
offset.y -= General.Map.Grid.GridSize;
// Update
UpdateGeometry();
UpdateRectangleComponents();
General.Map.Map.Update();
General.Interface.RedrawDisplay();
}
[BeginAction("moveselectionleft")]
public void MoveSelectionLeft()
{
offset.x -= General.Map.Grid.GridSize;
// Update
UpdateGeometry();
UpdateRectangleComponents();
General.Map.Map.Update();
General.Interface.RedrawDisplay();
}
[BeginAction("moveselectionright")]
public void MoveSelectionRight()
{
offset.x += General.Map.Grid.GridSize;
// Update
UpdateGeometry();
UpdateRectangleComponents();
General.Map.Map.Update();
General.Interface.RedrawDisplay();
}
#endregion
}
}

View file

@ -1268,6 +1268,50 @@ flipselectionh
allowscroll = true;
}
moveselectionup
{
title = "Move Selection Up by Grid Size";
category = "edit";
description = "Moves the selection in Edit Selection mode up by the current grid size.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
repeat = true;
}
moveselectiondown
{
title = "Move Selection Down by Grid Size";
category = "edit";
description = "Moves the selection in Edit Selection mode down by the current grid size.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
repeat = true;
}
moveselectionleft
{
title = "Move Selection Left by Grid Size";
category = "edit";
description = "Moves the selection in Edit Selection mode left by the current grid size.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
repeat = true;
}
moveselectionright
{
title = "Move Selection Right by Grid Size";
category = "edit";
description = "Moves the selection in Edit Selection mode right by the current grid size.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
repeat = true;
}
//mxd
rotateclockwise
{

View file

@ -76,6 +76,12 @@ namespace CodeImp.DoomBuilder.StairSectorBuilderMode
set { sidefront.Checked = value; }
}
public bool SideBack
{
get { return sideback.Checked; }
set { sideback.Checked = value; }
}
public CheckBox DistinctBaseHeights
{
get { return distinctbaseheights; }
@ -807,6 +813,9 @@ namespace CodeImp.DoomBuilder.StairSectorBuilderMode
SingleDirection.Checked = p.singledirection;
DistinctBaseHeights.Checked = p.distinctbaseheights;
if (!SideFront)
SideBack = true;
// Auto curve TODO
Flipping = p.flipping;