From a013263822587102ed49bc7495fb48cafdaa2120 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Sat, 25 Jul 2015 23:27:11 -0700
Subject: [PATCH] no sword

---
 desktop/resources/ui/slider-bar-hover.png | Bin 1281 -> 1391 bytes
 desktop/resources/ui/ui.atlas             |  12 ++++++------
 desktop/resources/ui/ui.png               | Bin 627 -> 479 bytes
 desktop/settings.edn                      |   2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/desktop/resources/ui/slider-bar-hover.png b/desktop/resources/ui/slider-bar-hover.png
index 66c72c5a8371f76a1cdae8e44308b0af6e8ddaa2..aefa98c8df100cff52e6c825f4b2fb39633d44ce 100644
GIT binary patch
delta 329
zcmV-P0k-~u3hxRbiBL{Q4GJ0x0000DNk~Le0000S0000S2nGNE0CElAl(8W)1b+br
zNkl<ZNDX6TAOQX@S^uAa5)^6Xm_SAp0W=O18lUFe;cp>Ec%#SJzlRS|g8B8qLnwSv
zdpi_9le|0%A3aWoe~{AMhm5~lC!pjr^f*F^5FqFDlLsh5rZNgBd~^;*9HT3sHJ|Q5
zN_PtxuNqpR#36c+-ud|hMaZYB7Jr4mrL7r-ufooO!bj(j<-^ZzwhSOl4j{`yax8-B
zVSzD7p?P;5CPg`lTE>l9MksM8%!1zyr|;iGF~C$&35Ac&dHd%NiV)p{bog6{Q6Kj6
zilD@)lB^s`91!B%d;ADRN#W-=D0U40Af>wxQNkA`@Sz;^IK`$0SqweSkRIhgY`Xh!
b_*)17h~hT{bjfrR00000NkvXXu0mjf1)_&E

delta 218
zcmV<0044wL3V{kCiBL{Q4GJ0x0000DNk~Le0000K0000y2nGNE0A_ZYR<R*61b+aS
zNkl<ZSPAXdu?>JQ3<N+Mu}Vr-U?P|Xw#zU;8GnKGN)suciU*A1!v&a)zC7FD^R4zC
z|5lsvc)=6BSr6<LG#lS=#U^X5VeYc)rIaw2<F~9G;ydND40$uGkRgijS%$nBR>%-V
z_$))-3@c=aB7Bx1Z-x~U8v4HZ?=M$B8fAG#!_4G9Ef^n{g+C{(pU_Y(;}G!q1x`;8
UZ({%PN&o-=07*qoM6N<$f?kJK9{>OV

diff --git a/desktop/resources/ui/ui.atlas b/desktop/resources/ui/ui.atlas
index 5ffd095c..b07443fc 100644
--- a/desktop/resources/ui/ui.atlas
+++ b/desktop/resources/ui/ui.atlas
@@ -1,12 +1,12 @@
 
 ui.png
-size: 32,128
+size: 64,32
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 slider
   rotate: false
-  xy: 2, 2
+  xy: 32, 10
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -14,15 +14,15 @@ slider
   index: -1
 slider-bar
   rotate: false
-  xy: 2, 24
+  xy: 2, 2
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 slider-bar-hover
   rotate: false
-  xy: 2, 54
-  size: 20, 60
-  orig: 20, 60
+  xy: 2, 2
+  size: 28, 28
+  orig: 28, 28
   offset: 0, 0
   index: -1
diff --git a/desktop/resources/ui/ui.png b/desktop/resources/ui/ui.png
index ea9403636b4a85a11eecb12dd0c329b172fcbfa1..375e475e253158830744f10bee7bf8a43d101ad6 100644
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004|Nkl<Zc-muN
zAOQX@Sx*rj@?bOo5T5x@A|4HZAsGPZN%+sAwPXhXlHQ?{C9vh=KXX@*8~{)~LplIZ
zJoLMD0t$ZS7KDP)<%evR7;ymrbSx^KIEQ8d05Th9&&k|uh8dym4C!{tG{NKt01$s~
znLzab0GWwy53M{;ZUEr*AUfWtWrTtWsYf>-DFFUc8IJ}4NdfS!x@}|!z`M+1Fs63^
zfb1L;0r1c_42-WDTK&g|(LIb_$f3&<G7n@Ywg6a{VM`LGH~?;1IfFb;Rsei>^#+W|
z2>_6tgCYPf8d#3(063{<4#xD(0w6mFMF8y8F#%(A4;;}m!;AZQMNlvy_2}k<>?9@t
z%oT-EFx3NKtCkVS^K=gYke!1f05*;Wz-Rzq;N|ja4Co%j;sLxET|dZ7bbAIxA&Bm%
zg)+(@&r>}BKxTr>hS}3%ra3qQ03AR*Pm=%uVHiN_x{e0GU=08`o+>28fW<?2F;ou*
zCKLd4?+g(NfC+q}SW^TM7+LSo2>@cV1Tg`C>|t~;8URBu0La2b1i-)!ijMRE005x}
VUyFuQgL(h}002ovPDHLkV1ka;vQ7X1

literal 627
zcmV-(0*w8MP)<h;3K|Lk000e1NJLTq001BW004jp1^@s6YG!L10006yNkl<Zc-rmN
zyDtP$6bA6)51{a9L?R+l2!aS9p^<1rK_L>2%A?RwQfvf?%1S6C6dnl;vV~Ho5tTwA
zTWJ(xWh)Bg+B4aaxo56<&+g3bImuU;nR~upc6I~ihMFPF*iMuHBH%C}=77ujL04fw
z=>z(jYNRlr`~dtbC_e!IH!Mp);Mt!U_YXLkora&&D^Iy!OMve&EEF!Ior@oUevIG8
z7oGuzv)~w{dY9ja=dJ<yGrj=Q!mo{_l$VhSDfGVQS5k05?qNAQ2cZFQH|;Y6a`{|O
z1`fcTsxIRnmIXAa)@~_w&(r<U0eq}%77c*i@V>CDrO*Jq7oNu^wLEqW2&>RS`X!_H
z?e^)t@H8-t<(>f9*EcO*0N9D$@X*;`GyrzPT}PjmLcapN7jD{mw9o~&9le&>uB??}
z_dMON_ri5+H<lM1fSuT_mlp+)iW=ZAXN@gD3ls}1L(k(*RhQ|)QA0D92M)lUxZ4Dv
zlP?bifU%t@0sgXAT@Q+dmdT$n#Wf&VRj2$!9K?9mIl$>FaRTsE7-fK`#2+ApuuSL^
zB>)`;FrY*M>2z93CX@LWfcNP0fdeqvY}N$8YpQ311PEj3(EAKv00S7n00uCC0SsUO
z0~o*n1~7mD42UmasJ%kUR${?30MF8Wt^t_Ur770{Jfqs>1|R|s1L6nxH!~vuyNe)<
z!D~*=`UcF6YUL&XUc-C70d|uwR{}7h4+9twC4e%e58&b9;o&Ly`33Rqm?YhNM;QPB
N002ovPDHLkV1hY<4&nd+

diff --git a/desktop/settings.edn b/desktop/settings.edn
index 622d97b4..5d8e45a1 100644
--- a/desktop/settings.edn
+++ b/desktop/settings.edn
@@ -1 +1 @@
-{:sound-volume 97.0, :music-volume 77.0}
\ No newline at end of file
+{:sound-volume 91.0, :music-volume 36.0}
\ No newline at end of file