JannisX11/blockbench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.8

Browse Source
This commit is contained in:
JannisX11 2021-01-11 23:11:05 +01:00
commit e1089b71e8
4 changed files with 191 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
index.html
View File

@ -551,25 +551,31 @@
</div> </div>
<p><b class="tl">about.version</b> <span id="version_tag"></span></p> <p><b class="tl">about.version</b> <span id="version_tag"></span></p>
<p><b class="tl">about.creator</b> JannisX11</p> <p><b class="tl">about.creator</b> JannisX11</p>
<p><b class="tl">about.website</b> <a class="open-in-browser" href="http://blockbench.net">blockbench.net</a></p> <p><b class="tl">about.website</b> <a class="open-in-browser" href="https://blockbench.net">blockbench.net</a></p>
<p><b class="tl">about.bugtracker</b> <a class="open-in-browser" href="https://github.com/JannisX11/blockbench/issues">github.com/JannisX11/blockbench</a></p> <p><b class="tl">about.bugtracker</b> <a class="open-in-browser" href="https://github.com/JannisX11/blockbench/issues">github.com/JannisX11/blockbench</a></p>
<p class="local_only tl">about.electron</p> <p class="local_only tl">about.electron</p>
<p class="tl">about.vertex_snap</p> <p class="tl">about.vertex_snap</p>
<p><b class="tl">about.icons</b> <a href="https://material.io/icons/" class="open-in-browser">material.io/icons</a> &amp; <a href="http://fontawesome.io/icons/" class="open-in-browser">fontawesome</a></p> <p><b class="tl">about.icons</b> <a href="https://material.io/icons/" class="open-in-browser">material.io/icons</a> &amp; <a href="https://fontawesome.io/icons/" class="open-in-browser">fontawesome</a></p>
<p><b class="tl">about.libraries</b> <p><b class="tl">about.libraries</b>
<a class="open-in-browser" href="https://jquery.com">jQuery</a>, <a class="open-in-browser" href="https://vuejs.org">Vue</a>,
<a class="open-in-browser" href="https://jqueryui.com">jQuery UI</a>,
<a class="open-in-browser" href="http://touchpunch.furf.com">jQuery UI Touch Punch</a>,
<a class="open-in-browser" href="https://vuejs.org">VueJS</a>,
<a class="open-in-browser" href="https://github.com/weibangtuo/vue-tree">Vue Tree</a>, <a class="open-in-browser" href="https://github.com/weibangtuo/vue-tree">Vue Tree</a>,
<a class="open-in-browser" href="https://github.com/sagalbot/vue-sortable">Vue Sortable</a>, <a class="open-in-browser" href="https://github.com/sagalbot/vue-sortable">Vue Sortable</a>,
<a class="open-in-browser" href="https://threejs.org">ThreeJS</a>, <a class="open-in-browser" href="https://threejs.org">ThreeJS</a>,
<a class="open-in-browser" href="https://github.com/lo-th/fullik">Full IK</a>,
<a class="open-in-browser" href="https://github.com/oliver-moran/jimp">Jimp</a>, <a class="open-in-browser" href="https://github.com/oliver-moran/jimp">Jimp</a>,
<a class="open-in-browser" href="https://bgrins.github.io/spectrum">Spectrum</a>, <a class="open-in-browser" href="https://bgrins.github.io/spectrum">Spectrum</a>,
<a class="open-in-browser" href="https://github.com/jnordberg/gif.js">gif.js</a>, <a class="open-in-browser" href="https://github.com/jnordberg/gif.js">gif.js</a>,
<a class="open-in-browser" href="https://stuk.github.io/jszip/">JSZip</a>, <a class="open-in-browser" href="https://stuk.github.io/jszip/">JSZip</a>,
<a class="open-in-browser" href="https://github.com/rotemdan/lzutf8.js">LZ-UTF8</a>, <a class="open-in-browser" href="https://github.com/rotemdan/lzutf8.js">LZ-UTF8</a>,
<a class="open-in-browser" href="https://jquery.com">jQuery</a>,
<a class="open-in-browser" href="https://jqueryui.com">jQuery UI</a>,
<a class="open-in-browser" href="https://github.com/furf/jquery-ui-touch-punch">jQuery UI Touch Punch</a>,
<a class="open-in-browser" href="https://peerjs.com">PeerJS</a>,
<a class="open-in-browser" href="https://github.com/markedjs/marked">Marked</a> <a class="open-in-browser" href="https://github.com/markedjs/marked">Marked</a>
<a class="open-in-browser" href="https://prismjs.com">Prism</a>
<a class="open-in-browser" href="https://github.com/koca/vue-prism-editor">Vue Prism Editor</a>
<a class="open-in-browser" href="https://github.com/JannisX11/molangjs">MolangJS</a>
<a class="open-in-browser" href="https://github.com/JannisX11/wintersky">Wintersky</a>
</p> </p>
</div> </div>

2
js/animations/animation.js
View File

@ -1432,7 +1432,7 @@ const Animator = {
if (source.pre) { if (source.pre) {
points.push(getKeyframeDataPoints(source.pre)[0]) points.push(getKeyframeDataPoints(source.pre)[0])
} }
if (source.post) { if (source.post && !(source.pre instanceof Array && source.post instanceof Array && source.post.equals(source.pre))) {
points.push(getKeyframeDataPoints(source.post)[0]) points.push(getKeyframeDataPoints(source.post)[0])
} }
return points; return points;

11
js/animations/keyframe.js
View File

@ -220,15 +220,8 @@ class Keyframe {
} }
compileBedrockKeyframe() { compileBedrockKeyframe() {
if (this.transform) { if (this.transform) {
if (this.data_points.length == 1) { if (this.data_points.length == 1 && this.interpolation == 'linear') {
if (this.interpolation == 'linear') { return this.getArray();
return this.getArray();
} else {
return {
post: this.getArray(),
lerp_mode: this.interpolation,
}
}
} else { } else {
return { return {
pre: this.getArray(0), pre: this.getArray(0),

187
lib/jquery-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long