diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui index e48614c5a..3f7467c39 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui @@ -71,7 +71,7 @@ new VPathEditor(EVPathEditor) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Verve Path Editor"; + text = ":: Verve Path Editor"; new GuiContainer(){ profile = GuiDefaultProfile; @@ -218,7 +218,7 @@ new VPathEditor(EVPathEditor) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; EdgeSnap = "1"; - text = ":: Verve Path - Properties"; + text = ":: Verve Path - Properties"; new GuiContainer(){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui index f64982991..e75c2e1c4 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui @@ -138,7 +138,7 @@ $guiContent = new GuiControl(AssetBrowser) { }; }; new GuiWindowCtrl(AssetBrowserWindow) { - text = ":: Asset Browser"; + text = ":: Asset Browser"; resizeWidth = "0"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui index 8f74414af..02f734f21 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui @@ -70,7 +70,7 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Convex Shape Editor"; + text = ":: Convex Shape Editor"; new GuiContainer(){ profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui index 6009482ae..687ecc1fe 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui @@ -5,7 +5,7 @@ $guiContnt = new GuiControl(ConvexEditorOptions) extent = "800 600"; new GuiWindowCollapseCtrl(ConvexEditorOptionsWindow) { - text = ":: Sketch Tool - Properties"; + text = ":: Sketch Tool - Properties"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui index bc74b47cd..fb1be7862 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl() { minSize = "50 50"; closeCommand = "DatablockEditorInspectorWindow.setVisible(false);"; EdgeSnap = "1"; - text = ":: Datablock Editor - Data"; + text = ":: Datablock Editor - Data"; Margin = "8 8 8 8"; Padding = "0 0 0 0"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui index 493efa38d..412a88861 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl(DatablockEditorGui) { minSize = "50 50"; closeCommand = "DatablockInspectorTreeWindow.setVisible(false);"; EdgeSnap = "1"; - text = ":: Datablock Editor - Library"; + text = ":: Datablock Editor - Library"; Margin = "8 8 8 8"; Padding = "0 0 0 0"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui index 5f7af7d80..c7f799fb8 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui @@ -69,7 +69,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Decal Editor"; + text = ":: Decal Editor"; new GuiTabBookCtrl(DecalEditorTabBook) { canSaveDynamicFields = "0"; @@ -517,7 +517,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { minSize = "152 235"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = ":: Decal Properties"; + text = ":: Decal Properties"; new GuiScrollCtrl(DecalEditorTemplateProperties){ canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript index 2c214d19e..d31f2afb9 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript @@ -486,7 +486,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx ) { if( %idx == 0) { - DecalPreviewWindow.text = ":: Decal Editor - Template Properties"; + DecalPreviewWindow.text = ":: Decal Editor - Template Properties"; DecalEditorLibraryProperties.setVisible(true); DecalEditorTemplateProperties.setVisible(false); RetargetDecalButton.setVisible( true ); @@ -496,7 +496,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx ) } else { - DecalPreviewWindow.text = ":: Decal Editor - Instance Properties"; + DecalPreviewWindow.text = ":: Decal Editor - Instance Properties"; RetargetDecalButton.setVisible( false ); NewDecalButton.setVisible( false ); SaveDecalsButton.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui index 51ee7b03d..a1ded6b86 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui @@ -46,7 +46,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Forest Editor - Pallete"; + text = ":: Forest Editor - Pallete"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -525,7 +525,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Forest Editor - Properties"; + text = ":: Forest Editor - Properties"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui index 057350304..4d5928c37 100644 --- a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { canSaveDynamicFields = "1"; new GuiWindowCollapseCtrl(ESettingsWindow) { - text = ":: Editor Settings"; + text = ":: Editor Settings"; resizeWidth = "0"; resizeHeight = "0"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript index a39dbcf1f..cc0638cca 100644 --- a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript @@ -108,7 +108,7 @@ function ESettingsWindow::toggleEditorSettings(%this) ESettingsWindowList.sort(0); %this.mode = "Editor"; - ESettingsWindow.text = ":: Editor Settings"; + ESettingsWindow.text = ":: Editor Settings"; ESettingsWindowList.setSelectedById( 1 ); } diff --git a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui index d8ca203c1..9340cac72 100644 --- a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui +++ b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui @@ -11,7 +11,7 @@ $guiContent = new GuiWindowCollapseCtrl() { minSize = "50 50"; closeCommand = "$ThisControl.onClose();"; edgeSnap = "1"; - text = ":: Object Inspector"; + text = ":: Object Inspector"; margin = "0 0 0 0"; padding = "0 0 0 0"; anchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/gui/postFxEditor.gui b/Templates/BaseGame/game/tools/gui/postFxEditor.gui index c1ac975ae..43c2ead77 100644 --- a/Templates/BaseGame/game/tools/gui/postFxEditor.gui +++ b/Templates/BaseGame/game/tools/gui/postFxEditor.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(postFXEditor) { canSaveDynamicFields = "1"; new GuiWindowCtrl(PostFXEditorWindow) { - text = ":: PostFX Editor - EditorTemplateLevel"; + text = ":: PostFX Editor - EditorTemplateLevel"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript index f4eee3c99..569c4ba60 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -37,7 +37,7 @@ $Gui::fontTypeMono = "Arial"; $GUI::fontSize[12] = 12; $GUI::fontSize[14] = 14; $GUI::fontSize[16] = 16; -$GUI::fontSize[18] = 18; +$GUI::fontSize[18] = 17; $GUI::fontSize[24] = 24; $GUI::fontSize[36] = 36; @@ -195,8 +195,8 @@ new GuiControlProfile (ToolsGuiWindowProfile) hasBitmapArray = true; justify = "left"; category = "Tools"; - fontType = $Gui::fontTypeMedium; - fontSize = $GUI::fontSize[18]; + fontType = $Gui::fontTypeBold; + fontSize = $GUI::fontSize[16]; }; if( !isObject( ToolsGuiPaneProfile ) ) @@ -211,7 +211,7 @@ new GuiControlProfile (ToolsGuiPaneProfile) borderColor = EditorSettings.value("Theme/windowBackgroundColor"); category = "Tools"; fontType = $Gui::fontTypeMedium; - fontSize = $GUI::fontSize[18]; + fontSize = $GUI::fontSize[16]; }; if( !isObject( ToolsGuiToolbarWindowProfile ) ) diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml index 9b3fe43b3..be3bc9b5b 100644 --- a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml +++ b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml @@ -2,6 +2,7 @@ AssetName="DefaultEditorLevel" LevelFile="@assetFile=DefaultEditorLevel.mis" LevelName="DefaultEditorLevel" + PostFXPresetFile="@assetFile=tools/levels/DefaultEditorLevel.postfxpreset.tscript" description="An empty room" previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image" previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image" @@ -11,4 +12,5 @@ previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image" previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image" staticObjectAssetDependency0="@asset=Prototyping:FloorGray" + staticObjectAssetDependency1="@asset=ExampleModule:NewTerrain1" VersionId="1"/> diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis index 466e48cc7..82fc85844 100644 --- a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis +++ b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis @@ -1,33 +1,20 @@ //--- OBJECT WRITE BEGIN --- new Scene(EditorTemplateLevel) { - canSave = "1"; - canSaveDynamicFields = "1"; - Enabled = "1"; + isEditing = "1"; + enabled = "1"; new LevelInfo(theLevelInfo) { - nearClip = "0.1"; - visibleDistance = "1000"; - visibleGhostDistance = "0"; - decalBias = "0.0015"; - fogColor = "0.6 0.6 0.7 1"; - fogDensity = "0"; + FogColor = "0.6 0.6 0.7 1"; fogDensityOffset = "700"; - fogAtmosphereHeight = "0"; canvasClearColor = "0 0 0 255"; - ambientLightBlendPhase = "1"; - ambientLightBlendCurve = "0 0 -1 -1"; soundAmbience = "AudioAmbienceDefault"; - soundDistanceModel = "Linear"; - canSave = "1"; - canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; }; new ScatterSky(DynamicSky) { sunScale = "0.991102 0.921582 0.83077 1"; zOffset = "-3000"; azimuth = "25"; brightness = "5"; - flareType = "LightFlareExample1"; MoonMatAsset = "Core_Rendering:moon_wglow"; useNightCubemap = "1"; nightCubemap = "nightCubemap"; @@ -44,16 +31,19 @@ new Scene(EditorTemplateLevel) { persistentId = "289ad401-3140-11ed-aae8-c0cb519281fc"; reflectionPath = "tools/levels/DefaultEditorLevel/probes/"; }; - new GroundPlane() { scaleU = "32"; scaleV = "32"; MaterialAsset = "Prototyping:FloorGray"; - Enabled = "1"; + enabled = "1"; position = "0 0 0"; rotation = "1 0 0 0"; scale = "1 1 1"; }; + new TerrainBlock(NewTerrain1) { + TerrainAsset = "ExampleModule:NewTerrain1"; + position = "-512 -412 -511"; + }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui index e4ddeaaf9..2442a6aa7 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { closeCommand = "MaterialEditorPreviewWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Material Editor - Preview"; + text = ":: Material Editor - Preview"; /*new GuiContainer(MaterialEditorPreviewPane) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui index 6f7640ea1..953da034f 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { closeCommand = "MaterialEditorPropertiesWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Material Editor - Properties"; + text = ":: Material Editor - Properties"; new GuiContainer(MaterialEditorGuiContent){ // Client group isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index a72d02511..aa5804b1f 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -784,8 +784,8 @@ function MaterialEditorGui::isMatEditorMaterial(%this, %material) function MaterialEditorGui::setMaterialNotDirty(%this) { - %propertyText = ":: Material Editor - Properties"; - %previewText = ":: Material Editor - Preview"; + %propertyText = ":: Material Editor - Properties"; + %previewText = ":: Material Editor - Preview"; MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPreviewWindow.text = %previewText; @@ -795,8 +795,8 @@ function MaterialEditorGui::setMaterialNotDirty(%this) function MaterialEditorGui::setMaterialDirty(%this) { - %propertyText = ":: Material Editor - Properties *"; - %previewText = ":: Material Editor - Preview *"; + %propertyText = ":: Material Editor - Properties *"; + %previewText = ":: Material Editor - Preview *"; MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPreviewWindow.text = %previewText; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui index 501c8f576..4c5b5bca4 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui @@ -71,7 +71,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Mesh Road Editor - Roads"; + text = ":: Mesh Road Editor - Roads"; new GuiContainer(MeshRoadEditorRoadsPanel){ profile = "ToolsGuiDefaultProfile"; @@ -267,7 +267,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; EdgeSnap = "1"; - text = ":: Mesh Road Editor - Properties"; + text = ":: Mesh Road Editor - Properties"; new GuiContainer(MeshRoadNodesPanel){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui index b1ca56a32..276c1de42 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui @@ -67,7 +67,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Mission Area"; + text = ":: Mission Area"; new GuiContainer(MissionAreaEditorTerrainPanel){ profile = "ToolsGuiDefaultProfile"; @@ -234,7 +234,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Mission Area Editor - Properties"; + text = ":: Mission Area Editor - Properties"; new GuiContainer(MissionAreaEditorPropertiesPanel){ //Mission Area Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui index a512eb327..92505f4e7 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui @@ -66,7 +66,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Navigation Editor"; + text = ":: Navigation Editor"; new GuiButtonCtrl() { Profile = "ToolsGuiButtonProfile"; @@ -271,7 +271,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Navigation Editor - Properties"; + text = ":: Navigation Editor - Properties"; new GuiContainer(NavEditorOptionsPanel){ //Actions isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui index c0326cfaa..697265cd2 100644 --- a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui +++ b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui @@ -50,7 +50,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { minSize = "50 50"; closeCommand = ""; EdgeSnap = "0"; - text = ":: Particle Editor"; + text = ":: Particle Editor"; new GuiTabBookCtrl(PE_TabBook) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript index c000b5a18..de542e713 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript @@ -160,7 +160,7 @@ function ParticleEditor::createParticleList( %this ) function ParticleEditor::openEmitterPane( %this ) { - PE_Window.text = ":: Particle Editor - Emitters"; + PE_Window.text = ":: Particle Editor - Emitters"; PE_EmitterEditor.guiSync(); ParticleEditor.activeEditor = PE_EmitterEditor; @@ -172,7 +172,7 @@ function ParticleEditor::openEmitterPane( %this ) function ParticleEditor::openParticlePane( %this ) { - PE_Window.text = ":: Particle Editor - Particles"; + PE_Window.text = ":: Particle Editor - Particles"; PE_ParticleEditor.guiSync(); ParticleEditor.activeEditor = PE_ParticleEditor; diff --git a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui index d042e253a..ece28dd38 100644 --- a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui +++ b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui @@ -71,7 +71,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: River Editor - Rivers"; + text = ":: River Editor - Rivers"; /* new GuiBitmapButtonCtrl() { @@ -316,7 +316,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: River Editor - Properties"; + text = ":: River Editor - Properties"; new GuiContainer(RiverEditorOptionsPanel){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui index 437c96b03..bdb89f1b1 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui @@ -73,7 +73,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Decal Road Editor - Roads & Paths"; + text = ":: Decal Road Editor - Roads & Paths"; /* new GuiBitmapButtonCtrl() { @@ -317,7 +317,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Decal Road Editor - Properties"; + text = ":: Decal Road Editor - Properties"; new GuiContainer(RoadEditorProperties){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui index c15d8f728..956861dc4 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui @@ -10,7 +10,7 @@ else //--- OBJECT WRITE BEGIN --- $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) { - text = ":: Shape Editor - Advanced Properties"; + text = ":: Shape Editor - Advanced Properties"; resizeWidth = "0"; resizeHeight = "0"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui index 26ef4f130..cdd11a566 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui @@ -27,7 +27,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Shape Editor - Properties"; + text = ":: Shape Editor - Properties"; //--------------------------------------------------------------------- // Sequence and Node editors diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui index 660de806e..4597b8010 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui @@ -43,7 +43,7 @@ $guiContent = new GuiControl() { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Shape Editor - Select"; + text = ":: Shape Editor - Select"; new GuiTabBookCtrl(ShapeEditorTabbook) { internalName = "tabBook"; diff --git a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui index 04abab4b3..da0ce9d1c 100644 --- a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui +++ b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(windowConsoleDlg) { canSaveDynamicFields = "0"; new GuiWindowCtrl(windowConsoleControl) { - text = ":: Console Log"; + text = ":: Console Log"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui index d20fc4053..2c70b59bc 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Editor Settings"; + text = ":: Editor Settings"; closeCommand = "ESettingsWindow.hideDialog();"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui index 79b6d63d8..2c4af66e8 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui @@ -29,7 +29,7 @@ $guiContent = new GuiControl(ManageBookmarksContainer, EditorGuiGroup) { position = "50 90"; extent = "180 306"; MinExtent = "120 130"; - text = ":: Camera Bookmark Manager"; + text = ":: Camera Bookmark Manager"; closeCommand = "EManageBookmarks.hideDialog();"; EdgeSnap = "0"; canCollapse = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui index 41b7b0adf..394d7574d 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui @@ -27,7 +27,7 @@ $guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) { minSize = "50 50"; closeCommand = "EManageSFXParameters.setVisible( false );"; EdgeSnap = "0"; - text = ":: Audio Parameters"; + text = ":: Audio Parameters"; Margin = "5 5 5 5"; Padding = "5 5 5 5"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui index bd227f193..f7fd83dca 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui @@ -30,7 +30,7 @@ $guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) { position = "400 31"; extent =" 175 267"; MinExtent = "175 130"; - text = ":: Snap Options"; + text = ":: Snap Options"; closeCommand = "ESnapOptions.hideDialog();"; EdgeSnap = "0"; canCollapse = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui index 60e66732c..efb84b76f 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui @@ -47,7 +47,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { minSize = "300 160"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = ":: Terrain Painter - Preview"; + text = ":: Terrain Painter - Preview"; new GuiContainer(EPainterPreviewCont){ Docking = "Client"; @@ -293,7 +293,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { minSize = "152 300"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = ":: Terrain Painter - Selector"; + text = ":: Terrain Painter - Selector"; new GuiScrollCtrl( EPainterScroll ) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui index f1c7751b1..a3802607a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { closeCommand = "EWInspectorWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: World Editor - Inspector"; + text = ":: World Editor - Inspector"; new GuiContainer(EWInspectorContainer) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui index 735b9b070..c9fe99bbe 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { minSize = "50 50"; closeCommand = "EWTreeWindow.setVisible(false);"; EdgeSnap = "1"; - text = ":: World Edior - Scene Tree"; + text = ":: World Edior - Scene Tree"; new GuiTabBookCtrl(EditorTreeTabBook) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui index 5b964e925..60325f4a8 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -46,7 +46,7 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { minSize = "4 4"; closeCommand = "Canvas.popDialog( TerrainImportGui );"; EdgeSnap = "0"; - text = ":: Import Terrain Height Map"; + text = ":: Import Terrain Height Map"; new GuiTextEditCtrl() { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui index 20cb5de9e..0fb57608a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui @@ -7,7 +7,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) { canSaveDynamicFields = "1"; new GuiWindowCtrl() { - text = ":: Terrain Materials Editor"; + text = ":: Terrain Materials Editor"; resizeWidth = "0"; canMinimize = "0"; canMaximize = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript index 1a9d1307b..b772cdd8b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript @@ -596,7 +596,7 @@ function TerrainPainterContainer::maxSize(%this, %window) %fixedWindow = EPainterPreview; %fluidWindow = EPainter; - %top = EditorGuiToolbar.extent.y + 6 - 7; + %top = EditorGuiToolbar.extent.y + 6 - 7 + 24; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom;