Jacob 2b188f1a8d Merge branch 'master' into feature-custom-buffs ...

# Conflicts:
#	rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

2017-08-09 15:03:54 +01:00

..

attacks

Now we can use "attackBonus" in spell attacks, make that the default

2017-07-19 12:19:26 +01:00

buffs

Added ability to add/edit buffs

2017-08-09 15:01:20 +01:00

characterSettings

Added setting to swap stats and modifiers

2017-07-18 21:58:00 +01:00

effects

Fixed tooltip suffix icons and moved textarea icons outside of textarea

2017-07-21 11:02:02 +02:00

export/exportDialog

Moved export to lib

2017-07-11 08:12:52 +02:00

features

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

inventory

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

journal

Updated journal page to Polymer 1

2017-01-31 11:09:57 +02:00

newCharacterDialog

removed stray log

2017-05-05 10:45:08 +02:00

persona

Multiple instances of the same proficiency are now merged

2017-07-18 22:33:28 +01:00

proficiencies

Background proficiencies now correctly open background dialog

2017-07-18 23:01:14 +01:00

spells

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

stats

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

characterSheet.css

Added custom tab pages animations

2017-01-27 15:34:09 +02:00

characterSheet.html

Added basic export for improved initiative

2017-07-10 16:26:38 +02:00

characterSheet.js

Added basic export for improved initiative

2017-07-10 16:26:38 +02:00