Merge branch 'master' into gh-pages

Author: JannisX11

index.html

@@ -98,6 +98,7 @@
 		<script src="js/util/array_util.js"></script>
 		<script src="js/util/event_system.js"></script>
 		<script src="js/util/property.js"></script>
+		<script src="js/util/json.js"></script>
 		<script src="js/interface/menu.js"></script>
 		<script src="js/interface/actions.js"></script>
 		<script src="js/interface/themes.js"></script>

js/animations/animation_controllers.js

@@ -75,6 +75,7 @@ class AnimationControllerState {
 					target: '',
 					condition: ''
 				};
+				this.transitions.push(transition);
 				if (typeof a == 'object' && typeof a.uuid == 'string' && a.uuid.length == 36) {
 					// Internal
 					Object.assign(transition, a);
@@ -90,11 +91,13 @@ class AnimationControllerState {
 						setTimeout(() => {
 							// Delay to after loading controller so that all states can be found
 							let state_match = this.controller.states.find(state => state !== this && state.name == key);
-							if (state_match) transition.target = state_match.uuid;
+							if (state_match) {
+								let updated_transition = this.transitions.find(t => t.uuid == transition.uuid) ?? transitions;
+								updated_transition.target = state_match.uuid;
+							}
 						}, 0);
 					}
 				}
-				this.transitions.push(transition);
 			})
 		}
 		if (data.particles instanceof Array) {

js/interface/dialog.js

@@ -535,6 +535,8 @@ window.MessageBox = class MessageBox extends Dialog {
 		super(options.id, options);
 		this.options = options;
 		if (!options.buttons) this.buttons = ['dialog.ok'];
+		this.cancelIndex = Math.min(this.buttons.length-1, this.cancelIndex);
+		this.confirmIndex = Math.min(this.buttons.length-1, this.confirmIndex);
 		this.callback = callback;
 	}
 	close(button, result, event) {

js/interface/menu_bar.js

@@ -331,6 +331,7 @@ const MenuBar = {
 			'adjust_curves',
 			new MenuSeparator('filters'),
 			'limit_to_palette',
+			'split_rgb_into_layers',
 			'clear_unused_texture_space',
 			new MenuSeparator('transform'),
 			'flip_texture_x',

js/interface/settings.js

@@ -528,6 +528,7 @@ const Settings = {
 		new Setting('outlines_in_paint_mode',		{category: 'paint', value: true});
 		new Setting('move_with_selection_tool',		{category: 'paint', value: true});
 		new Setting('pick_color_opacity',			{category: 'paint', value: false});
+		new Setting('pick_combined_color',			{category: 'paint', value: false});
 		new Setting('paint_through_transparency',	{category: 'paint', value: true});
 		new Setting('paint_side_restrict',			{category: 'paint', value: true});
 		new Setting('paint_with_stylus_only',		{category: 'paint', value: false});

js/io/formats/bbmodel.js

@@ -263,7 +263,7 @@ var codec = new Codec('project', {
 		if (Animation.all.length) {
 			model.animations = [];
 			Animation.all.forEach(a => {
-				model.animations.push(a.getUndoCopy({bone_names: true, absolute_paths: options.absolute_paths}, true))
+				model.animations.push(a.getUndoCopy({absolute_paths: options.absolute_paths}, true))
 			})
 		}
 		if (AnimationController.all.length) {

js/io/formats/bedrock.js

@@ -96,7 +96,8 @@ window.BedrockEntityManager = class BedrockEntityManager {
 					}
 				}
 				if (valid_textures_list.length == 1) {
-					new Texture({keep_size: true, render_mode}).fromPath(valid_textures_list[0]).add()
+					let texture = new Texture({keep_size: true, render_mode}).fromPath(valid_textures_list[0]).add()
+					if (isApp) loadAdjacentTextureSet(texture);
 					if (render_mode == 'layered') {
 						updateLayeredTextures();
 					}
@@ -169,14 +170,15 @@ window.BedrockEntityManager = class BedrockEntityManager {
 							cancelIndex: 2,
 							onButton(index) {
 								dialog.hide();
+								let textures_to_import = [];
 								if (index == 1) {
-									valid_textures_list.forEach(path => {
-										new Texture({keep_size: true, render_mode}).fromPath(path).add()
-									})
+									textures_to_import = valid_textures_list;
 								} else if (index == 0) {
-									selected_textures.forEach(path => {
-										new Texture({keep_size: true, render_mode}).fromPath(path).add()
-									})
+									textures_to_import = selected_textures;
+								}
+								for (let path of textures_to_import) {
+									let texture = new Texture({keep_size: true, render_mode}).fromPath(path).add();
+									if (isApp) loadAdjacentTextureSet(texture);
 								}
 								if (render_mode == 'layered') {
 									updateLayeredTextures();
@@ -322,7 +324,8 @@ window.BedrockEntityManager = class BedrockEntityManager {
 			} else {
 				function tryItWith(extension) {
 					if (fs.existsSync(texture_path+'.'+extension)) {
-						var texture = new Texture({keep_size: true}).fromPath(texture_path+'.'+extension).add()
+						var texture = new Texture({keep_size: true}).fromPath(texture_path+'.'+extension).add();
+						loadAdjacentTextureSet(texture);
 						return true;
 					}
 				}
@@ -454,6 +457,7 @@ window.BedrockBlockManager = class BedrockBlockManager {
 				])
 				if (full_texture_path) {
 					let texture = new Texture({keep_size: true}).fromPath(full_texture_path).add();
+					if (isApp) loadAdjacentTextureSet(texture);
 					if (target == '*') {
 						texture.use_as_default = true;
 

js/io/formats/generic.js

@@ -24,4 +24,5 @@ new ModelFormat({
 	animation_mode: true,
 	animated_textures: true,
 	locators: true,
+	pbr: true,
 })

js/io/formats/image.js

@@ -1,7 +1,7 @@
 (function() {
 
 let codec = new Codec('image', {
-	name: tl('format.name'),
+	name: tl('format.image'),
 	extension: 'png',
 	remember: true,
 	load_filter: {

js/io/formats/java_block.js

@@ -453,7 +453,7 @@ var codec = new Codec('java_block', {
 					open_with_textures: {text: 'message.child_model_only.open_with_textures', condition: Texture.all.length > 0}
 				}
 			}, (result) => {
-				if (result) {
+				if (typeof result == 'string') {
 					let parent = model.parent.replace(/\w+:/, '');
 					let path_arr = path.split(osfs);
 					let index = path_arr.length - path_arr.indexOf('models');