Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-09-10 17:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,458 Commits 14 Branches 0 Tags
32a3859da5fb141ffe2d414595f968226d01faef
Commit Graph
37458 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark 3904e9931f Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	5eShaped/translations/en.json
 2016-06-29 00:33:13 +02:00
Mark a084f00706 fix concentration translations 2016-06-29 00:31:31 +02:00
Phil 2163bfd5f4 Merge pull request #1733 from mlenser/master 
Shaped ammo fix
 2016-06-28 15:48:06 -06:00
Mark 82531d2b08 fix ammo and highest ability name 2016-06-28 23:21:55 +02:00
Mark 81862c19d6 fix ammo and highest ability name 2016-06-28 23:13:54 +02:00
Mark a95c09e9bd fix ammo and highest ability name 2016-06-28 23:08:25 +02:00
Phil 590cfa8948 Merge pull request #1730 from mlenser/master 
Shaped 5.0.4
 2016-06-28 10:54:54 -06:00
Mark 0bb15b14eb version 5.0.4 2016-06-28 17:48:23 +02:00
Mark 408f70c3ea updateDefaultAbility 2016-06-28 17:47:58 +02:00
Mark 485142ec26 toggle attack 2016-06-28 17:45:58 +02:00
Mark ba8dca0077 fix higher level, spell level import, and default ability 2016-06-28 17:42:40 +02:00
Phil Behreberg 4f628b5e64 updating translations 2016-06-27 18:25:34 -06:00
Phil Behreberg 4bdd58041e cleaning up, updating approved.yaml 2016-06-27 18:02:24 -06:00
Phil Behreberg e843648a54 fixing line endings 2016-06-27 17:12:27 -06:00
Phil 85349390de Merge pull request #1729 from mlenser/master 
Shaped 5.0.3 Roll Template Translations
 2016-06-27 17:11:02 -06:00
Phil c2b8908420 Merge pull request #1728 from CoalPoweredPuppet/patch-96 
Mongoose Traveller Robot Update Css
 2016-06-27 17:07:36 -06:00
Phil 8c3ee0ad73 Merge pull request #1727 from CoalPoweredPuppet/patch-95 
Mongoose Traveller Robot Update
 2016-06-27 17:07:29 -06:00
Phil b29140d31e Merge pull request #1726 from CoalPoweredPuppet/patch-94 
d20 Modern Critical Clean Up
 2016-06-27 17:07:17 -06:00
Phil 897babe8a1 Merge pull request #1725 from CoalPoweredPuppet/patch-93 
Update Dark Heresy 2ed
 2016-06-27 17:06:55 -06:00
Phil 1b85d5c505 Merge pull request #1724 from crash-cy/patch-1 
Add Inventory Section
 2016-06-27 17:06:39 -06:00
Phil 54c6d14c6f Merge pull request #1723 from derornos/master 
Update html files
 2016-06-27 17:06:21 -06:00
Phil 7d0354e5e6 Merge pull request #1722 from plutosdad/master 
Pathfinder v0.54
 2016-06-27 17:05:22 -06:00
Phil 0011e2f1f5 Merge pull request #1721 from Rats808/master 
Minor fixes
 2016-06-27 17:03:37 -06:00
Phil 0279ccc51e Merge pull request #1720 from mhglover/master 
Blades in the Dark update
 2016-06-27 17:03:05 -06:00
Phil 4ac2c4365b Merge pull request #1719 from finderski/master 
Raise Damage Fixed
 2016-06-27 16:59:28 -06:00
Phil 09c4be8c28 Merge pull request #1717 from SirTocy/add-new-sheets-fork 
New sheet: M.A.G.U.S. - Új Törvénykönyv
 2016-06-27 16:58:35 -06:00
Phil 820833af84 Merge pull request #1716 from suntzu777/master 
Update of some info
 2016-06-27 16:55:21 -06:00
Phil 1ece034118 Merge pull request #1715 from Project462/patch-2 
Update to include new optional classes.
 2016-06-27 16:53:18 -06:00
Phil 3b0a82452a Merge pull request #1714 from Project462/patch-1 
Update CSS to support new classes.
 2016-06-27 16:53:05 -06:00
Phil d8b36c4308 Merge pull request #1710 from laresgod/master 
fallout formula correction in html
 2016-06-27 16:52:50 -06:00
SteveKoontz fdbc65fc1a Update 13th_Age_Official.css 2016-06-27 14:31:10 -07:00
SteveKoontz 34f763641f Update 13th_Age_Official.html 2016-06-27 14:30:49 -07:00
Mark e70545524c Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	5eShaped/translations/af.json
	5eShaped/translations/da.json
	5eShaped/translations/de.json
	5eShaped/translations/el.json
	5eShaped/translations/es.json
	5eShaped/translations/fr.json
	5eShaped/translations/he.json
	5eShaped/translations/ja.json
	5eShaped/translations/ko.json
	5eShaped/translations/nl.json
	5eShaped/translations/pt.json
	5eShaped/translations/ru.json
	5eShaped/translations/sv.json
	5eShaped/translations/tr.json
	5eShaped/translations/zu.json
 2016-06-27 20:00:56 +02:00
Mark d52c7d3e33 Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	5eShaped/translations/af.json
	5eShaped/translations/da.json
	5eShaped/translations/de.json
	5eShaped/translations/el.json
	5eShaped/translations/es.json
	5eShaped/translations/fr.json
	5eShaped/translations/he.json
	5eShaped/translations/ja.json
	5eShaped/translations/ko.json
	5eShaped/translations/nl.json
	5eShaped/translations/pt.json
	5eShaped/translations/ru.json
	5eShaped/translations/sv.json
	5eShaped/translations/tr.json
	5eShaped/translations/zu.json
 2016-06-27 20:00:19 +02:00
Mark 9b7d525809 version 5.0.3 2016-06-27 19:50:55 +02:00
Chris B a24d7e4ea8 add check for attack name null 2016-06-27 12:33:24 -04:00
Chris B 67e9fe4da9 fix missing equal 2016-06-27 11:50:26 -04:00
Mark 6c59bce211 SAVE missing 2016-06-26 22:13:44 +02:00
Mark edc6e7e6e0 force saving throws macro var 2016-06-26 21:56:48 +02:00
Mark 7a6442d12a fix DC 2016-06-26 21:47:29 +02:00
Mark 294d07bb6f version 5.0.2 2016-06-26 18:24:19 +02:00
Mark 9e537a3348 new translation on all 2016-06-26 18:23:39 +02:00
Mark a3e845e4e8 fix xp output 2016-06-26 13:45:24 +02:00
Mark cde0c795c8 base dc 2016-06-26 00:10:21 +02:00
Mark d33b6379e9 add base d 2016-06-25 21:23:28 +02:00
Mark 04e4de7124 remove line break 2016-06-25 20:32:13 +02:00
Mark 1284645eb1 version 5.0.1 2016-06-25 16:34:56 +02:00
Mark f3a28c165e fix spell ability 2016-06-25 16:34:24 +02:00
Mark d1b21c7559 more room for abilities 2016-06-25 16:34:05 +02:00
Mark 6381ea70b5 skill adv/dis should be fixed now 2016-06-25 15:53:11 +02:00