Skip to content

Commit

Permalink
Add changes to spells for updated spells by DZ
Browse files Browse the repository at this point in the history
  • Loading branch information
Akkadius committed Jan 18, 2022
1 parent 67cb477 commit e40e7a2
Show file tree
Hide file tree
Showing 9 changed files with 104 additions and 68 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## [1.6.0]

### Updated Spell Animations!

* Special thanks to DeadZergling for all of his effort putting together these high quality preview videos

[![](https://img.youtube.com/vi/7xXoBAWs3n8/0.jpg)](https://www.youtube.com/watch?v=7xXoBAWs3n8)

* Race viewer initial load should now be faster
* Race viewer now includes a models available by zone filter

## [1.5.1]

* Changelog page now only autoplays videos that are in the current viewport
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ build-frontend: ##@build Builds frontend to be packed into binary

build-binary: ##@build Build and packs release binary
packr clean
packr
packr --compress
GOOS=linux GOARCH=amd64 go build -o spire-linux-amd64
GOOS=windows GOARCH=amd64 go build -o spire-windows-amd64.exe
zip spire-linux-amd64.zip spire-linux-amd64
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/eq-assets/spell-animations-map.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions frontend/src/views/spell-editor/SpellEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<!-- <spell-deity-selector :spell="spell" @input="spell = $event"/>-->

<div class="row">
<div class="col-8">
<div class="col-6">
<div class="row">
<div class="col-6">
You Cast
Expand Down Expand Up @@ -125,12 +125,12 @@
</div>
</div>
<div
class="col-4"
class="col-6"
style="text-align: center"
@mouseover="drawSpellAnimationSelector"
>
<spell-animation-preview
class="mt-4"
class="mt-3 mb-3"
:id="spell.spellanim"
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
muted
loop
autoplay
:style="'width: ' + this.width + 'px; height: ' + this.height + 'px; border-radius:10px; border: 1px solid;'"
:style="'width: ' + this.width + 'px; height: ' + this.height + 'px; border-radius:5px; border: 1px solid rgba(255, 255, 255, .3)'"
:src="videoSource"
class="spell-preview">
>
</video>
</div>
</div>
Expand Down Expand Up @@ -63,12 +63,12 @@ export default {
type: Number,
},
width: {
default: 250,
default: 384,
required: false,
type: Number,
},
height: {
default: 332,
default: 216,
required: false,
type: Number,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,54 @@
<div class="text-center">
<app-loader :is-loading="!loaded" padding="8"/>

<input
type="text"
class="form-control ml-2 mb-4"
v-model="search"
v-on:keyup="triggerSearch"
style="width: 95%"
placeholder="Search for spell names to find animations"
>
<div class="row">
<div class="col-12">
<input
type="text"
class="form-control mb-4"
v-model="search"
v-on:keyup="triggerSearch"
placeholder="Search for spell names to find animations"
>
</div>
</div>

<div
style="height: 85vh; overflow-y: scroll"
v-on:scroll.passive="render"
class="row justify-content-center"
id="spell-video-view-port"
>

<div v-if="filteredAnimations && filteredAnimations.length === 0">
No animations found...
</div>
<div class="col-12">
<div v-if="filteredAnimations && filteredAnimations.length === 0">
No animations found...
</div>

<div
v-for="(animationId) in filteredAnimations"
:key="animationId"
class="d-inline-block"
>
<video
muted
loop
style="width: 160px; height: 230px; border-radius: 10px; border: 1px solid;"
:id="'spell-' + animationId"
:data-src="animBaseUrl + animationId + '.mp4'"
@mousedown="selectSpellAnim(animationId)"
:class="'video-preview spell-preview ' + classIsPulsating(animationId)"
<div
v-for="(animationId) in filteredAnimations"
:key="animationId"
style="display:inline-block; position: relative;"
class="d-inline-block"
>
</video>
<video
muted
loop
style="height: 146px; width: 259px; border-radius: 5px; border: 1px solid rgba(255, 255, 255, .3);"
:id="'spell-' + animationId"
:data-src="animBaseUrl + animationId + '.mp4'"
@mousedown="selectSpellAnim(animationId)"
:class="'video-preview ' + classIsPulsating(animationId)"
>
</video>

<div class="overlay-spell-anim-selector">
<h6 class="eq-header" style="font-size: 21px; ">{{ animationId }}</h6>
</div>

</div>
</div>

</div>

</div>
Expand Down Expand Up @@ -94,7 +107,7 @@ export default {
// 230 is height of video to offset
if (container && target) {
container.scrollTop = target.offsetTop - 80;
container.scrollTop = target.getBoundingClientRect().top - 150;
}
}, 100)
}
Expand Down Expand Up @@ -171,11 +184,9 @@ export default {
</script>

<style>
.spell-preview {
height: 250px;
min-width: 150px;
max-width: 200px;
border-radius: 10px;
margin: 3px;
.overlay-spell-anim-selector {
position: absolute;
bottom: 1px;
left: 11px;
}
</style>
15 changes: 10 additions & 5 deletions frontend/src/views/viewers/RaceViewer.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<template>
<div>
<div class="container-fluid">
<eq-window title="Race Viewer" class="mt-5 text-center">
<eq-window title="Race Viewer" class="mt-5">
<div class="row mb-4">
<div class="col-6">

Filter by Race Name

<!-- Input -->
<input
type="text"
class="form-control form-control-prepended list-search"
class="form-control form-control-prepended list-search mt-1"
v-model="raceSearch"
@keyup="zoneSearch = 0; triggerStateDebounce()"
@keyup.enter="zoneSearch = 0; triggerState()"
Expand All @@ -18,9 +20,12 @@
</div>

<div class="col-5">
Find Models Available by Zone

<select
@change="raceSearch = ''; triggerState()"
v-model.number="zoneSearch" class="form-control"
v-model.number="zoneSearch"
class="form-control mt-1"
>
<option value="0">--- Select Zone ---</option>
<option
Expand All @@ -36,7 +41,7 @@
<div class="col-1">

<button
class='btn btn-outline-warning btn-sm mb-1 mr-2'
class='btn btn-outline-warning btn-sm mb-1 mr-2 mt-4'
@click="reset"
>
<i class="fa fa-refresh"></i> Reset
Expand All @@ -52,7 +57,7 @@
No races found...
</span>

<div v-if="loaded" class="row justify-content-center align-items-center">
<div v-if="loaded" class="row justify-content-center align-items-center text-center">
<div
v-for="race in filteredRaces"
:key="race"
Expand Down
51 changes: 30 additions & 21 deletions frontend/src/views/viewers/SpellAnimationViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,43 @@
class="mt-5 text-center"
>

<input
type="text"
class="form-control ml-2 mb-4"
v-model="search"
v-on:keyup="triggerSearch"
style="width: 95%"
placeholder="Search for spell names to find animations"
>
<div class="row">
<div class="col-12">
<input
type="text"
class="form-control ml-2 mb-4"
v-model="search"
v-on:keyup="triggerSearch"
placeholder="Search for spell names to find animations"
>
</div>
</div>

<div v-if="filteredAnimations && filteredAnimations.length === 0">
No animations found...
</div>

<div v-for="(spell) in filteredAnimations" style="display:inline-block; position: relative;">
<video
muted
loop
:id="'spell-' + spell"
:data-src="animBaseUrl + spell + '.mp4'"
class="video-preview spell-preview"
>
</video>
<div class="overlay">
<h6 class="eq-header">{{ spell }}</h6>
<div class="row">
<div class="col-12">
<div v-for="(spell) in filteredAnimations" style="display:inline-block; position: relative;">
<video
muted
loop
:id="'spell-' + spell"
:data-src="animBaseUrl + spell + '.mp4'"
class="video-preview spell-preview-viewer"
>
</video>
<div class="overlay">
<h6 class="eq-header">{{ spell }}</h6>
</div>
</div>

</div>
</div>

<div class="mt-5">Videos courtesy of Georges <3</div>

<div class="mt-3">Videos courtesy of DeadZergling <3</div>
</eq-window>
</div>
</div>
Expand Down Expand Up @@ -168,7 +177,7 @@ export default {
</script>

<style>
.spell-preview {
.spell-preview-viewer {
/*height: 250px;*/
/*min-width: 150px;*/
/*max-width: 200px;*/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spire",
"version": "1.5.1",
"version": "1.6.0",
"repository": {
"type": "git",
"url": "https://github.com/Akkadius/spire.git"
Expand Down

0 comments on commit e40e7a2

Please sign in to comment.