Commit graph

1272 commits

Author SHA1 Message Date
fb780ae4c2 Merge branch 'master' into equip-items-in-character-sheet
now using cleaned up template
2021-01-03 21:14:11 +01:00
0721555c91 Merge branch 'adjust-licensing' into 'master'
adjust licensing

See merge request dungeonslayers/ds4!13
2021-01-03 16:54:36 +01:00
cc9a133ebe extract path to official assets in scss variable 2021-01-03 16:52:51 +01:00
1c61a5d54d adjust README 2021-01-03 16:40:29 +01:00
c2124dec31 Add email addresses in package.json 2021-01-03 16:38:33 +01:00
c26e4bab9f Changes as per review.
Missing:
 - Open discussion on "test value" renames
 - docs
 - open discussion on last-die-handling
2021-01-03 15:08:38 +01:00
f98da0cd99 Apply 2 suggestion(s) to 2 file(s) 2021-01-03 14:49:21 +01:00
41bd770e16 Merge branch '018_item_list_refactoring' into 'master'
018 item list refactoring

See merge request dungeonslayers/ds4!17
2021-01-03 14:43:34 +01:00
c9b41e2d3f renamed item list templates
More precise names for:
- item overview list template for actor sheet
- inline templates in item overview list template
2021-01-03 00:08:21 +01:00
aaa10d7469 Add slaying dice behaviour. 2021-01-02 16:40:30 +01:00
55beeb92c9 Implement swapping edge case, restructure sources. 2021-01-02 16:12:16 +01:00
3f6f9f795f Additional tests for dice selection. 2021-01-02 13:55:18 +01:00
00f7e30b41 Fix option parsing for rolls. 2021-01-02 13:54:59 +01:00
75301b2c56 Bound to fail: Add slaying dice options and tests, no impl. 2021-01-02 13:16:08 +01:00
8ca93fc9c9 Ease dice mocking. 2021-01-02 13:06:32 +01:00
6fe95d10db refactored items list to use handlebars partials
Additions:
 - added flexnowrap CSS class -> no strange wrapping of item lines

Changes:
- reduced most of the non-maintainable HTML-code repitition
- made item list entries as flat as possible
2021-01-02 01:01:41 +01:00
f52a491f73 swapped owner and equipped in item desc 2021-01-01 21:24:13 +01:00
0e282b4c6e some minor improvements to side-properties style
- checkboxes now properly left-aligned
- adaptive width of side-properties: take minimum width now
- side properties are aligned now in any case (each is a grid)
2021-01-01 21:21:22 +01:00
d8423ce364 data binding for owned item properties
Additions:
- now also text, number, and range input fields of owned items can
  be bound to HTML (input) elements of the char sheet

Changes:
- moved prototype handle for checkboxes to own function
- replaced some static HTML elements in item list with input fields
- item-num-val HTML elements (e.g. item quantity) now have a max-width
2021-01-01 19:26:52 +01:00
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