ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,669 Commits 4 Branches 0 Tags
4e9edd241c95c7bb5fbb45b139a33c8a1d767df1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Mashy eb3d42ea58 validVboxSelect for vbox and inventory 2019-11-20 15:59:03 +10:00
Mashy b570bfaad0 vbox selecting 2019-11-20 13:55:54 +10:00
Mashy af99883ced remove combiner, vboxSelected fields "shopSelect & stashSelect" 2019-11-20 13:45:59 +10:00
Mashy e35c688cff Combine vboxselect and combiner. Remove itemEquip and dblclick. 2019-11-20 13:24:57 +10:00
Mashy 10d3f821e3 worklog 2019-11-20 09:13:17 +10:00
Mashy 52d9367e3c don't clear vbox selected on inventory click 2019-11-19 23:11:18 +10:00
Mashy 55f0ceeeec worklog 2019-11-19 23:01:09 +10:00
Mashy 73b6d0f321 clear selected items on new selections, reclaim doesn't turn combine red 2019-11-19 22:13:00 +10:00
Mashy 5c0a76b9a6 clear vboxselect and combiner on unequip select && highlight unequip 2019-11-19 21:40:14 +10:00
Mashy 2a82666498 check for combine overflow 2019-11-19 13:17:33 +10:00
Mashy 2ba8a63d81 buy/combine from vbox wip 2019-11-19 13:09:50 +10:00
Mashy f2add9a836 vbox bits check 2019-11-19 12:08:52 +10:00
Mashy 604a604c01 vbox selected more wip 2019-11-19 12:06:08 +10:00
Mashy 33152e54d5 select vbox multiple wip 2019-11-19 11:35:30 +10:00
Mashy 0d08536837 add vbox indicies as a combine param 2019-11-19 10:35:45 +10:00
Mashy f850a8806b mouseover 2019-11-19 10:30:00 +10:00
Mashy 2c14cfc494 lock info when vbox / inv items selected 2019-11-18 23:58:48 +10:00
Mashy 5fdabc0f21 don't compile logger on windows 2019-11-18 23:00:58 +10:00
Mashy f66be37f8a unselect vbox item 2019-11-17 22:00:08 +10:00
Mashy 424c78b30d remove focus highlighting 2019-11-17 21:53:59 +10:00
Mashy 21f66b105e worklog 2019-11-17 21:52:29 +10:00
Mashy 3346d745e5 Merge tag '1.8.5' into develop 
1.8.5
 2019-11-16 17:07:17 +10:00
Mashy 4d8ca375d1 Merge branch 'release/1.8.5' 2019-11-16 17:07:10 +10:00
Mashy c799093a94 +x client 2019-11-16 17:06:45 +10:00
Mashy 7ddfa2dcd2 1.8.5 2019-11-16 16:56:44 +10:00
Mashy f1072ec7c8 changelog 2019-11-16 16:55:48 +10:00
Mashy fbae8f71eb only send ko event if theres damage 2019-11-15 11:22:05 +10:00
Mashy 9acb2229a8 line endings 2019-11-14 23:31:09 +10:00
Mashy 2b3b002a0e 1.8.4 html 2019-11-14 23:28:49 +10:00
Mashy 8fab03650a changelog 2019-11-14 23:11:34 +10:00
Mashy 6dd10f4777 Merge tag '1.8.4' into develop 
1.8.4
 2019-11-14 23:10:29 +10:00
Mashy 9418e2cd41 Merge branch 'release/1.8.4' 2019-11-14 23:10:19 +10:00
Mashy 2f9c608e6b changelog 2019-11-14 21:26:02 +10:00
Mashy 3aafbefa7e changelog 2019-11-14 21:24:32 +10:00
Mashy 94b6f6b18f 1.8.4 2019-11-14 21:23:52 +10:00
Mashy 496c57ea77 hotfix tutorial bits stage bug 2019-11-14 21:21:49 +10:00
Mashy 44ae33d8ea log 2019-11-13 21:15:46 +10:00
Mashy 576244a541 version 2019-11-13 19:10:54 +10:00
Mashy 726981a8de changelog 2019-11-13 19:09:21 +10:00
Mashy b6ce6a5277 post_resolve 2019-11-13 19:05:10 +10:00
Mashy c99f189c69 better duplicate ko check 2019-11-13 19:04:25 +10:00
Mashy 7d253ab65d changelog 2019-11-13 16:14:27 +10:00
Mashy 7e79e18107 Merge branch 'round-bits' into develop 2019-11-13 16:11:21 +10:00
Mashy 729e48cee4 fix multiple ko event from cast 2019-11-13 16:08:24 +10:00
Mashy bb765b86e6 add back line height, remove vbox lineheight 2019-11-13 13:46:41 +10:00
Mashy 6305a96875 fix vbox banging around when you buy stuff / reclaim 2019-11-13 13:35:15 +10:00
Mashy 7f8679171c debuff combo order 2019-11-13 11:09:34 +10:00
Mashy 9da45e1bee 30 bits per round 2019-11-13 11:02:14 +10:00
Mashy f5978e90bd changelog 2019-11-13 10:58:57 +10:00
Mashy ef4d3e57dc big info text, bring back hover 2019-11-12 22:29:59 +10:00
Mashy e31acf96c6 group colours together in table, fix the vertical spacing issue 2019-11-12 22:01:56 +10:00