diff --git a/assets/player_skin.png b/assets/player_skin.png index 834c63f3..67a29e78 100644 Binary files a/assets/player_skin.png and b/assets/player_skin.png differ diff --git a/css/panels.css b/css/panels.css index 90a07d4a..97f6542d 100644 --- a/css/panels.css +++ b/css/panels.css @@ -424,23 +424,24 @@ flex-shrink: 1; overflow: hidden; } - .animation .animation_play_toggle { + .in_list_button { width: 22px; color: var(--color-text); } - .animation .animation_play_toggle:hover { + .in_list_button:hover { color: var(--color-light); } - .animation .animation_save_button { + .in_list_button { width: 22px; color: var(--color-text); } - .animation .animation_save_button:hover { + .in_list_button:hover { color: var(--color-light); } - .animation .animation_save_button:not(.clickable) { + .in_list_button.unclickable { opacity: 0.5; color: var(--color-text) !important; + pointer-events: none; } .animation_file_head { diff --git a/js/animations/animation.js b/js/animations/animation.js index 5e43d4cf..506a2b68 100644 --- a/js/animations/animation.js +++ b/js/animations/animation.js @@ -1090,12 +1090,6 @@ const Animator = { selected.empty() Canvas.updateAllBones() - //if (quad_previews.enabled) { - // quad_previews.enabled_before = true - //} - //main_preview.fullscreen() - //main_preview.setNormalCamera() - $('body').addClass('animation_mode') if (!Animator.timeline_node) { Animator.timeline_node = $('#timeline').get(0) @@ -1363,7 +1357,7 @@ BARS.defineActions(function() { category: 'animation', condition: {modes: ['animate']}, click: function () { - var animation = new Animation({ + new Animation({ name: 'animation.' + (Project.geometry_name||'model') + '.new' }).add(true).propertiesDialog() diff --git a/js/animations/keyframe.js b/js/animations/keyframe.js index 633cabea..a342d327 100644 --- a/js/animations/keyframe.js +++ b/js/animations/keyframe.js @@ -225,7 +225,7 @@ class Keyframe { } } Timeline.selected.safePush(this); - if (Timeline.selected.length == 1 && Timeline.selected[0].Animation.selected == false) { + if (Timeline.selected.length == 1 && Timeline.selected[0].animator.selected == false) { Timeline.selected[0].animator.select() } diff --git a/js/interface/panels.js b/js/interface/panels.js index b74c89a8..4bdfac18 100644 --- a/js/interface/panels.js +++ b/js/interface/panels.js @@ -321,6 +321,14 @@ function setupPanels() { } else { } + }, + addAnimation(path) { + let other_animation = Animation.all.find(a => a.path == path) + console.log(path, other_animation) + new Animation({ + name: other_animation && other_animation.name.replace(/\w+$/, 'new'), + path + }).add(true).propertiesDialog() } }, computed: { @@ -347,9 +355,12 @@ function setupPanels() {