Commit graph

1653 commits

Author SHA1 Message Date
5d83e26e81 Merge branch 'master' into equip-items-in-character-sheet 2020-12-31 16:52:20 +01:00
88f821c7aa Merge branch '012_equipped_flag' into 'master'
Equipped flag shown in item sheet

See merge request dungeonslayers/ds4!15
2020-12-31 16:37:21 +01:00
80e6fd26ae Apply 1 suggestion(s) to 1 file(s) 2020-12-31 16:35:41 +01:00
c2c0b63b9c Merge branch 'master' into 012_equipped_flag 2020-12-31 15:07:11 +01:00
fec7a2a735 fix typo 2020-12-31 12:22:15 +01:00
62e96641b9 remove unnecessary imports 2020-12-31 12:21:24 +01:00
61213d399e use getOwnedItem instead of getEmbeddedEntity 2020-12-31 12:20:32 +01:00
6fac2c597f make equip icon for items clickable in item list in character sheet 2020-12-31 12:10:59 +01:00
960b5a950a adjust licensing 2020-12-31 05:02:38 +01:00
cba20e47e5 Merge branch '007-rollsLib' into 'master'
Basic Roll library

Closes #7

See merge request dungeonslayers/ds4!9
2020-12-31 02:31:20 +01:00
c76c2c23c3 Fix jasmine imports/symbol visibility. 2020-12-31 02:29:27 +01:00
6b18e720a1 Additional tests and features as per Request. 2020-12-31 02:27:21 +01:00
bf39f35504 Merge remote-tracking branch 'origin/master' into 007-rollsLib 2020-12-31 01:36:00 +01:00
25ce41bf53 Merge branch '001-add-combat-values' into 'master'
Add combat values to character  sheet

Closes #1

See merge request dungeonslayers/ds4!12
2020-12-31 01:35:31 +01:00
9cd430a229 improve scss of character values 2020-12-31 01:33:59 +01:00
445febf478 localized "not owned" hint 2020-12-31 01:18:50 +01:00
29d34daa9a added equipped and owner to item sheet
Additions:
- added equipped checkbox to item sheet
- added item owner to item properties list
- added some translations
- added some TODOs

Changes:
- item properties owner, equipped, quantity, storageLocation
  are only shown if item is owned by an actor
- moved item properties price and availability
  to details tab
- shortened ItemEquipped translation
- added item.actor and item.isOwned property values
  to data returned from DS4ItemSheet.getData
  (properties aren't accessible in Handlebars)
2020-12-31 01:17:52 +01:00
b569e5488e Add test for multiple rolls with min/max modifiers 2020-12-31 00:52:59 +01:00
c315742412 Add tests for standard mutli dice rolls. 2020-12-31 00:47:31 +01:00
0d2af1ae00 Add combat values to character sheet 2020-12-31 00:32:17 +01:00
3526e6ab99 Restructure single-dice tests. 2020-12-30 23:58:01 +01:00
dcf60ef59e Merge remote-tracking branch 'origin/master' into 007-rollsLib 2020-12-30 23:57:00 +01:00
7f98d581b6 Merge branch 'autoformat-json-and-scss' into 'master'
Autoformat json and scss

See merge request dungeonslayers/ds4!11
2020-12-30 23:09:01 +01:00
9ed1b7ec84 add command to format all sources (except .hbs) 2020-12-30 23:05:57 +01:00
b3c89b4d32 Add missing cases for test <20. 2020-12-30 23:03:08 +01:00
2e7197a0a2 add auto formatting for .scss and .json files 2020-12-30 23:00:06 +01:00
4209b8eb14 Add 'run'. 2020-12-30 22:46:01 +01:00
c5fe9d6963 Create explicit ci test task. 2020-12-30 22:41:55 +01:00
df7915790b Add test result report. 2020-12-30 22:37:34 +01:00
02214b507e Remove now obsolete test preScript. 2020-12-30 22:24:12 +01:00
71a82e94a7 Merge remote-tracking branch 'origin/master' into 007-rollsLib 2020-12-30 22:20:51 +01:00
2178e745bc Add additional single-roll tests. 2020-12-30 22:19:36 +01:00
410cea05c5 Merge branch 'improve-pipeline' into 'master'
Improve caching of node_modules in ci pipeline

See merge request dungeonslayers/ds4!10
2020-12-30 22:07:59 +01:00
cd581a55ce remove unnecessary comment 2020-12-30 22:04:12 +01:00
6c6407f124 improve node_modules caching 2020-12-30 21:51:09 +01:00
8d274ed830 Ruhu, Cleanups! 2020-12-30 21:50:12 +01:00
4432092930 Merge branch 'basic-data-in-character-sheet' into 'master'
Character sheet has editable basic character data

See merge request dungeonslayers/ds4!7
2020-12-30 21:46:05 +01:00
b56d58dd52 Apply 1 suggestion(s) to 1 file(s) 2020-12-30 21:34:12 +01:00
8acd081384 Apply 1 suggestion(s) to 1 file(s) 2020-12-30 21:34:09 +01:00
1c0ca4ff47 Fix YAML error. 2020-12-30 21:31:35 +01:00
0522f55f9d Add tests to CI runner. 2020-12-30 21:30:31 +01:00
e0b65ca061 Make tests and implementation interact. 2020-12-30 21:28:22 +01:00
fd5bad3c3e add attributes and traits to character sheet 2020-12-30 19:39:16 +01:00
7089178a0d Add recom. plugins. 2020-12-30 17:50:36 +01:00
7800f0af8f Add recommendet plugins, fix lint stuff. 2020-12-30 17:50:01 +01:00
5d5c7efce0 add original icons with transparency 2020-12-30 15:28:22 +01:00
0002493379 fix typo 2020-12-30 15:03:24 +01:00
e7219ab81e add base info to character sheet 2020-12-30 15:02:21 +01:00
59fb033db8 adjust character data to consist of basic character data 2020-12-30 15:01:17 +01:00
589a3c87ce Merge branch '004_equipment_tracking' into 'master'
Icons and abbreviations in items list

See merge request dungeonslayers/ds4!8
2020-12-30 14:50:36 +01:00