Commit graph

1181 commits

Author SHA1 Message Date
4196257fd5 add author siggi 2021-01-10 21:51:47 +01:00
e743461ec7 Merge branch 'spell-add-unset' into 'master'
spell add default category

See merge request dungeonslayers/ds4!49
2021-01-10 21:32:29 +01:00
fba05e2d74 Merge branch 'master' into spell-add-unset 2021-01-10 21:22:36 +01:00
bbd4ce7c07 Revert "Try using full ts-node path" 2021-01-10 21:22:27 +01:00
61098b31d6 spell add default category 2021-01-10 21:18:33 +01:00
a2a7dc572c Try using full ts-node path 2021-01-10 21:14:22 +01:00
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
516c04c8de First proper parsing without much "nice-ity". 2021-01-10 21:03:11 +01:00
c10ab44ea9 modifications 2021-01-10 20:40:26 +01:00
85defa7e44 Merge branch 'master' into 037-actor-type-creature 2021-01-10 20:05:28 +01:00
46ec9b0ac8 currency add 2021-01-10 19:33:55 +01:00
45e7400e82 add currency and basic display 2021-01-10 19:32:10 +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
a19a996d1d Display (only!) selection options to the user. 2021-01-10 16:40:11 +01:00
c2ad8f7fe1 add test that english and german localization files have same keys 2021-01-10 03:07:08 +01:00
fc6cf2ef74 Merge branch 'master' into 037-actor-type-creature 2021-01-10 02:37:43 +01:00
0568afc32b Add localization of actor and item type labels 2021-01-10 02:35:48 +01:00
17d0213e62 add basic creature sheet 2021-01-10 02:05:30 +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
d416c14cbd Merge branch 'master' into 037-actor-type-creature 2021-01-10 00:41:20 +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
c94ff4a67a Rudimentary docs. 2021-01-09 23:21:57 +01:00
27c0ddbca1 Make factory usable from Macros.
This does not yet include any modal interface.
2021-01-09 23:14:50 +01:00
bc6930675c localize creature parts of config 2021-01-09 22:55:38 +01:00
b01e0417ee add doc strings to new config objects 2021-01-09 22:54:44 +01:00
6820ce7c00 Add creature actor to config, i18n, template.json, types 2021-01-09 22:51:46 +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