From 5e2b5a9e1ea9af5a945c8fba75a60bdba5a0a8de Mon Sep 17 00:00:00 2001 From: JannisX11 Date: Thu, 27 Dec 2018 14:03:04 +0100 Subject: [PATCH] v2.3.0 --- css/style.css | 41 +- index.html | 110 +- index.php | 108 +- js/OrbitControls.js | 2 +- js/TransformControls.js | 656 +- js/actions.js | 140 +- js/animations.js | 222 +- js/api.js | 71 +- js/app.js | 273 +- js/blockbench.js | 228 +- js/display.js | 338 +- js/elements.js | 90 +- js/interface.js | 52 +- js/io.js | 132 +- js/keyboard.js | 16 +- js/molang.js | 73 +- js/painter.js | 487 +- js/plugin_loader.js | 9 + js/preview.js | 442 +- js/settings.js | 27 +- js/textures.js | 77 +- js/transform.js | 220 +- js/tree.vue.js | 1 + js/undo.js | 41 +- js/util.js | 106 +- js/uv.js | 4 +- js/web.js | 24 +- lang/de.json | 36 +- lang/en.json | 42 +- lang/es.json | 28 +- lang/fr.json | 26 +- lang/ja.json | 30 +- lang/nl.json | 30 +- lang/pl.json | 26 +- lang/ru.json | 28 +- lang/sv.json | 26 +- lang/zh.json | 30 +- lib/three.js | 94045 +++++++++++++++++++------------------- lib/three_custom.js | 66 + package.json | 2 +- 40 files changed, 50384 insertions(+), 48021 deletions(-) create mode 100644 lib/three_custom.js diff --git a/css/style.css b/css/style.css index 9afe64b9e..627931cd6 100644 --- a/css/style.css +++ b/css/style.css @@ -490,7 +490,7 @@ } li.menu_bar_point { font-size: 1.1em; - padding: 16px; + padding: 12px; padding-top: 2px; padding-bottom: 0; float: left; @@ -532,6 +532,25 @@ } } + #mode_selector { + float: right; + font-size: 1.1em; + } + #mode_selector li { + display: inline-block; + height: 32px; + margin-left: 5px; + margin-right: 5px; + overflow: hidden; + padding-top: 2px; + } + #mode_selector li:hover { + color: var(--color-light); + } + #mode_selector li.selected { + border-bottom: 4px solid var(--color-accent); + } + /*Actions*/ .toolbar { width: 100%; @@ -599,9 +618,6 @@ grid-area: right_bar; } - - .panel { - } .panel.grow { flex-grow: 1; display: flex; @@ -613,7 +629,6 @@ padding-bottom: 8px; } - h3.panel_handle { width: calc(100% - 6px); height: auto; @@ -621,7 +636,7 @@ padding: 6px; background: var(--color-ui); } - .panel > p { + .panel p { margin-left: 12px; } body > h3.panel_handle { @@ -629,7 +644,6 @@ width: auto; } - div#preview { grid-area: preview; background: var(--color-dark); @@ -886,6 +900,7 @@ #cubes_list > div.vue-tree > ul > li > *:not(ul) { display: none; } + /* #cubes_list > div > ul > li > ul > li > ul > li > div { padding-left: 20px; } @@ -904,6 +919,7 @@ #cubes_list > div > ul > li > ul > li > ul > li > ul > li > ul > li > ul > li > ul > li > ul li > div { padding-left: 120px; } + */ .outliner_object i.fa { text-align: center; width: 18px; @@ -1254,6 +1270,7 @@ background-color: var(--color-back); padding: 3px; padding-left: 8px; + overflow: hidden; } #timeline_head > .channel_head { height: 31px; @@ -2178,12 +2195,13 @@ /*Status Bar*/ #status_bar { - background: var(--color-back); + position: relative; padding: 2px; padding-top: 0; box-sizing: border-box; display: block; font-size: 0.92em; + background: var(--color-back); border: 1px solid var(--color-border); } #status_bar > div { @@ -2194,6 +2212,13 @@ #status_bar > div#status_fps { float: right; } + #status_bar #status_progress { + position: absolute; + height: 4px; + background: var(--color-accent); + bottom: 0; + left: 0; + } /*Entity Mode*/ diff --git a/index.html b/index.html index d7054471e..43a1c9f10 100644 --- a/index.html +++ b/index.html @@ -13,7 +13,9 @@ - + + @@ -36,6 +39,7 @@ + @@ -48,7 +52,6 @@ - @@ -63,8 +66,6 @@ - -
@@ -297,55 +298,44 @@

dialog.scale.title

dialog.display_preset.title

dialog.display_preset.message
-
-
-
-
-
-
-
-
-
-
-
@@ -444,9 +434,9 @@

    -
  • +