Commit graph

1193 commits

Author SHA1 Message Date
hppeng
59f28f6956 HOTFIX: fix spellparts that don't already exist 2022-06-30 20:35:34 -07:00
hppeng
19134d3ab1 Merge branch 'atree' into UI_test 2022-06-30 20:15:17 -07:00
hppeng
8e3a35b16a Small modification (Show Tree -> Edit Abilities)
discussed in PR but not implemented because i'm dense
2022-06-30 20:13:06 -07:00
hppeng-wynn
ad0d665306
Merge pull request #62 from hppeng-wynn/atree_encode
Atree encode
2022-06-30 20:12:32 -07:00
hppeng
08e49a52a7 Add license (why did we not have this) 2022-06-30 09:19:36 -07:00
hppeng
a318756058 Fix converter script, complete warrior tree 2022-06-30 09:05:09 -07:00
hppeng
61172d16d4 Merge branch 'atree-json-fix' into atree_encode 2022-06-30 09:00:07 -07:00
hppeng
a9fc53e044 Update warrior atree json... 2022-06-30 08:58:26 -07:00
hppeng
0976fff43a Working atree encoder and decoder 2022-06-30 08:03:41 -07:00
hppeng
7e40d6a926 Merge branch 'sock_encoding' into atree_encode 2022-06-30 05:40:21 -07:00
hppeng
ffc0d4b9b4 Atree error validation and input combining 2022-06-30 05:27:35 -07:00
ferricles
e9acb79f4b fixed merge conflicts 2022-06-29 20:06:33 -07:00
ferricles
07a018afda prevent active boxes from collapsing to 0 width 2022-06-29 19:20:51 -07:00
hppeng-wynn
6e549e8325
Merge pull request #60 from hppeng-wynn/atree_aggregator
Atree aggregator
2022-06-29 19:18:19 -07:00
ferricles
1ed723f9b5 fixed merge conflict 2022-06-29 16:33:34 -07:00
ferricles
25645300b5 refactoring + removing old comments 2022-06-29 16:28:41 -07:00
hppeng
f1488a4352 Fix some json for warrior (from the bottom up to massive bash) 2022-06-29 00:14:40 -07:00
hppeng
44d3fc996a Merge branch 'atree' into atree_aggregator 2022-06-28 23:26:43 -07:00
hppeng
25102100ae Pull info from abil tree; construct spell objects and render them 2022-06-28 23:23:27 -07:00
hppeng
a42f79afb5 Aggregate ability descriptions and effects....
design pain... just YOLO time... kinda assuming that abilities will only affect one spell majorly..
2022-06-28 12:03:49 -07:00
hppeng
f6bf0875b5 Fix double toggle bug 2022-06-28 11:48:02 -07:00
hppeng
259ffb2395 Begin working on abil merging framework... fix a bunch of mistakes in atree constants 2022-06-28 11:43:35 -07:00
hppeng-wynn
62b01d1ea3
Merge pull request #59 from hppeng-wynn/atree-dynamic-disp
fix: atree img display relatively to parent
2022-06-28 00:41:40 -07:00
reschan
1b721cd810 remove forceful open/hide 2022-06-28 14:28:45 +07:00
reschan
881467cf0b fix: atree img display relatively to parent 2022-06-28 14:10:25 +07:00
reschan
815cbfacd1 accept js atree directly and output usable js file and json 2022-06-28 13:04:18 +07:00
reschan
c5951195fe bump latest change 2022-06-28 13:01:36 +07:00
hppeng
4d3a922bb2 Merge branch 'atree' into atree_aggregator 2022-06-27 22:57:05 -07:00
hppeng-wynn
3c21f9801a
Merge pull request #49 from hppeng-wynn/spell_reformat
Spell reformat
2022-06-27 22:40:35 -07:00
hppeng
f23895ee48 Address PR comments 2022-06-27 22:16:23 -07:00
hppeng
a982756ce6 Merge branch 'atree' into spell_reformat 2022-06-27 22:09:24 -07:00
hppeng-wynn
83b8680e03
Merge pull request #50 from aspiepuppy/atree
Atree
2022-06-27 22:02:47 -07:00
ferricles
8b0fe24482 eliminate repeated appendChild() in construct_AT 2022-06-27 21:33:38 -07:00
aspiepuppy
1a14f230f2 wawa 2022-06-27 22:42:19 -05:00
aspiepuppy
e427532424 wa 2022-06-27 22:41:56 -05:00
ferricles
2db1a3a336 quick documentation + refactoring to add new param for render_AT() 2022-06-27 16:49:21 -07:00
reschan
ebcdbc14fc remove redundant atree data files 2022-06-27 16:53:18 +07:00
reschan
b36b16c49d fix: separate atree ids for each class 2022-06-27 16:23:22 +07:00
hppeng
5106b7b681 HOTFIX: damage multipliers from potion effect not being registered 2022-06-27 01:41:13 -07:00
hppeng
5fde5faacb really minor code cleanup 2022-06-27 01:32:26 -07:00
ferricles
b4172744e1 Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-27 00:09:53 -07:00
ferricles
65c2d39754 atree ID rework started 2022-06-27 00:09:49 -07:00
hppeng
3fb59494d9 Testing healing 2022-06-26 23:54:05 -07:00
hppeng
c7fd1c53f8 Internal spell representation overhaul
Using new (more expressive) schema
Somehow made display code cleaner !!!
2022-06-26 23:42:00 -07:00
hppeng
581891116d Fix a compute graph state update bug (double link), fix powder special display 2022-06-26 20:24:38 -07:00
hppeng
913b5a7c85 Fix guardian angels spell mult 2022-06-26 18:23:07 -07:00
hppeng
8007a80889 Spell schema comment 2022-06-26 18:11:17 -07:00
hppeng
ce44d949d0 Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 16:57:26 -07:00
hppeng
8ff0afa685 Begin atree integration
also don't re-render the entire thing every time something changes -- local updates
2022-06-26 16:49:35 -07:00
ferricles
d5d3f15c27 prevent node unrendering 2022-06-26 11:18:20 -07:00