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

README.md

@@ -8,6 +8,13 @@ minimal studios is ntr & mashy: 2 mates with a friendship forged in the fires of
 we have both bailed out of the big city life and have dedicated ourselves to growing farm fresh, organic, ethical gaming produce in the rolling hills of brisbane and leaves of melbourne.
 completely self funded, we're just here to make games that feel good & play it clean.
 
+## inspiration
+- peggle
+- soldat
+- mini metro
+- poe
+- mtg
+
 
 ## Construct Alignments
 

client/assets/styles/styles.less

@@ -112,7 +112,7 @@ button, input {
     flex: 1;
 
     /*the transitions */
-    transition-property: color, background;
+    transition-property: border-color, color, background;
     transition-duration: 0.25s;
     transition-delay: 0;
     transition-timing-function: ease;

client/src/components/demo.jsx

@@ -92,7 +92,7 @@ function Demo(args) {
                             VBOX PHASE {shapes.Red()} {shapes.Green()} {shapes.Blue()}
                         </h2>
                         <p>
-                            combine the colour base items with an array of skills and specialisations to build powerful variants.
+                            Combine the colour base items with an array of skills and specialisations to build powerful variants.
                         </p>
                     </div>
                     <div>&nbsp;</div>
@@ -146,9 +146,11 @@ function Demo(args) {
         return (
             <div class="game-demo">
                 <div>
-                    <h2>GAME PHASE</h2>
+                    <h2>COMBAT PHASE</h2>
-                    <p>Outplay noobs wahtever write tomorrow, fix the tiemout shit.</p>
+                    <p>Battle your opponent using dynamic team builds from the VBOX phase.</p>
-                    <p>also have to just picka  random avatar so i don't fill up my drive</p>
+                    <p>Crafted skills can be used to damage the opponent or support your team.</p>
+                    <p>Turn based combat, each team picks targets for their skills during this phase.</p>
+                    <p>The damage dealt by skills, cast order and construct life depend on your decisions in the VBOX phase. </p>
                 </div>
                 <div class="game">
                     <div class="game-construct">

client/src/components/welcome.register.jsx

@@ -45,7 +45,7 @@ function Register(args) {
         password === confirm;
 
     const registerDisabled = () => {
-        return !(registerConfirm() && password && name && code);
+        return !(registerConfirm() && password && name);
     }
 
     return (