ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
295 Commits 4 Branches 0 Tags
9f7925c7aa5595681d2c98a6aa9cd221e8b54152
Commit Graph
70 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mashy 9f7925c7aa filemode 2018-12-04 20:28:01 +10:00
Mashy 681b9dab4e remove team check fixed scene swap 2018-12-04 20:26:17 +10:00
Mashy 89355075a4 button refactor 2018-12-04 19:08:58 +10:00
Mashy 6e5b6c2c80 Added skill scene and some info / forget / learn handlers 2018-12-04 18:15:07 +10:00
Mashy f1d6c8d17d Merge branch 'playerscene' 2018-12-04 15:20:50 +10:00
Mashy 8610039e58 Added statsheet scene 2018-12-04 15:16:16 +10:00
Mashy 4c184106fd testing scene swaps 2018-11-29 17:29:04 +10:00
Mashy 0dd96ae961 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-29 01:48:36 +10:00
Mashy 0a9040b427 scene restart stuff, doesn't spam rerender 2018-11-29 01:48:13 +10:00
Mashy 342394ddfa Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-28 11:47:12 +10:00
Mashy c74782502f Cryps no longer constantly rerender, only update on phase change 2018-11-28 11:34:04 +10:00
Mashy 05f8c8b6ba Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 19:48:10 +10:00
Mashy 63966ee59c misc function changes 2018-11-27 19:47:53 +10:00
Mashy 72cd7fc635 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 13:40:08 +10:00
Mashy 898cb1cad6 Cleaned up tweening functions 2018-11-27 13:39:45 +10:00
Mashy 7c7bb030ad refactoring stuff 2018-11-27 12:43:21 +10:00
Mashy 98d8c7e29b Cryps move for combat 2018-11-26 21:26:34 +10:00
Mashy ab7de7d77d Added keybinds 2018-11-26 18:13:38 +10:00
Mashy 99ff116e2d cryp arrangement 2018-11-26 15:25:59 +10:00
Mashy c677e90f42 Added dynamic health bar 2018-11-25 18:20:27 +10:00
Mashy e530dcf5f1 health bars 2018-11-25 12:35:18 +10:00
Mashy feec35fa3a highlight cryp when taking dmg 2018-11-25 11:41:59 +10:00
Mashy e537e052ca render from resolved log 2018-11-25 00:54:57 +10:00
Mashy f82a4167e1 skill refactor, random skills during combat 2018-11-24 16:09:53 +10:00
Mashy 81ff0e3663 COMBAT ANIMATIONZZZZ 2018-11-23 18:35:45 +10:00
Mashy 47547ed657 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-23 15:07:48 +10:00
Mashy 1785877afe Refactor combat page 2018-11-23 15:07:22 +10:00
Mashy 557925801b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-22 16:13:29 +10:00
Mashy 9273f53432 Combat turns working 2018-11-22 16:12:42 +10:00
Mashy b8522e7085 Screen based positions and margins for battle 2018-11-22 11:07:24 +10:00
Mashy 0ca5ba170e refactor of cryp render 2018-11-21 18:17:30 +10:00
Mashy dee1721380 Merged with log 2018-11-21 17:34:01 +10:00
Mashy f54e2432dd Updated battle UI 2018-11-21 17:23:23 +10:00
Mashy d0292f8f05 Changed click handlers 2018-11-20 16:22:28 +10:00
Mashy 6c04a03145 Merge and refactor 2018-11-20 16:03:24 +10:00
Mashy d1f2676e0f refactor scenes into classes 2018-11-20 14:49:28 +10:00
Mashy ab0aebc49f Added back my passives, f to show g to hide 2018-11-20 00:36:37 +10:00
Mashy a67cd1521c Merge branch 'battleui' 2018-11-19 22:21:07 +10:00
Mashy 3c5199d710 grep 2018-11-19 22:09:47 +10:00
Mashy bd3ffdc123 merged and removed components 2018-11-19 22:07:46 +10:00
Mashy 0d439b3ef2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps into battleui 2018-11-19 17:56:25 +10:00
Mashy fae49d3376 misc phaser 2018-11-19 17:52:55 +10:00
Mashy e304f801d5 remove background, scroll zoom compensation 2018-11-18 10:35:29 +10:00
Mashy e3277c3478 text alpha (see through) 2018-11-18 10:20:35 +10:00
Mashy 3dc6baf2b9 woops 2018-11-18 01:54:09 +10:00
Mashy 21d2f5c7e4 Legit as fuck hover text 2018-11-18 01:47:55 +10:00
Mashy 6302e2c362 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps into battleui 2018-11-16 14:34:11 +10:00
Mashy 01e6fdef69 Added node passive text on hover, functions to allow node allocation from state 2018-11-16 14:33:41 +10:00
Mashy eda4800cd3 Mouse control of passive tree, Q & E for zoom 2018-11-15 18:19:15 +10:00
Mashy c6d342b7c8 Shadow Tree 2018-11-15 13:33:15 +10:00
Mashy bcc3079f73 stam -> stamina 2018-11-13 17:47:32 +10:00
Mashy 4e0f2d90b0 merge with master 2018-11-13 14:56:41 +10:00
Mashy d4bf444021 passives 2018-11-13 14:30:30 +10:00
Mashy 8b60f26fc5 Basic graph display 2018-11-13 14:24:39 +10:00
Mashy 79374a3cd5 More attack animations 2018-11-05 16:31:48 +10:00
Mashy 8aebc1dd5b Refactor for more phasor skills 2018-11-02 23:54:09 +10:00
Mashy 8441ec43be Merge branch 'master' into battleui 2018-10-31 12:50:45 +10:00
Mashy 72886c262e misc phaser 2018-10-31 12:41:34 +10:00
Mashy dadc6e4a9e Combat animation and HP from state 2018-10-30 16:25:33 +10:00
Mashy 35f3d34399 game.jsx changes 2018-10-26 14:34:36 +10:00
Mashy 6ac999baa0 Added phaser 2018-10-26 14:32:12 +10:00
Mashy 285e14b832 keyboard shortcuts and new battle page 2018-10-23 11:07:27 +10:00
Mashy 9426f06342 register new accounts 2018-10-19 13:37:27 +10:00
Mashy 6ffc98e472 Merging UI panel changes 2018-09-26 11:14:32 +10:00
Mashy 5836e93c3c Cryp battle UI panel 2018-09-25 17:29:42 +10:00
Mashy daf18c26b0 Some ui formatting for cryp stats and xp bar 2018-09-24 16:05:46 +10:00
Mashy 836cbddb63 invstats component 2018-09-22 19:02:13 +10:00
Mashy 30cd11d43f Identicons and navbar test 2018-09-20 16:53:37 +10:00
Himesh Kapadia 2b30c87ef8 Added html and merged had old version 
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
 2018-09-14 19:44:03 +10:00
Mashy 8613c31675 Messing around with some basic bulma 2018-09-14 19:24:31 +10:00