Commit Graph

159 Commits

Author SHA1 Message Date
Tomáš Heger d4ede93d42 Add a lot of feats. 2020-05-01 00:59:53 +02:00
Tomáš Heger bb23154df8 Merge branch 'master' of https://github.com/canismarko/dungeon-sheets 2020-04-30 11:08:12 +02:00
Mark Wolfman 82ae4dd63e Removed parse_json.py
It was an old remnant from inital development:
https://github.com/canismarko/dungeon-sheets/issues/46
2020-04-30 00:30:40 -05:00
Mark Wolfman fcef8ed0b6 Version bump and included python 3.8 in setup.py file. 2020-04-30 00:13:39 -05:00
Mark Wolfman e2d9bdd99e Added coveralls to the requirements-tests.txt file. 2020-04-30 00:02:07 -05:00
Mark Wolfman 035da4d594 Fixed typo in travis yaml file. 2020-04-29 23:55:40 -05:00
Mark Wolfman a3bb488c23 Updated travis to cover python 3.6-3.8 and integrated with coveralls. 2020-04-29 23:53:50 -05:00
Mark Wolfman a820721fa4 Merge branch 'rkubosz-master' 2020-04-29 23:31:10 -05:00
Mark Wolfman 971946cfd0 Merge branch 'master' of https://github.com/rkubosz/dungeon-sheets into rkubosz-master 2020-04-29 23:30:55 -05:00
Mark Wolfman 6d79cf061b Merge branch 'jeromkiller-master' 2020-04-29 22:09:37 -05:00
Mark Wolfman fbc3dd64e9 Merge branch 'master' of https://github.com/jeromkiller/dungeon-sheets into jeromkiller-master 2020-04-29 22:09:25 -05:00
Tomáš Heger 1e9249efb8 Merge pull request #2 from canismarko/master
Sync with upstream
2020-04-28 22:43:15 +02:00
Mark Wolf e63e602c7b Merge pull request #39 from naviabbot/master
Added Kalashtar Race from Eberron: RFTLW
2020-04-28 12:52:54 -05:00
Mark Wolfman 57f6d30108 Merge branch 'VKerman-spells' 2020-04-28 12:48:46 -05:00
Mark Wolfman 1f04846554 Merge branch 'spells' of https://github.com/VKerman/dungeon-sheets into VKerman-spells 2020-04-28 12:48:27 -05:00
Mark Wolf 3e5cf25291 Merge pull request #47 from geckon/46
Fix syntax error in the regex
2020-04-28 12:25:46 -05:00
Mark Wolf d7e41a41bc Merge pull request #44 from geckon/43
Fix #43, replace ``is not`` with ``!=``
2020-04-28 12:24:07 -05:00
Tomáš Heger 9b7241d4b9 Fix syntax error in the regex (refs #46) 2020-04-26 00:58:20 +02:00
Tomáš Heger 806765bc94 Fix #43: is not -> != 2020-04-26 00:47:14 +02:00
Tomáš Heger 0b81b05be0 Merge pull request #1 from canismarko/master
Sync with upstream
2020-04-16 18:04:39 +02:00
Mark Wolf 6e522fe7f1 Merge pull request #42 from geckon/41_add_pearl_cloak
Add Pearl of Power, Cloak of Protection
2020-04-16 10:51:04 -05:00
Tomáš Heger 283067a25a Add Pearl of Power, Cloak of Protection 2020-04-15 21:38:27 +02:00
Mark Wolf 4a737d25a5 Merge pull request #23 from cemkeylan/master
Typo
2020-04-14 09:19:11 -05:00
Mark Wolf 1186fe7323 Merge pull request #24 from KnightMustard/master
Fix encoding on Windows
2020-04-14 09:18:14 -05:00
Mark Wolf 4f3e06db81 Merge branch 'master' into master 2020-04-14 09:17:55 -05:00
Mark Wolf d7737042af Merge pull request #32 from Tim-Jackins/master
Removed non utf-8 characters and refined features
2020-04-14 09:16:30 -05:00
Joshua Cain 1cbe6b25dc Fixing a few spots where CI failed 2020-03-17 04:00:33 -05:00
Joshua Cain a49d263a66 Added Kalashtar Race from Eberron: RFTLW 2020-03-17 03:49:51 -05:00
tim_jackins 47623409f5 Added id insinuation 2020-02-04 15:33:38 -05:00
tim_jackins cc7cb7327d Added elemental adept 2020-02-04 15:33:24 -05:00
Jack 4131691da1 Added rashemi to races 2020-02-02 13:53:06 -05:00
Robert Kubosz f54baa9436 add missing druid spells 2020-01-17 09:41:28 +01:00
Robert Kubosz dc690b5bf5 add new druid subclass: circle of spores 2020-01-16 21:41:56 +01:00
Robert Kubosz df89508bea fix typo 2020-01-16 20:29:10 +01:00
Robert Kubosz 4dd998501a add Goblin race
This commit adds Goblin race and it's features.
Source: Guildmaster's Guide to Ravnica
2020-01-16 19:35:23 +01:00
Jack 82f3d2588a Removed extra spacing on feature setting 2019-12-21 17:02:24 -05:00
Jack cb0fe1e2d8 Fixing fighting style error 2019-12-21 17:00:46 -05:00
Tim-Jackins 08ed7da59d Removed non utf-8 characters 2019-09-09 12:45:22 -04:00
jerom venneker 9a850526a7 slight change to hobgoblin proficiencies_text 2019-08-13 21:09:49 +02:00
jerom venneker 6fd03fd8fc Merge branch 'monsterRaces' 2019-08-13 20:44:24 +02:00
jerom venneker eb6bc7d591 Added the monster races from volos guide 2019-08-13 20:43:45 +02:00
jerom venneker fe33ac5f80 added death domain as cleric subclass 2019-08-13 19:34:35 +02:00
Preston Rowe a20c4f89cf Fix encoding on Windows 2019-07-30 15:07:00 -04:00
Cem Keylan 5e95fba2e5 Typo 2019-07-28 14:12:16 +03:00
Mark Wolfman 9a49e7cb14 Fixed examples that did not build due to wrong armor. 2019-05-14 14:40:15 -05:00
Mark Wolfman 7ee2d25a9f Merge branch 'bacook17-master' 2019-03-23 17:23:08 -05:00
Mark Wolfman f675c9c96f Merge branch 'master' of https://github.com/bacook17/dungeon-sheets into bacook17-master 2019-03-23 17:16:57 -05:00
Ben Cook 4f6cfde477 added HP roller to GUI 2019-03-21 17:20:08 -04:00
Ben Cook a0993f3b36 Made Entire_Spellbook.pdf for testing 2019-03-21 16:39:45 -04:00
Ben Cook 9f608288cf added ALL spells; can add magic weapons/armor/shields using +X in name 2019-03-21 16:32:18 -04:00