From d606ce8d073b028633c5c97a48763034f44e84ea Mon Sep 17 00:00:00 2001 From: Andrew Whittle Date: Wed, 16 Aug 2017 18:25:59 -0600 Subject: [PATCH] Cleanup and minor fixes --- ProjectEpoch/Assets/Scenes/MainScene.unity | Bin 136608 -> 149096 bytes .../Assets/Scripts/PlayerBehaviour.cs | 5 +++++ .../ProjectSettings/EditorBuildSettings.asset | Bin 4104 -> 4160 bytes .../ProjectSettings/GraphicsSettings.asset | Bin 4390 -> 4402 bytes .../ProjectSettings/ProjectSettings.asset | Bin 52166 -> 52202 bytes 5 files changed, 5 insertions(+) diff --git a/ProjectEpoch/Assets/Scenes/MainScene.unity b/ProjectEpoch/Assets/Scenes/MainScene.unity index d0316e1c5936cda835c540d95852bb004adfd0b4..5b529405dcb88fbfea3efa7a1809d01dd0ece511 100644 GIT binary patch delta 9954 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 delta 3404 zcmZ9Ndr;Ly6vy}c;w=;;>Ct8t=fY7kOUdGy`otiN9|vvb(b@0{~JyL)zT z|E}o3yHV2x?OZR6q<|120sl9`ibdCETs!~1`C@E*e4M5nn*L7e;XjriH%QcX7g*f| zG-F8$iQk_2^<>3YonaKbqifpRd4&}*J;O6kp6Drl>Vf=?_k3{83?!ptcrR%WRPJ^-bQIjRBJZ9Ng-d>vC9)>39fJjm>-4tJ5WVN7XcBIts~1oMerK<${T9g*pR z2(uuVEGAltFq?{r7S3n38mtIDF&G)gT3s+A0QNMjT-*|7scWw;qo3om09 zKgkxko>>u?E_!5WC{>EIgO#z!C^J{A?f28eLvHEU09MO>Kl>O)#o3M_W}CrcNeJW> zzv$qLg{Yhj4%Xg3Wj>4;SS-XASh>0nn0YgWD8L*k#D~nLk`gZrnfblS^P4)XL6X8gXvxMFdGKL(fL%<X%0=0$??;a&;S+xw3?4!u%49YGy594VcS@dz4vbw%s#3TW`Sn;RCh?ZC?uF{nTb0N@u&oe~A~nq1xppxdnfZNyT4WPL*K%8A zGqVyfE#i57GS(_Y2bdPgV^)-Bi{vwF0@E4=%-s1C8a~`Av4UYGpcc7$PL2}k1FMCP zT**{stI=8Vip670V-^6@BGZ{=uCNy}gP9jhYn<<0?dS^2rqy}E(Rne79>hKV@niwcGVfQ^{T`?;2xf1{nyUzLw; z!F>mN09GE!R%Yd!FrkU=uhVSv#EnS6r>}b-TnQuk!S=w)*l)n3zVPGqmRqU2=6%9WSpMMB5}7ar_B5VrOYZ3qy09z{I^0&^ntB|mBnmg=JDHpX?Gl7g-@ad45zI8=13;@KNXj_ z1@?2h4)u)VGP4|z!H3vTR4eX6rA)H#xe_lErgGJKjN76foTz6U`rJ~iK1=xx%-** zf)&U(`TlQZ7{A><_c~?)FrCmlD;=GIN2kGFT@^DgnD#qh9h6Ur2s!-TW9GrbAH=tC zjEgWxE;F>{pfCpx(Nz><&1Hnn#glnML+oOuJ#Sj;erXk2(XAKXC+DWuMS%WZr2} zr7Yko)89d>BV?t=Q_S2pN|PYUjPIljP^$e$DTSX> zN~NcqN`IYlDkYy*3mC-eHyfHF!aRD0zC-3c!)k|;&#KHd zXPuej&N(v|oKuN1Op=BP!sF5fxB6ssi2^bp~XOIRk3ORKSTb z@}aVI<5UQ9VEjTrth^St-6URp`QaL2ddJC?Bv0t)6uBb%FQTp1*e&-s&M*qokfL<1 zq1tAyq1qu9JR{1S>Nf0CF>Bq1ED(Dvdu;uDV_cdA#vC*A z3^sfJ0wWRK+_}K0r+EA-h@S5J?7hv+*+YYa*=Df7NVF;!8s7iubS#2Se1=nJeTLHc zD?^oEvsjhiv)EaFS*El6J(n!Az OT*I7b-(C5}5A-jJ{<2B{ diff --git a/ProjectEpoch/Assets/Scripts/PlayerBehaviour.cs b/ProjectEpoch/Assets/Scripts/PlayerBehaviour.cs index 9374068..a2240b7 100644 --- a/ProjectEpoch/Assets/Scripts/PlayerBehaviour.cs +++ b/ProjectEpoch/Assets/Scripts/PlayerBehaviour.cs @@ -31,6 +31,11 @@ void Start () { // Update is called once per frame void Update () { + + if (Input.GetKey ("escape")) { + Application.Quit (); + } + if (Input.GetMouseButton (0)) { // Rotate the arms! arms.Rotate (Vector3.left, armRotationSpeed * Time.deltaTime); diff --git a/ProjectEpoch/ProjectSettings/EditorBuildSettings.asset b/ProjectEpoch/ProjectSettings/EditorBuildSettings.asset index d767445aac8b60ef4f46ef1aef3576d2724be49c..cadfc5ac08c7d527470e14b1ee1f3583ba1db62c 100644 GIT binary patch delta 85 zcmeBBIH176z`&%*z#!nTkwb-v(P6V8({)}OMg|535S9gE$KvADl4AYfVtwDl h%sentuQV^Sq!K7Ey7W`%+^o$G8+6Tnxvy{$1pqZH7p(vQ delta 28 jcmX@0(4oM=z`&%*z#zb}kwb-vkz=zV(`DYt4on;XOk4$D diff --git a/ProjectEpoch/ProjectSettings/GraphicsSettings.asset b/ProjectEpoch/ProjectSettings/GraphicsSettings.asset index 6abd3c0946cff7638e7eea1dfe8d3ee0aa04709a..82cd6637aa5f9ef911e8109491ea2f2d9d2805fc 100644 GIT binary patch delta 41 xcmZ3cv`LABfq{Ps1B0N^MvfeQMx)K8{QQiJ?2}ssyxABT7#JGtCZ7_B0RX=m2~q$6 delta 34 qcmdm_v`mSEfq{Ps1B0O2MvfeQMzzhQ{QQiJY?E6ByeHog2m=6#vj~6y diff --git a/ProjectEpoch/ProjectSettings/ProjectSettings.asset b/ProjectEpoch/ProjectSettings/ProjectSettings.asset index ac07708db9b34eaab17162d00033954d273fb118..df8f50bd1f21ff73564eef1db052dbae5919f862 100644 GIT binary patch delta 102 zcmX>$o%z*tW)2311ELHJr(bR45IDfJi+l3N15%Ss4yf<|B^VsTGcrp`a#Ab>qwIDw^W3$1bX`BGSiy@8x delta 67 zcmV-J0KEU|mjlL^0|)>Bz!d-h%f_(?5WoVK3zOl%8k01@BoYn)002Z~W?^+~bVF}# ZaA9tFlTOMevxvZ)0h18I46|IqjtM!&8Fl~w