Commit graph

310 commits

Author SHA1 Message Date
bca31af08a Merge branch '48-add-spell-category-none' into 'master'
add spell category none

Closes #48

See merge request dungeonslayers/ds4!48
2021-01-10 21:09:39 +01:00
9bea9c63cd add spell category none 2021-01-10 21:04:18 +01:00
bd2311cce0 Merge branch '046-test-that-localization-files-have-same-keys' into 'master'
Add test that english and german localization files have same keys

Closes #46

See merge request dungeonslayers/ds4!46
2021-01-10 17:06:06 +01:00
c2ad8f7fe1 add test that english and german localization files have same keys 2021-01-10 03:07:08 +01:00
0a938bc287 Merge branch '047-error-at-encounter-start' into 'master'
Add initiative formula

Closes #47

See merge request dungeonslayers/ds4!45
2021-01-10 01:52:58 +01:00
Max Tharr
6db1d48033 Add initiative formula 2021-01-10 01:51:11 +01:00
0771bf7ce8 Merge branch '015-spells' into 'master'
Resolve "Track Spells in character sheet"

Closes #15

See merge request dungeonslayers/ds4!44
2021-01-10 00:24:53 +01:00
0eb447d279 added German localization for spells
- added missing German localizations
- fixed some localizations
- renamed targetedSpell -> targetedSpellcasting for consistency
2021-01-10 00:30:51 +01:00
18a4e2005a added German translation for spell stuff 2021-01-10 00:05:29 +01:00
c1f77e1a66 Merge branch 'master' into 015-spells 2021-01-09 23:44:48 +01:00
884327b156 added spell tab and sorted tabs 2021-01-09 23:39:35 +01:00
5d58803256 Merge branch 'fix-width-of-actorsheet' into 'master'
fix actor sheet

See merge request dungeonslayers/ds4!41
2021-01-09 22:36:47 +01:00
ed095dcc84 fix actor sheet 2021-01-09 22:30:26 +01:00
0c6ec9c7dd Merge branch '41-german-translation' into 'master'
Resolve "Create German Translation"

Closes #41

See merge request dungeonslayers/ds4!40
2021-01-09 21:56:10 +01:00
349a767de6 Merge remote-tracking branch 'origin/master' into 41-german-translation 2021-01-09 21:54:00 +01:00
54e334cff5 apply review suggestions 2021-01-09 21:41:41 +01:00
57906a42a8 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:34:22 +01:00
c225cae087 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:34:10 +01:00
2af3e6106b Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:34:02 +01:00
e2b7b390a8 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:33:48 +01:00
92d7d2b8bf Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:33:38 +01:00
510e46d96a Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:32:20 +01:00
df7c7efa50 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:32:01 +01:00
2f6b89a0e1 use shorter storage location 2021-01-09 20:43:05 +01:00
188eb6c1d2 add german translation 2021-01-09 20:36:34 +01:00
41e5ca25a3 Merge branch '044-proper-release-process' into 'master'
Resolve "Proper release process"

Closes #44

See merge request dungeonslayers/ds4!39
2021-01-09 19:40:25 +01:00
fe4acd2d9d only do releases on master 2021-01-09 19:06:26 +01:00
8856c30165 move technical stuff to before_script 2021-01-09 19:01:22 +01:00
e735ecee09 actually release minor/major version when attemtpting to do so 2021-01-09 18:55:53 +01:00
e2d198134e enable push 2021-01-09 18:49:05 +01:00
8301fb17fb add minor and major release jobs 2021-01-09 18:47:20 +01:00
e99906a18a update package-lock.json in gulp task 2021-01-09 18:40:52 +01:00
f5d52825e8 actually show diff 2021-01-09 18:34:30 +01:00
9303dcf1f2 show git diff 2021-01-09 18:29:30 +01:00
7d04ad2309 added spell sheet; reverted side-prop style change 2021-01-09 18:26:17 +01:00
75e21fcf5f fix npm run updateManifest 2021-01-09 18:25:57 +01:00
4de9d42ee3 added spell cooldownDuration and more localization 2021-01-09 18:25:30 +01:00
0400db2964 fix jq installation 2021-01-09 18:23:56 +01:00
a303296828 description and body templ accept partial-block 2021-01-09 18:23:25 +01:00
26ee1213a9 add release-patch job 2021-01-09 18:20:23 +01:00
33a11e16ac add proper gulp task to update version 2021-01-09 18:08:24 +01:00
4b203375dd wip: create german translation 2021-01-09 16:14:25 +01:00
090aeab75f added type definitions and translations for spells 2021-01-09 14:26:48 +01:00
85d4384a3c Merge branch '040-dynamic-list-headers' into 'master'
implemented dynamic headers of item lists

Closes #40

See merge request dungeonslayers/ds4!37
2021-01-09 11:56:35 +01:00
af9fa47fef Merge branch 'master' into 040-dynamic-list-headers 2021-01-09 12:02:36 +01:00
e07c784853 Merge branch 'add-resource-group' into 'master'
add resource group to deploy job

See merge request dungeonslayers/ds4!38
2021-01-09 01:13:49 +01:00
dc2d099565 implemented dynamic headers of item lists 2021-01-09 01:11:55 +01:00
c104e7d7ff add resource group to deploy job 2021-01-09 01:10:26 +01:00
9d58388c5f Merge branch 'master' into 022-languages 2021-01-09 00:05:36 +01:00
14aa77ddfb Merge branch '022-languages' into 'master'
Resolve "Track Languages in Character Sheet"

Closes #22

See merge request dungeonslayers/ds4!35
2021-01-09 00:02:52 +01:00