Skip to content

Commit

Permalink
Fixes for v0.76b Hotfix 2
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackJaxDev committed Aug 19, 2015
1 parent 6f2b010 commit a0eeec6
Show file tree
Hide file tree
Showing 17 changed files with 254 additions and 211 deletions.
16 changes: 16 additions & 0 deletions BrawlBox/Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ they be held accountable for the manner in which it is used.

- v0.76b - BrawlLib v0.23b

Hotfix 2 (8/19/15)
. Removed '.obj' from filters when replacing an MDL0 object, replacing with an obj is not supported
. Fixed bug in collision editor where no models would render if you had not viewed them before opening the editor
. Fixed bug linking and unlinking a bone in the collision editor where the collisions would not stay in place
. Fixed bug where bones would not render in the collision editor
. Fixed bug where the weight editor would not do anything
. Fixed bug where buttons in the weight editor would be enabled at the wrong times and do nothing
. Fixed bug where the 'Remove' button in the weight editor would throw an error when clicked
. Fixed bug where clicking out of the box next to 'Set' in the weight editor would automatically apply the value (press 'Set' instead)
. Fixed bug where if Ctrl+A was used to select all vertices in the viewport, the weight and vertex editors would not update
. Fixed bug where models with a corrupted header or improper header version would crash the program (now they are simply not read)
. Fixed bug where pressing the dropdown button to select one of an object's assets would throw an error if the asset group did not already exist
. Fixed bug where copying or pasting an SRT0 frame would throw an error
. Fixed bug where removing the last code from a GCT in the GCT editor would throw an error
. Fixed bug in the CHR0 text importer where scale and translation values would be switched

Hotfix 1 (8/15/15)
. Fixed bug where double clicking on a GCT associated with BrawlBox would open the editor but not the actual file clicked on
. Fixed bug where the weight editor would not update when selecting vertices in the model viewer
Expand Down
1 change: 1 addition & 0 deletions BrawlBox/NodeWrappers/MDL0/MDL0PolygonWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ private static void MenuOpening(object sender, CancelEventArgs e)
#endregion

public override string ExportFilter { get { return FileFilters.Object; } }
public override string ImportFilter { get { return FileFilters.Raw; } }

public MDL0PolygonWrapper() { ContextMenuStrip = _menu; }

Expand Down
2 changes: 1 addition & 1 deletion BrawlBox/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace BrawlBox
static class Program
{
//Make sure this matches the tag name of the release on github exactly
public static readonly string TagName = "v0.76b_h1";
public static readonly string TagName = "v0.76b_h2";

public static readonly string AssemblyTitle;
public static readonly string AssemblyDescription;
Expand Down
2 changes: 1 addition & 1 deletion BrawlBox/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.76.*")]
[assembly: AssemblyFileVersion("0.76.1.1")]
[assembly: AssemblyFileVersion("0.76.1.2")]
8 changes: 7 additions & 1 deletion BrawlBox/UI/CollisionEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,7 @@ private void PopulateModelList()
modelNode.Nodes.Add(new TreeNode(bone._name) { Tag = bone, Checked = true });

_modelPanel.AddTarget(n);
n.ResetToBindState();
}

modelTree.EndUpdate();
Expand Down Expand Up @@ -1671,6 +1672,11 @@ private unsafe void _modelPanel_PostRender(object sender)
if (_targetNode != null)
_targetNode.Render();

if (_modelPanel.RenderBones)
foreach (IRenderedObject o in _modelPanel._renderList)
if (o is IModel)
((IModel)o).RenderBones(_modelPanel.CurrentViewport);

//Render selection box
if (!_selecting)
return;
Expand Down Expand Up @@ -2016,7 +2022,7 @@ private void btnRelink_Click(object sender, EventArgs e)
return;

txtBone.Text = _selectedObject._boneName = node.Text;
_selectedObject._linkedBone = ((MDL0BoneNode)node.Tag);
_selectedObject.LinkedBone = ((MDL0BoneNode)node.Tag);
txtModel.Text = _selectedObject._modelName = node.Parent.Text;
}

Expand Down
17 changes: 7 additions & 10 deletions BrawlBox/UI/Model Previewer/ModelEditControl/MiscFunctions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ protected override void OnModelChanged()
leftPanel.Reset();
rightPanel.Reset();

weightEditor.TargetVertices = _selectedVertices;
vertexEditor.TargetVertices = _selectedVertices;

_updating = false;
}

Expand Down Expand Up @@ -182,23 +185,14 @@ public bool Close()

protected override void OnSelectedBoneChanged()
{
#if DEBUG
if (weightEditor.Visible)
weightEditor.BoneChanged();
#endif
weightEditor.BoneChanged();
chkZoomExtents.Enabled = AllowZoomExtents;
}
public override void UpdateUndoButtons()
{
btnUndo.Enabled = CanUndo;
btnRedo.Enabled = CanRedo;
}
//protected override void OnSelectedVerticesChanged()
//{
// base.OnSelectedVerticesChanged();


//}

public override void UpdateAnimationPanelDimensions()
{
Expand Down Expand Up @@ -327,6 +321,9 @@ private bool HotkeySelectAllVertices()

OnSelectedVerticesChanged();

weightEditor.TargetVertices = _selectedVertices;
vertexEditor.TargetVertices = _selectedVertices;

ModelPanel.Invalidate();

return true;
Expand Down
2 changes: 1 addition & 1 deletion BrawlLib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.23.*")]
[assembly: AssemblyFileVersion("0.23.1.1")]
[assembly: AssemblyFileVersion("0.23.1.2")]
4 changes: 2 additions & 2 deletions BrawlLib/SSBB/ResourceNodes/CollisionNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public MDL0BoneNode LinkedBone
if (p.LinkLeft != null)
p.LinkLeft._rawValue = _linkedBone.Matrix * p.LinkLeft._rawValue;
if (p.LinkRight != null)
p.LinkRight._rawValue = _linkedBone.Matrix * p.LinkLeft._rawValue;
p.LinkRight._rawValue = _linkedBone.Matrix * p.LinkRight._rawValue;
}
}

Expand All @@ -206,7 +206,7 @@ public MDL0BoneNode LinkedBone
if (p.LinkLeft != null)
p.LinkLeft._rawValue = _linkedBone.InverseMatrix * p.LinkLeft._rawValue;
if (p.LinkRight != null)
p.LinkRight._rawValue = _linkedBone.InverseMatrix * p.LinkLeft._rawValue;
p.LinkRight._rawValue = _linkedBone.InverseMatrix * p.LinkRight._rawValue;
}
}
else
Expand Down
Loading

0 comments on commit a0eeec6

Please sign in to comment.