Commit graph

475 commits

Author SHA1 Message Date
TJ
9408903c45 Add preparation key to 2 force powers 2020-12-14 16:23:58 -06:00
CK
96f68e119d
Merge pull request #70 from unrealkakeman89/Develop
Develop
2020-12-14 13:05:33 -05:00
CK
07933f0483
Delete class-features-exiles.db 2020-12-14 13:05:19 -05:00
Mike Magarino
8df3c99e20 More testing 2020-12-13 12:25:22 -05:00
CK
e9436b42e4
Merge pull request #69 from Cyr-/armor-fixes
Fixes to align armor.db file with API
2020-12-12 11:13:25 -05:00
CK
b8c0e33102
Merge pull request #68 from unrealkakeman89/professorbunbury-sw5e
Updates to newSheet character.js
2020-12-12 11:12:59 -05:00
TJ
8a2aa82217 Fixes to align armor.db file with API 2020-12-12 10:07:55 -06:00
Mike Magarino
750aa1875f More testing 2020-12-11 18:10:50 -05:00
Professor Bunbury
707a765906
Updates to newSheet character.js 2020-12-11 14:12:53 -05:00
Professor Bunbury
7d1f305cc5 Updates to newSheet character.js 2020-12-11 14:09:38 -05:00
CK
01b4f0db58
Merge pull request #67 from unrealkakeman89/professorbunbury-sw5e
Updates to DAE, Archetypes, Backgrounds, Classes, Species, CSS/LESS, …
2020-12-11 13:40:58 -05:00
CK
b383a5a382
Merge branch 'Develop' into professorbunbury-sw5e 2020-12-11 13:40:18 -05:00
Professor Bunbury
14e9b0c341 Updates to DAE, Archetypes, Backgrounds, Classes, Species, CSS/LESS, etc.
What the subject line said.
2020-12-11 13:23:21 -05:00
ellimist25
ad038b8b03 Temporary fix on leveling 2020-12-11 08:51:20 -05:00
Mike Magarino
3d7c24ca17 Temp - everything is broken 2020-12-10 18:02:05 -05:00
CK
d679d79e99
Delete class-features-exiles.db 2020-12-10 13:07:24 -05:00
Kakeman89
dfc6beac9f Update classfeatures.db 2020-12-10 13:06:47 -05:00
CK
e5baac4f19
Merge pull request #66 from ExileofBrokenSky/ExileOfBrokenSky
Update class-features-exiles.db
2020-12-10 13:03:05 -05:00
Michael Burgess
90b045b575 Update class-features-exiles.db
Added Consular: Way of Tutelage, and Guardian: Vonil/Ishu
2020-12-10 12:26:46 -05:00
Mike Magarino
a291d0c909 Skills and proficiencies done. Class & lvl bump broken. 2020-12-09 21:39:51 -05:00
Mike Magarino
9315047183 Fixed typo 2020-12-09 09:32:09 -05:00
Mike Magarino
58c1548b81 Merging with upsteam/master 2020-12-09 09:31:30 -05:00
Mike Magarino
852309c973 Merging with upsteam/master 2020-12-09 09:30:54 -05:00
Mike Magarino
f9a59bb7b9 v1 of import is working. 2020-12-09 09:17:05 -05:00
Mike Magarino
892be9986e Added Dialog.
Added the Dialog. However, been unable to get json upload to work. Will change my method to use a textarea input instead.
2020-12-09 00:52:36 -05:00
CK
2c545a2ea1
Merge pull request #65 from Cyr-/midi-qol-stretched-image
Midi QOL stretched image in chat message fix
2020-12-08 17:39:20 -05:00
TJ
d0adca6f93 Merge remote-tracking branch 'upstream/Develop' into midi-qol-stretched-image 2020-12-07 21:13:05 -06:00
TJ
de69028910 Added a css fix to correctly size Midi QOL chat images 2020-12-07 21:11:02 -06:00
CK
22a9504522
Merge pull request #64 from Cyr-/add-unarmed-strike
Add unarmed strike
2020-12-07 14:14:28 -05:00
TJ
0e21018c0a Add unarmed strike 2020-12-07 12:41:41 -06:00
TJ
b45adbd67c
Merge pull request #1 from unrealkakeman89/Develop
Develop
2020-12-07 12:40:00 -06:00
CK
dd4de90bc0
Merge pull request #63 from Cyr-/character-sheet-fighting-styles
Added section for fighting styles to new character sheet
2020-12-05 20:02:05 -05:00
CK
cda0516b97
Merge pull request #62 from Cyr-/Develop
Fix for melee weapon ranges
2020-12-05 20:01:50 -05:00
TJ
24f904d9ce Minor whitespace fix 2020-12-05 17:08:43 -06:00
TJ
aa38f26d2e Added section for fighting styles to new character sheet 2020-12-05 17:05:36 -06:00
TJ
5dfc3dae7d Revert "Added section for fighting styles to new character sheet"
This reverts commit d54597d3be.
2020-12-05 16:53:51 -06:00
TJ
d54597d3be Added section for fighting styles to new character sheet 2020-12-05 16:52:48 -06:00
TJ
0c980346bc Fix for melee weapon ranges 2020-12-05 15:37:37 -06:00
CK
6155d602ef
Merge pull request #61 from Cyr-/Develop
Added new weapons from player's handbook
2020-12-04 18:23:03 -05:00
TJ
f9e1bf3ab2 Set attack bonus to 0 2020-12-03 23:47:08 -06:00
TJ
ff0f26dc45 Use ints for ranges 2020-12-03 23:41:26 -06:00
TJ
2d2b63b352 Added new weapons from player's handbook 2020-12-03 23:23:55 -06:00
CK
e74de93825
Merge pull request #60 from ExileofBrokenSky/ExileOfBrokenSky
99% of archetype class features done
2020-12-03 17:28:06 -05:00
Michael Burgess
1a85c3df60 Update class-features-exiles.db
Added all scout and sentinel archtypes, but not the as of yet brand new guardian and consular archtypes with human companions.
2020-12-03 15:26:17 -05:00
CK
770f1650d3
Merge pull request #59 from unrealkakeman89/Develop
Develop
2020-12-03 09:36:58 -05:00
Kakeman89
3d1eb17edc Merge branch 'master' into Develop 2020-12-03 09:36:44 -05:00
CK
e2520833e1
Update classFeatures.js 2020-12-03 09:27:39 -05:00
CK
a5cb069075
Update system.json 2020-12-02 09:53:47 -05:00
CK
325e6c9802
Merge pull request #58 from unrealkakeman89/cbnathanael
fixed inventory and favorites dragging to macro bar
2020-12-02 09:36:04 -05:00
Nathanael Phillips
601cbd1a69 fixed inventory and favorites dragging to macro bar 2020-12-02 07:18:08 -07:00