ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,598 Commits 4 Branches 0 Tags
0d08536837102a1d2eff940a19eab1e04ccd7d56
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mashy 58dfc407a8 only highlight first open slot 2019-11-12 18:40:13 +10:00
Mashy 9bcea878ec Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-12 16:42:47 +10:00
Mashy 66263be25f table layout wip 2019-11-12 16:42:33 +10:00
Mashy 01fa0c5137 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-12 15:16:04 +10:00
Mashy af2f145d17 ready through tutorial face off faster 2019-11-12 15:15:29 +10:00
Mashy 6c0457f8fd preview combo when you've selected 3 items 2019-11-12 13:58:48 +10:00
Mashy 4e627fa34b client side disable shop purchase 2019-11-12 12:32:06 +10:00
Mashy c1d4dd3620 clear comboItem error handling 2019-11-12 12:03:17 +10:00
Mashy 27c562d41b preview item combos in table 2019-11-12 11:39:34 +10:00
Mashy d43d89adb2 changelog 2019-11-11 12:40:47 +10:00
Mashy eb51cad036 break line for speed description in game phase 2019-11-11 12:37:14 +10:00
Mashy 1a2d2995cc add "Purified" effect to Purify 2019-11-11 12:34:14 +10:00
Mashy 8eaa3dc1c0 amplify no longer increases green power 2019-11-11 12:09:33 +10:00
Mashy d77dd00e01 add skill to removal event 2019-11-11 12:07:15 +10:00
Mashy ab7625def0 purge / purify removes all effects 2019-11-11 11:58:29 +10:00
Mashy 6f453c45fc fix demo animation issue 2019-11-10 21:50:25 +10:00
Mashy 6fdff259ec host changelog 2019-11-10 11:21:50 +10:00
Mashy ae48b07da8 Merge tag '1.8.2' into develop 
1.8.2
 2019-11-10 08:25:39 +10:00
Mashy e7fe53e79f Merge branch 'release/1.8.2' 2019-11-10 08:25:17 +10:00
Mashy 19a1e799c5 changelog 2019-11-10 08:24:19 +10:00
Mashy 7acf060093 1.8.2 2019-11-10 08:13:42 +10:00
Mashy 4c0a9088a1 fix reshape available mtx bug 2019-11-09 15:57:32 +10:00
Mashy dffb4e7221 Merge tag '1.8.1' into develop 
1.8.1
 2019-11-09 13:53:40 +10:00
Mashy 7e1a9d8585 Merge branch 'release/1.8.1' 2019-11-09 13:53:24 +10:00
Mashy bc289e4e7c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.1 2019-11-09 11:31:40 +10:00
Mashy 634ff99c7d v1.8.1 2019-11-09 11:12:07 +10:00
Mashy 86968e1076 changelog 2019-11-08 13:59:04 +10:00
Mashy 7b054340d4 add ko event back but doing it right 2019-11-08 13:01:28 +10:00
Mashy e540128a94 styling improvements for effect text, move down opp avatars on mobile 2019-11-08 12:09:16 +10:00
Mashy 35062db799 don't send immune events when targetko 2019-11-08 11:57:12 +10:00
Mashy 865abb2366 actually push cd fix 2019-11-08 10:58:32 +10:00
Mashy 0d39a84319 skills don't go on cd if they're not really *cast* 2019-11-08 10:57:59 +10:00
Mashy 34598178ca Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-08 10:33:07 +10:00
Mashy 879564ef02 removed before pax changelog mess, cdr line 2019-11-08 10:31:01 +10:00
Mashy 542a0916ef tidy up test 2019-11-08 10:04:26 +10:00
Mashy a4b0fc0c4f Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-08 09:59:21 +10:00
Mashy 905693a415 sleep test 2019-11-08 09:58:51 +10:00
Mashy ff8e3aaa71 more changelog 2019-11-07 19:11:32 +10:00
Mashy 84d00357c3 changelog 2019-11-07 19:06:17 +10:00
Mashy 4514d6c0c2 link rework, description bg 2019-11-07 19:03:36 +10:00
Mashy bbfeb22a3f fix reflect rotation 2019-11-07 18:15:21 +10:00
Mashy 51ca41b218 background color for resolving-skill 2019-11-07 17:52:07 +10:00
Mashy 4cbeab19df unlock game construct size 2019-11-07 17:44:27 +10:00
Mashy bec998ae51 no more NoStages or '' event 2019-11-07 13:24:48 +10:00
Mashy 4173fb2385 descriptions, recharge invert fix 2019-11-07 13:06:19 +10:00
Mashy 558e3be124 invert recharge, fix recharge border 2019-11-07 12:25:13 +10:00
Mashy e01de8273e rework recharge return into vec 2019-11-07 11:34:19 +10:00
Mashy 241467ec48 cleaning up ugly recharge code 2019-11-07 11:23:08 +10:00
Mashy 2792061186 rearrange worklog 2019-11-07 10:32:29 +10:00
Mashy f7b86337d5 changelog 2019-11-07 10:17:31 +10:00
Mashy e90320cc30 Merge branch 'text-background' into develop 2019-11-07 10:09:32 +10:00
Mashy a220529ac7 Merge branch 'release/1.8.0' into develop 2019-11-07 10:09:24 +10:00
Mashy efcc437985 ruin deals dmg to each construct and reduce cd 2019-11-07 10:08:25 +10:00
Mashy e18356a554 text background 2019-11-06 19:02:15 +10:00
Mashy 4b6f3becd2 changelogs 2019-11-06 17:14:20 +10:00
Mashy 9e5bfea0ce remove decay cd, reduce banish cd 2019-11-06 17:11:44 +10:00
Mashy b4a52576d2 hastestrike / hybridblast + triggers (Attack no longer triggers) 2019-11-06 17:08:31 +10:00
Mashy b737d91f58 Amplify increases greenpower 2019-11-06 17:04:40 +10:00
Mashy ec964de5f0 other key index 2019-11-06 16:20:22 +10:00
Mashy 493aee4df8 index bound fix 2019-11-06 16:14:03 +10:00
Mashy 1902c725ba Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 16:04:06 +10:00
Mashy 4cc42e305c combiner fixes 2019-11-06 16:03:39 +10:00
Mashy b3ba8825e4 absorb changes 2019-11-06 13:10:00 +10:00