Commit graph

1163 commits

Author SHA1 Message Date
hppeng
e0c91ffabb Merge branch 'atree' into merge-mastery 2022-07-08 21:27:43 -07:00
hppeng-wynn
0e96de76b3
Merge pull request #95 from hppeng-wynn/connector-fix
fix side tri connectors
2022-07-08 21:19:09 -07:00
reschan
c2a41b2e79 remove duplicates 2022-07-09 11:16:44 +07:00
reschan
4434b0969c remove extraneous/debug code 2022-07-09 11:14:38 +07:00
reschan
07c39c0780 fix: multiple transform on an image 2022-07-09 11:13:09 +07:00
reschan
cadd06864a fix: remove connector logic, add lookup table instead 2022-07-09 10:59:45 +07:00
hppeng-wynn
c9117fcebc
Merge pull request #93 from hppeng-wynn/atree-validation-fix
Atree validation fix
2022-07-08 20:51:38 -07:00
hppeng
bb2ea64580 Address PR comment (remove print) 2022-07-08 20:51:01 -07:00
hppeng
e15d947901 Merge branch 'atree' into atree-validation-fix 2022-07-08 20:50:20 -07:00
hppeng
335b8681b6 Misc. mage tree fixes
also merge abilities
2022-07-08 20:47:34 -07:00
hppeng
e58e0fa5fa Merge elemental mastery nodes 2022-07-08 20:31:44 -07:00
hppeng
ed61d3379b HOTFIX: ophanim spellcost (last one for now... do PR... don't be bad) 2022-07-08 20:22:14 -07:00
hppeng
6d61055b7a Fix lightbender consistency 2022-07-08 20:19:24 -07:00
hppeng
f703520ec3 HOTFIX: Mage atree misc. fixes 2022-07-08 20:17:56 -07:00
hppeng
3d0136df60 HOTFIX: move slider for massive bash from bash to bakal's grasp 2022-07-08 19:24:16 -07:00
hppeng
02a5577e35 Fix enraged blow slider and remove prints from damage_calc 2022-07-08 19:19:16 -07:00
hppeng
5e43db7a49 Merge branch 'atree' into atree-validation-fix 2022-07-08 19:13:37 -07:00
hppeng
277899160f Mage spell display reformat
fix it all

also separate flaming uppercut
2022-07-08 19:12:12 -07:00
hppeng
abe9c8a560 Fix flaming uppercut counting in uppercut total 2022-07-08 19:07:15 -07:00
hppeng
eea6a3c6b0 Merge branch 'atree' into atree-mage 2022-07-08 19:07:03 -07:00
hppeng-wynn
3af9f868c5
Merge pull request #87 from hppeng-wynn/atree_active_box
Atree active box
2022-07-08 17:49:54 -07:00
hppeng
7ef6b39de0 Fix credits 2022-07-08 17:49:10 -07:00
hppeng
159aece0c0 Merge branch 'atree' into atree_active_box 2022-07-08 17:44:43 -07:00
hppeng-wynn
bacc98b003
Merge pull request #90 from hppeng-wynn/powder-acc-fix
Fix crafted accessories apparently
2022-07-08 17:43:20 -07:00
hppeng
59e5a3303a HOTFIX: fix thunder converting abilities 2022-07-08 17:42:25 -07:00
hppeng
c5191cfe99 Merge branch 'atree' into atree_active_box 2022-07-08 17:29:40 -07:00
hppeng-wynn
b07d4d2fa5
Merge pull request #88 from hppeng-wynn/basaltic-fix
Basaltic fix
2022-07-08 17:26:43 -07:00
hppeng
5bf0157a69 Mage atree (first ed.) (no display info) 2022-07-08 17:25:18 -07:00
hppeng
22ee9322ef Fix crash if no atree selected 2022-07-08 15:45:24 -07:00
hppeng-wynn
1778d1fabc
Merge pull request #92 from hppeng-wynn/more-items
Update items for wynn2 item changes
2022-07-08 15:43:31 -07:00
hppeng
c3cb9f129d Update items for wynn2 item changes 2022-07-08 15:01:45 -07:00
hppeng
644213e5aa Fix enraged blow slider and remove prints from damage_calc 2022-07-08 14:53:07 -07:00
hppeng
c05eb82e60 Merge in atree_active_box 2022-07-08 14:52:17 -07:00
hppeng
b256213f09 Merge branch 'atree_active_box' into atree-validation-fix 2022-07-08 14:36:16 -07:00
hppeng
75269f9b73 Begin mage atree integration.... pain and suffering... 2022-07-08 01:20:05 -07:00
hppeng
f2f9acff85 Distinguish between hard and soft atree errors 2022-07-08 00:21:21 -07:00
hppeng
adc90821e6 Fix crafted accessories apparently
....
..
stupid
2022-07-07 23:18:58 -07:00
hppeng
f12515a885 Edit credits.txt 2022-07-07 22:54:28 -07:00
hppeng
e6a55afc4c Split up basaltic trap 2022-07-07 22:51:38 -07:00
hppeng
70c117261d Reworked master modifiers; working sliders 2022-07-07 22:28:46 -07:00
hppeng
a4eda17f4e Merge branch 'atree' into atree_active_box 2022-07-07 21:25:27 -07:00
hppeng-wynn
86719b749a
Merge pull request #86 from hppeng-wynn/atree_branch_hotfix
added patch 7 changes for archer on constants
2022-07-07 19:54:22 -07:00
hppeng
b62faddfa4 Fix description for phantom ray, update minified files 2022-07-07 19:53:56 -07:00
hppeng
5b6c957e76 Working scaling abils, sliders not hooked up yet
also fixed burning heart scaling
2022-07-07 19:44:57 -07:00
aspiepuppy
17eb8d2d66 added patch 7 changes for archer on constants 2022-07-07 18:15:16 -05:00
hppeng
a28c75e177 More setup for sliders/raw stat; fix defMultiplier (base def not fixed yet)
we should really unify the multiplicative effect checking -- this is kinda stupid
2022-07-07 16:13:26 -07:00
hppeng
3ff4421de4 Merge branch 'atree' into atree_active_box 2022-07-07 15:34:16 -07:00
hppeng
cdaff5fce9 Fix More Focus base_abil, display sliders 2022-07-07 15:33:00 -07:00
aspiepuppy
049a2b07ea fixed parents for refined gunpowder and decimator 2022-07-07 17:25:19 -05:00
hppeng-wynn
5323ed2286
Merge pull request #81 from hppeng-wynn/atree-damage-debug
Atree damage hotfix
2022-07-07 14:27:40 -07:00