Commit Graph

Select branches

Hide Pull Requests

automnml

develop

main

master

Mono Color

• ab7de7d77d Added keybinds Mashy 2018-11-26 18:13:38 +10:00
• 99ff116e2d cryp arrangement Mashy 2018-11-26 15:25:59 +10:00
• af1c06289d fix ko cryps requiring a skill ntr 2018-11-25 21:31:12 +11:00
• c677e90f42 Added dynamic health bar Mashy 2018-11-25 18:20:27 +10:00
• e530dcf5f1 health bars Mashy 2018-11-25 12:35:18 +10:00
• feec35fa3a highlight cryp when taking dmg Mashy 2018-11-25 11:41:59 +10:00
• e537e052ca render from resolved log Mashy 2018-11-25 00:54:57 +10:00
• f82a4167e1 skill refactor, random skills during combat Mashy 2018-11-24 16:09:53 +10:00
• 81ff0e3663 COMBAT ANIMATIONZZZZ Mashy 2018-11-23 18:35:45 +10:00
• 47547ed657 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2018-11-23 15:07:48 +10:00
• 1785877afe Refactor combat page Mashy 2018-11-23 15:07:22 +10:00
• fa603009a1 max skills ntr 2018-11-23 13:40:44 +11:00
• e566bbc7e9 handle auth early ntr 2018-11-23 13:33:16 +11:00
• c4be86b59f l2postgres ntr 2018-11-22 18:47:31 +11:00
• e62ba13b54 set team size correctly" ntr 2018-11-22 18:41:03 +11:00
• 3b33ac517c rejoin games ntr 2018-11-22 18:39:08 +11:00
• 557925801b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2018-11-22 16:13:29 +10:00
• 9273f53432 Combat turns working Mashy 2018-11-22 16:12:42 +10:00
• 2261d9d6e0 remove unused pointerdown ntr 2018-11-22 14:13:32 +11:00
• 784905cf24 use correct stats ntr 2018-11-22 14:00:01 +11:00
• 601e617bfc cryp page updates ntr 2018-11-22 13:48:35 +11:00
• 9651f57a78 removed redux ntr 2018-11-22 12:34:39 +11:00
• 24d7fa99c6 Merge branch 'master' into game-list ntr 2018-11-22 12:12:00 +11:00
• 992b6ecd7d sql stuff ntr 2018-11-22 12:11:16 +11:00
• b8522e7085 Screen based positions and margins for battle Mashy 2018-11-22 11:07:24 +10:00
• 421987c53b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2018-11-21 19:42:50 +11:00
• 6001e7dd2d game list ntr 2018-11-21 19:34:10 +11:00
• 0ca5ba170e refactor of cryp render Mashy 2018-11-21 18:17:30 +10:00
• dee1721380 Merged with log Mashy 2018-11-21 17:34:01 +10:00
• f54e2432dd Updated battle UI Mashy 2018-11-21 17:23:23 +10:00
• 1854ef86ad game log ntr 2018-11-21 17:13:04 +11:00
• 41c7c790f2 pve and pvp back ntr 2018-11-21 16:32:39 +11:00
• 4d648c8fe7 react linting ntr 2018-11-21 15:07:49 +11:00
• d699a9cfe8 react begone ntr 2018-11-21 15:06:20 +11:00
• ba56f424c4 buttons and doto colours ntr 2018-11-21 14:54:05 +11:00
• 7b359f7fb4 active fill ntr 2018-11-20 22:48:26 +11:00
• e4c9efc4ec Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2018-11-20 22:35:47 +11:00
• 6980e1cf8b active cryps ntr 2018-11-20 22:28:41 +11:00
• d0292f8f05 Changed click handlers Mashy 2018-11-20 16:22:28 +10:00
• 6c04a03145 Merge and refactor Mashy 2018-11-20 16:03:24 +10:00
• d1f2676e0f refactor scenes into classes Mashy 2018-11-20 14:49:28 +10:00
• 70eca5580d merge ntr 2018-11-20 15:36:41 +11:00
• cd346252cc Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2018-11-20 15:34:17 +11:00
• 3e4cb096a5 forget and learn ntr 2018-11-20 14:33:40 +11:00
• ab0aebc49f Added back my passives, f to show g to hide Mashy 2018-11-20 00:36:37 +10:00
• 9327b4381c foreach fail ntr 2018-11-20 00:31:59 +11:00
• 552639809f Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2018-11-20 00:26:18 +11:00
• d9b25e0fc6 shits fucked ntr 2018-11-20 00:21:52 +11:00
• a67cd1521c Merge branch 'battleui' Mashy 2018-11-19 22:21:07 +10:00
• 7c74018dbf no more scene restarts monkaS ntr 2018-11-19 23:15:49 +11:00
• 3c5199d710 grep Mashy 2018-11-19 22:09:47 +10:00
• d4bcaa244c clean up text ntr 2018-11-19 23:09:31 +11:00
• bd3ffdc123 merged and removed components Mashy 2018-11-19 22:07:46 +10:00
• 6907cf17e0 cryps list click ntr 2018-11-19 20:23:40 +11:00
• 0d439b3ef2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps into battleui Mashy 2018-11-19 17:56:25 +10:00
• fae49d3376 misc phaser Mashy 2018-11-19 17:52:55 +10:00
• 8cd8e61b7a menu ntr 2018-11-19 18:45:55 +11:00
• 46ebdc2ced menu ntr 2018-11-19 18:45:50 +11:00
• e304f801d5 remove background, scroll zoom compensation Mashy 2018-11-18 10:35:29 +10:00
• e3277c3478 text alpha (see through) Mashy 2018-11-18 10:20:35 +10:00
• 3dc6baf2b9 woops Mashy 2018-11-18 01:54:09 +10:00
• 21d2f5c7e4 Legit as fuck hover text Mashy 2018-11-18 01:47:55 +10:00
• cf1f478e2f Merge branch 'battleui' ntr 2018-11-16 16:31:21 +11:00
• 54031062e9 banish everythin ntr 2018-11-16 16:19:20 +11:00
• 6302e2c362 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps into battleui Mashy 2018-11-16 14:34:11 +10:00
• 01e6fdef69 Added node passive text on hover, functions to allow node allocation from state Mashy 2018-11-16 14:33:41 +10:00
• 84debe6bbc purge and purify ntr 2018-11-16 13:48:49 +11:00
• eda4800cd3 Mouse control of passive tree, Q & E for zoom Mashy 2018-11-15 18:19:15 +10:00
• 92ee2ad52e check immunities ntr 2018-11-15 16:34:47 +11:00
• 82e49c56bf damage calculations ntr 2018-11-15 15:25:36 +11:00
• c6d342b7c8 Shadow Tree Mashy 2018-11-15 13:33:15 +10:00
• ecabde3389 move healing and spell damage calculations into cryp" git push " ntr 2018-11-14 17:50:28 +11:00
• 971c0dd03d silence ntr 2018-11-14 16:10:27 +11:00
• eb8aa98e42 fix drain logs ntr 2018-11-13 22:36:02 +11:00
• bcc3079f73 stam -> stamina Mashy 2018-11-13 17:47:32 +10:00
• c175e80817 add all cryps fn ntr 2018-11-13 17:16:25 +11:00
• 4453f567ea reduce the cooldowns of all cryps in the game, not just the ones on the stack ntr 2018-11-13 17:14:16 +11:00
• bec35ca46b drain test ntr 2018-11-13 17:10:52 +11:00
• 6cdecb2b37 tests back ntr 2018-11-13 16:29:20 +11:00
• 4e0f2d90b0 merge with master Mashy 2018-11-13 14:56:41 +10:00
• d4bf444021 passives Mashy 2018-11-13 14:30:30 +10:00
• 8b60f26fc5 Basic graph display Mashy 2018-11-13 14:24:39 +10:00
• 8ce0fc4fbb add some skills, revert to log ntr 2018-11-12 18:15:58 +11:00
• 2ab5009fe1 dots and hots ntr 2018-11-09 15:33:17 +11:00
• 567b1b7ee9 effect ticks ntr 2018-11-09 15:17:49 +11:00
• 2908296410 triage ntr 2018-11-09 14:00:51 +11:00
• 6c7b6b741f healing ntr 2018-11-08 22:56:57 +11:00
• 58f186d2fd passives and lots and lots of skills ntr 2018-11-08 00:00:46 +11:00
• 79374a3cd5 More attack animations Mashy 2018-11-05 16:31:48 +10:00
• 8aebc1dd5b Refactor for more phasor skills Mashy 2018-11-02 23:54:09 +10:00
• 0a1f34f41b graph time ntr 2018-11-02 18:04:00 +11:00
• c4b20c786d more flava ntr 2018-11-02 13:25:59 +11:00
• 63983536d7 reeadme ntr 2018-11-02 01:23:48 +11:00
• 8441ec43be Merge branch 'master' into battleui Mashy 2018-10-31 12:50:45 +10:00
• 72886c262e misc phaser Mashy 2018-10-31 12:41:34 +10:00
• 09b6f455d3 self targeting client ntr 2018-10-30 20:20:08 +11:00
• dadc6e4a9e Combat animation and HP from state Mashy 2018-10-30 16:25:33 +10:00
• b5191e5306 blocking and speed ntr 2018-10-30 16:44:10 +11:00
• 28238ee812 remove some cruft ntr 2018-10-29 16:56:43 +11:00
• 5549e87fab fix ability phase bug; ntr 2018-10-27 18:26:23 +11:00