v3.6.0

JannisX11 · Jul 16, 2020 · a7471f3 · a7471f3
1 parent b2cd316
commit a7471f3
Show file tree

Hide file tree

Showing 72 changed files with 5,740 additions and 2,193 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 /dist/
 index.php
-package-lock.json
+electron-builder.env
 node_modules/
diff --git a/.travis.yml b/.travis.yml
@@ -2,40 +2,37 @@ sudo: required
 dist: trusty
 
 language: node_js
+node:
+  - 12
 
 jobs:
   include:
-    - name: "macOS + Win Portable"
+    - name: "macOS"
       os: osx
+      osx_image: "xcode11.3"
       script:
-        - electron-builder --publish=always
-        - electron-builder --windows portable --x64 --publish=always -c.productName='Blockbench_portable'
+        - electron-builder --publish=onTagOrDraft
 
     - name: "Windows"
       os: osx
+      osx_image: "xcode11.3"
       script:
-        - electron-builder -w --x64 --publish=always
-        - electron-builder -w --ia32 --publish=always -c.productName='Blockbench_32bit'
-      deploy:
-        provider: releases
-        api_key: $GH_TOKEN
-        skip_cleanup: true
-        file: dist/win-unpacked/resources/app.asar
+        - electron-builder --windows portable --x64 --publish=onTagOrDraft -c.productName='Blockbench_portable'
+        - electron-builder -w --ia32 --x64 --publish=onTagOrDraft
 
     - name: "Linux"
       os: linux
       script:
         - sudo apt-get install rpm
-        - electron-builder --publish=always
+        - electron-builder --publish=onTagOrDraft
 
 
 cache:
   directories:
     - node_modules
 
 install:
-  - nvm install 12.17.0
-  - npm install electron-builder
+  - npm install
 
 notifications:
   email: false
diff --git a/LICENSE.MD b/LICENSE.MD
diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/css/dialogs.css b/css/dialogs.css
@@ -32,7 +32,7 @@
 		background-color: var(--color-ui);
 		color: inherit;
 		border: none;
-		box-shadow: 0 0px 40px rgba(0, 0, 0, 0.5);
+		box-shadow: 0 0px 8px rgba(0, 0, 0, 0.64);
 		left: unset;
 		right: unset;
 		bottom: unset;
@@ -65,12 +65,19 @@
 		padding-bottom: 12px;
 	}
 	.dialog_bar {
+		position: relative;
 		min-height: 30px;
 		margin-top: 4px;
 		margin-bottom: 4px;
 		height: auto;
 		clear: both;
 	}
+	.dialog_bar.form_bar {
+		display: flex;
+	}
+	.dialog_bar.form_bar .half {
+		flex-grow: 1;
+	}
 	.dialog_bar::after {
 		content: "";
 		clear: both;
@@ -81,6 +88,7 @@
 	}
 	.dialog_bar.button_bar {
 		text-align: right;
+		margin-top: 12px;
 	}
 	.dialog_bar button.large {
 		margin-bottom: 0;
@@ -164,6 +172,7 @@
 		margin-left: -28px;
 		margin-top: 4px;
 		opacity: 0.75;
+		right: 42px;
 	}
 	dialog .form_bar_file:hover > .material-icons {
 		opacity: 1;
@@ -427,14 +436,34 @@
 	#import_texture_list li {
 		height: 112px;
 		width: 112px;
-		margin: 4px;
+		margin: 3px;
+		position: relative;
 		display: inline-block;
 		background-repeat: no-repeat;
 		background-size: contain;
+		box-sizing: content-box;
+		border: 1px solid transparent;
 	}
 	#import_texture_list li:hover {
 		background-color: var(--color-selected);;
 	}
+	#import_texture_list li.selected {
+		border-color: var(--color-accent);
+	}
+	#import_texture_list li.selected::after {
+		position: absolute;
+		content: "\f00c";
+		font-family: 'Font Awesome 5 Free';
+		font-weight: 600;
+		color: var(--color-accent);
+		background-color: var(--color-ui);
+		height: 19px;
+		margin-right: 0;
+		margin-left: 100px;
+		margin-top: -10px;
+		border-bottom-left-radius: 8px;
+		padding-left: 2px;
+	}
 	body.entity_mode button.entity_mode_uv_button {
 		display: block;
 		padding: 0;
@@ -507,6 +536,7 @@
 		min-width: 155px;
 		margin-left: 1px;
 		margin-right: 8px;
+		flex-shrink: 0;
 	}
 
 	/*PE Import Dialog*/
@@ -709,9 +739,6 @@
 		height: 42px;
 		padding-top: 5px;
 	}
-	#uv_dialog h2.dialog_handle.entity_mode_only {
-		margin: 0;
-	}
 	#uv_dialog_all .UVEditor .uv_transform_info {
 		top: 30px;
 	}

diff --git a/css/general.css b/css/general.css
@@ -100,9 +100,29 @@
 	}
 
 /*UI Elements*/
-	canvas.preview {
+	div.preview {
+		height: 100%;
+		width: 100%;
+		position: relative;
+		cursor: inherit;
+	}
+	.preview > canvas {
 		background-repeat: no-repeat;
 	}
+	.preview .preview_menu {
+		position: absolute;
+		right: -1px;
+		top: 0;
+		width: 20px;
+		background-color: var(--color-dark);
+	}
+	.checkerboard .tool.preview_menu {
+		background-color: var(--color-checkerboard);
+	}
+	.preview .preview_menu > i {
+		width: 20px;
+		margin-left: -2px;
+	}
 	.text_padding {
 		margin-left: 5px;
 		margin-right: 5px;
@@ -138,7 +158,6 @@
 	}
 	.list {
 		background-color: var(--color-back);
-		height: calc(100% - 86px);
 		width: 100%;
 		overflow-y: scroll;
 		flex-grow: 1;

diff --git a/css/panels.css b/css/panels.css
@@ -1,3 +1,6 @@
+.panel {
+    padding-bottom: 4px;
+}
 
 /*Display*/
 
@@ -276,6 +279,7 @@
 
 /*Textures*/
 	.texture {
+		display: flex;
 		height: 48px;
 		white-space: nowrap;
 		position: relative;
@@ -289,20 +293,21 @@
 	}
 	.texture > i {
 		margin-top: 12px;
-		float: right;
 	}
 	.texture > i.clickable:hover {
 		color: var(--color-light);
 	}
 	.texture > i:not(.clickable) {
 		opacity: 0.5;
 	}
-	.texture > * {
-		float: left;
+	.texture i.icon_off {
+		opacity: 0.56;
 	}
 	div.texture_icon_wrapper {
 		height: 48px;
 		width: 48px;
+		flex-grow: 0;
+		flex-shrink: 0;
 		overflow: hidden;
 		position: relative;
 	}
@@ -317,11 +322,14 @@
 		width: 48px;
 		height: 48px;
 	}
+	.texture_description_wrapper {
+		flex-grow: 1;
+
+	}
 	.texture_name {
 		margin-top: 2px;
 		margin-left: 6px;
 		margin-right: 4px;
-		width: calc(100% - 82px);
 		overflow: hidden;
 		cursor: default;
 	}
@@ -332,16 +340,13 @@
 		margin-top: -3px;
 		margin-left: 6px;
 		margin-right: 4px;
-		width: calc(100% - 82px);
+		width: 100%;
 		height: 20px;
 		overflow: hidden;
 		font-size: 0.9em;
 		opacity: 0.6;
 		cursor: default;
 	}
-	.texture.particle .texture_name, .texture.particle .texture_res {
-		width: calc(100% - 106px);
-	}
 	.texture_error {
 		position: absolute;
 		color: red;
@@ -357,6 +362,33 @@
 		margin-top: 24px;
 		text-shadow: 0 0 5px #000;
 	}
+	.texture[order]::before {
+		content: '';
+		height: 2px;
+		left: 0;
+		right: 0;
+		background: var(--color-accent);
+		z-index: 3;
+		display: block;
+		position: absolute;
+	}
+	.texture[order] {
+		position: relative;
+	}
+	.texture[order="-1"]::before {
+		margin-top: -1px;
+	}
+	.texture[order="1"]::before {
+		bottom: 0px;
+	}
+	.texture[order="0"]::before {
+		width: 5px;
+		height: 30px;
+		margin-left: 0;
+		border-top-right-radius: 4px;
+		border-bottom-right-radius: 4px;
+
+	}
 
 /*Animations*/
 	.panel#animations #animations_list {
@@ -450,8 +482,8 @@
 	}
 	#timeline_playhead {
 		position: absolute;
-		pointer-events: none;
 		z-index: 3;
+		cursor: ew-resize;
 
 		height: 26px;
 		width: 18px;
@@ -472,22 +504,12 @@
 		pointer-events: none;
 		margin-left: -1px;
 		margin-top: -2px;
-		height: 17px;
-	}
-	#timeline_playhead_line {
-		content: "";
-		display: block;
-		position: absolute;
-		height: 100%;
-		width: 2px;
-		z-index: 2;
-		background-color: var(--color-accent);
-		pointer-events: none;
+		height: 5000px;
 	}
 	#timeline_endbracket {
 		position: absolute;
-		z-index: 3;
-		cursor: pointer;
+		z-index: 2;
+		cursor: col-resize;
 
 		height: 26px;
 	    width: 8px;
@@ -498,6 +520,13 @@
 	    border-left-width: 0;
 	    border-right-width: 2px;
 	}
+	div#timeline_endbracket::after {
+		content: "";
+		width: 16px;
+		height: 100%;
+		display: block;
+		margin-left: -2px;
+	}
 
 	#timeline_body .keyframe {
 		position: absolute;
@@ -881,8 +910,9 @@
 /*Chat*/
 	#chat {
 		z-index: 16;
-		min-height: 180px;
+		min-height: 86px;
 		flex-grow: 0;
+		flex-shrink: 0;
 	}
 	#chat_history {
 		background: var(--color-back);