TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript
View file

@ -65,7 +65,7 @@ function GuiInspectorEntityGroup::createAddComponentList(%this)
buttonMargin = "4 4";
iconLocation = "Left";
sizeIconToButton = "0";
iconBitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
hovertime = "100";
tooltip = "Add the selected component to the object";
tooltipProfile = "EditorToolTipProfile";
@ -323,4 +323,4 @@ function ComponentEditorRemoveComponent(%entity, %component)
%entity.removeComponent(%component, true);
inspector.removeInspect(%entity);
inspector.addInspect(%entity);
}
}