Commit graph

237 commits

Author SHA1 Message Date
supervj
4b7aac7fd5 Structure for Points overhaul 2021-01-27 01:25:46 -05:00
Mike Magarino
abc65220ec skills and multiclass working 2021-01-26 10:11:52 -05:00
Mike Magarino
826f042dbb skills and multiclass working 2021-01-26 10:09:28 -05:00
CK
159680aa55
Merge branch 'Develop' into character-sheet-importer 2021-01-26 09:28:50 -05:00
Mike Magarino
6f90f19ad1 Update characterImporter.js 2021-01-26 02:00:30 -05:00
Mike Magarino
52fd477d39 skills v2 2021-01-26 01:24:16 -05:00
Mike Magarino
f4af3aad45 skills v1 2021-01-26 00:33:21 -05:00
ellimist25
3d5024b0c5 refactored current import 2021-01-25 21:59:05 -05:00
Mike Magarino
90dfc64b0f alpha 2021-01-25 19:22:30 -05:00
Mike Magarino
b38e51b20f skills still not working 2021-01-25 15:32:47 -05:00
Mike Magarino
6384c701e1 add class and level v1 2021-01-25 14:30:31 -05:00
Mike Magarino
cc96d58fa7 skills still broken 2021-01-24 17:19:30 -05:00
Mike Magarino
9742983db0 prior to revert 2021-01-24 17:01:49 -05:00
Mike Magarino
71a99e97a9 Updated formatting 2021-01-24 16:53:56 -05:00
Mike Magarino
ea7a6e063a Merge branch 'master' into character-sheet-importer 2021-01-24 16:34:34 -05:00
Mike Magarino
78d5c0e26b messing around 2021-01-24 16:20:51 -05:00
TJ
1b058f0540 Two ammo display fixes
1. Allow ammunition items to show up in the dropdown picker
2. Don't prompt to consume resources if the consuming object is a blaster
2021-01-22 16:17:49 -06:00
supervj
911d1ce547 Hotfix o 1.2.4 version
Hotfix for 1.2.4 version
2021-01-21 21:46:42 -05:00
supervj
7f75ffc195 Core Update 1.2.3
Core update with 1.2.3 and Recent Dev changes integrated... I hope :)
2021-01-19 22:52:02 -05:00
supervj
184e916811 Reset 2021-01-19 21:47:38 -05:00
TJ
f42fae640b Fix for sheet losing scroll position 2021-01-19 16:34:47 -06:00
CK
fb7a12b244 Merge branch 'Develop' into professorbunbury-sw5e 2021-01-19 12:32:32 -05:00
Professor Bunbury
c1d247f72a Updated template.js to fix Character Sheet Notes problem
Removes notes HTML from new character sheet template to fix text field commas problem.
2021-01-19 12:14:38 -05:00
supervj
9c6bd3873e Update Core 1.2.2
Update core to 1.2.2.  Sheets are broken
2021-01-18 23:49:04 -05:00
TJ
f070d2725c Added new handling for resources/rolling 2021-01-18 16:13:32 -06:00
TJ
e4e755fd68 More fixes to allow further testing 2021-01-04 22:16:56 -06:00
TJ
a597964bc4 Enable display of character sheet 2021-01-04 17:56:28 -06:00
CK
db5c5f4810
Update npc.js
added ..base.js
2021-01-04 17:42:45 -05:00
CK
fb99bfeff6
Merge branch 'Develop' into Develop-VJ 2021-01-04 16:16:01 -05:00
supervj
e6bff40e1b Update Core to 1.2
Update Core to 1.2, pulled from dev 12/10/2020
2021-01-04 15:23:30 -05:00
Professor Bunbury
7dbc48b718 Revert "Revert "Merge branch 'professorbunbury-sw5e' of https://github.com/unrealkakeman89/sw5e into professorbunbury-sw5e""
This reverts commit ad5fc6f6a2.
2020-12-15 18:29:54 -05:00
Professor Bunbury
ad5fc6f6a2 Revert "Merge branch 'professorbunbury-sw5e' of https://github.com/unrealkakeman89/sw5e into professorbunbury-sw5e"
This reverts commit ebd22fb58b, reversing
changes made to 5314eb6637.
2020-12-15 18:28:28 -05:00
Professor Bunbury
ebd22fb58b Merge branch 'professorbunbury-sw5e' of https://github.com/unrealkakeman89/sw5e into professorbunbury-sw5e 2020-12-15 18:23:01 -05:00
Mike Magarino
8df3c99e20 More testing 2020-12-13 12:25:22 -05: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
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
Mike Magarino
a291d0c909 Skills and proficiencies done. Class & lvl bump broken. 2020-12-09 21:39:51 -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
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
CK
e2520833e1
Update classFeatures.js 2020-12-03 09:27:39 -05:00
Nathanael Phillips
601cbd1a69 fixed inventory and favorites dragging to macro bar 2020-12-02 07:18:08 -07:00
Nathanael Phillips
27a53a9361 completed NPC sheet 2020-11-30 09:06:27 -07:00