ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,774 Commits 4 Branches 0 Tags
e66a4233e8c67f43ad0717e6ac84b889add40529
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mashy e66a4233e8 fix targetting arrows 2019-12-05 18:00:09 +10:00
Mashy da9736256e Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-05 17:26:38 +10:00
Mashy 8630ed873f Merge branch 'develop' into core 2019-12-05 17:26:21 +10:00
Mashy af654cffc2 refactor game.construct 2019-12-05 17:25:54 +10:00
Mashy 8e90e6e0e3 remove tutorialGame from game.construct 2019-12-05 15:55:14 +10:00
Mashy eb12a0a96e Merge tag '1.10.1' into develop 
1.10.1
 2019-12-04 13:45:28 +10:00
Mashy 6b63b4fdfd Merge branch 'release/1.10.1' 2019-12-04 13:45:21 +10:00
Mashy 1b1e3d782d changelog 2019-12-04 13:03:48 +10:00
Mashy 0ea1d4b05e 1.10.1 2019-12-04 13:01:54 +10:00
Mashy 38eda7afac skill value rebalance 2019-12-04 12:59:45 +10:00
Mashy 70db52737f Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-12-04 12:17:41 +10:00
Mashy 66ec4ff5af test fix 2019-12-04 12:17:17 +10:00
Mashy e1f400726b another tweak 2019-12-04 12:01:38 +10:00
Mashy 84ac6db353 power spec rebalance 2019-12-04 11:56:50 +10:00
Mashy 0b5d23c2bf bash purge fix 2019-12-03 10:48:40 +10:00
Mashy 900a9089b1 yolo 3 -> 2 combos 2019-12-02 16:46:02 +10:00
Mashy e661c2501f combos.md 2019-12-02 16:28:17 +10:00
Mashy 677cec24a2 wl 2019-11-29 16:55:52 +10:00
Mashy 3d34d3bbe2 keep item fadeout while full combo is selected 2019-11-29 12:55:01 +10:00
Mashy 798b68cff1 text cleanup 2019-11-29 09:41:09 +10:00
Mashy 75a1c1b3c4 duplicate events on same construct won't move 2019-11-29 00:06:42 +10:00
Mashy 84e3e776ca fixt tutorial 2019-11-28 23:46:07 +10:00
Mashy 500584ab10 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-28 17:49:10 +10:00
Mashy 63028fe297 wip experimenting with values 2019-11-28 16:54:37 +10:00
Mashy e78a502a40 PogU 2019-11-28 15:54:37 +10:00
Mashy 51edec11fd fixed recharge event 2019-11-28 14:54:35 +10:00
Mashy 5e1b63108c move skill into combat text 2019-11-28 12:01:05 +10:00
Mashy d1dd2b30b6 combat text init 2019-11-27 17:00:40 +10:00
Mashy d276edab14 return of the combo preview 2019-11-26 17:30:52 +10:00
Mashy 79f5845e48 comments 2019-11-26 13:32:23 +10:00
Mashy 5153ed07b0 add back shouldComponentUpdates =\ 2019-11-26 13:27:50 +10:00
Mashy 8312b44b2b change info / combos back to functional components with passed down props 2019-11-26 12:03:31 +10:00
Mashy d1649c986b vbox css fix 2019-11-26 11:43:53 +10:00
Mashy f03317da54 wl 2019-11-26 10:49:40 +10:00
Mashy e2444cc988 wl 2019-11-26 10:49:14 +10:00
Mashy c10b68949c should comp update for info / combos 2019-11-26 10:42:06 +10:00
Mashy 86a84cbcea duplicate line 2019-11-25 22:19:48 +10:00
Mashy a50d10185f click clear, match default refund border width 2019-11-25 22:18:04 +10:00
Mashy f4a7ba65eb unlock info size from store/stash divider 2019-11-25 21:46:54 +10:00
Mashy 4dbbb4f38d mobile game styling fix 2019-11-25 20:11:48 +10:00
Mashy 490216fb01 refactoring FeelsAmazingMan 2019-11-25 16:54:51 +10:00
Mashy 74f47e7cb5 Merge branch 'vbox-layout' into new-vbox-combiner 2019-11-24 15:50:26 +10:00
Mashy a9faec1d4e group info and combiner css together 2019-11-24 13:08:28 +10:00
Mashy 6ce43884c9 clear vbox state variables on game leave 2019-11-24 12:42:27 +10:00
Mashy aa2f34c64b tone down highlighted item intensity white -> silver 2019-11-24 12:36:31 +10:00
Mashy 775d902184 always show itemUnequip in info pane 2019-11-24 12:36:22 +10:00
Mashy 4e9edd241c unselect equipped skills & specs 2019-11-24 12:14:56 +10:00
Mashy 1b760a2893 fade invalid combo selections 2019-11-24 11:51:02 +10:00
Mashy 024637c65d disable store drag 2019-11-24 10:49:57 +10:00
Mashy e702e3fdd1 vbox border width 2019-11-23 21:17:56 +10:00
Mashy 16af4da249 move combiner into info (clear buy/combine) on combo hover 2019-11-23 21:05:17 +10:00
Mashy 754f3e0025 length clarify 2019-11-23 20:27:11 +10:00
Mashy f0ea19940f stash length fix (buy 3 item full combo from vbox) 2019-11-23 20:26:45 +10:00
Mashy 8641e74f9b fix combo preview 2019-11-23 20:24:15 +10:00
Mashy b9e4eca8cf vbox info always what selected prio full combo > bases > colour 2019-11-23 19:53:06 +10:00
Mashy 9b6bf4442e default button styling 60% width 2019-11-23 17:20:43 +10:00
Mashy 34f790caa3 moved combiner wip 2019-11-23 17:03:04 +10:00
Mashy cfeac949e0 Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize 2019-11-22 15:57:57 +10:00
Mashy bdf3244f58 border width 0.2 -> 0.1 2019-11-22 15:57:15 +10:00
Mashy b42c4e76e7 Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize 2019-11-22 15:47:46 +10:00
Mashy 637d3e5be8 combiner new line 2019-11-22 15:46:49 +10:00
Mashy b5ab43a18a fix game phase for small phones 2019-11-22 15:19:22 +10:00
Mashy af803efe4f targetting arrows for mobile 2019-11-22 15:02:42 +10:00
Mashy 8e73dcd92c game bottom margin, targetting arrow start / end hotfix 2019-11-22 14:34:48 +10:00
Mashy 5f2ee673b2 mobile avatar 2019-11-22 12:52:23 +10:00
Mashy 672644514d 1150px text size breakpoint 2019-11-22 10:35:17 +10:00
Mashy 69be938e76 shop / vbox -> store 2019-11-22 10:34:50 +10:00
Mashy fba4627bf1 fixed combo list width 2019-11-22 10:14:36 +10:00
Mashy a353dcca95 inventory -> stash 2019-11-22 10:06:39 +10:00
Mashy 945f0828c1 combo mouseover event 2019-11-22 09:59:35 +10:00
Mashy b5ade7f012 combo preview styling 2019-11-22 09:56:29 +10:00
Mashy 843c1c6bbe combo preview wip 2019-11-22 01:17:45 +10:00
Mashy 9cd656a99f skill button size 2019-11-22 00:39:35 +10:00
Mashy c650b74ec9 skill button size 2019-11-22 00:39:22 +10:00
Mashy 28585487c6 game phase cooldown new line, mobile styling 2019-11-22 00:23:53 +10:00
Mashy 0722b194b0 misc styling (actual commit) 2019-11-22 00:18:17 +10:00
Mashy 4d3a837d47 misc styling 2019-11-22 00:17:50 +10:00
Mashy a3376fb8d2 fix mobile game phase 2019-11-21 18:05:46 +10:00
Mashy 8e83d0aa0b instance cleanup 2019-11-21 16:55:04 +10:00
Mashy 05112fbf7e remove instance mobile style file 2019-11-21 16:31:19 +10:00
Mashy 54743c67ba styling 2019-11-21 15:57:25 +10:00
Mashy 85592b1516 breakout combiner / inv / store into separate files 2019-11-21 15:02:07 +10:00
Mashy 33420e4231 default button padding (was 6px default) on chrome 2019-11-21 14:22:05 +10:00
Mashy 1735087321 mobile styling 2019-11-21 14:03:59 +10:00
Mashy ef9ef0b604 new layout combiner bottom 2019-11-21 13:19:07 +10:00
Mashy 35c74ee325 buycount bugfix 2019-11-21 11:41:08 +10:00
Mashy a5d778475e fix buycount combo bug 2019-11-21 11:36:06 +10:00
Mashy 7d0018c134 wl cleanup 2019-11-21 11:29:07 +10:00
Mashy 5cb9f6ebd0 wl remove duplicate vbox hoverFn 2019-11-21 11:19:33 +10:00
Mashy 917858174c delete "reclaim" & "vboxHighlight" state variables 2019-11-21 11:10:34 +10:00
Mashy 26c1c49c4e reduce stash size 2019-11-21 10:57:46 +10:00
Mashy 7dc4a3f4f4 vbox rearrange, rework reclaim 2019-11-21 10:42:15 +10:00
Mashy 3dddf4b1a8 wip 2019-11-20 23:07:44 +10:00
Mashy e53983db98 rearrange vbox wip 2019-11-20 21:47:19 +10:00
Mashy b6c90661a7 wl 2019-11-20 20:44:24 +10:00
Mashy eb35bea7c6 Merge branch 'vbox-combine' into develop 2019-11-20 18:47:55 +10:00
Mashy b6553d89c4 tutorial text fix 2019-11-20 18:47:22 +10:00
Mashy 19072926e6 bits check on combine 2019-11-20 16:42:10 +10:00
Mashy 9ee1c166f3 don't set info to colours when combining 2019-11-20 16:38:28 +10:00
Mashy ec8697aba1 combiner / single item buy cost preview 2019-11-20 16:31:25 +10:00