ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.1

Browse Source
This commit is contained in:
Mashy 2019-11-09 11:31:40 +10:00
commit bc289e4e7c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/assets/styles/instance.less
View File

@ -349,7 +349,7 @@
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
display: grid; display: grid;
grid-template-rows: 1fr 0.5fr 1.5fr; grid-template-rows: 1fr 0.5fr 1fr;
grid-template-areas: grid-template-areas:
"opponent" "opponent"
"text" "text"
@ -379,11 +379,15 @@
.faceoff-text { .faceoff-text {
grid-area: text; grid-area: text;
font-size: 200%;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 1em; letter-spacing: 1em;
font-weight: bold; font-weight: bold;
display: flex;
flex-flow: column;
justify-content: center;
color: @black; color: @black;
animation: faceoff 4s ease-in-out 0s 2 alternate; animation: faceoff 4s ease-in-out 0s 2 alternate;

1
server/src/game.rs
View File

@ -510,7 +510,6 @@ impl Game {
} }
// only reduce cooldowns if no cd was used // only reduce cooldowns if no cd was used
// have to borrow self for the skill check
{ {
if let Some(skill) = resolved.iter() if let Some(skill) = resolved.iter()
.filter(|s| s.source_construct_id == construct.id) .filter(|s| s.source_construct_id == construct.id)