Stefan Zermatten
614284c73d
Updated Meteor and some packages
2017-09-22 12:52:21 +02:00
Stefan Zermatten
6528fc8bab
Improved vMix export
...
closes #138
2017-09-22 11:41:32 +02:00
Stefan Zermatten
020930b2e4
Checked if old hitpoint slider exists before resetting it
...
closes #135
2017-09-22 11:03:00 +02:00
Stefan Zermatten
dcd76e06e1
Merge branch 'fixbug-137-multiadd-spells-delete-themselves'
2017-09-22 10:43:04 +02:00
Stefan Zermatten
8a58002415
Fixed spells in the library using their library ID's in the spells collection
...
closes #137
2017-09-22 10:42:34 +02:00
Stefan Zermatten
535fcd77cf
Added missing attributes to vmix export
2017-09-13 16:01:05 +02:00
Stefan Zermatten
7c2aed26a4
Fixed vMix export, included vMix parties
2017-09-13 14:01:07 +02:00
Stefan Zermatten
fab052050a
Merge branch 'feature-vmix'
2017-09-13 10:01:46 +02:00
Stefan Zermatten
b7bdb141c8
Added basic vMix server side api
2017-09-13 10:01:32 +02:00
Stefan Zermatten
0b8fabde14
Merge branch 'enhancement-106'
2017-09-08 10:48:44 +02:00
Stefan Zermatten
3336e177d9
Merge branch 'enhancement-spell-library-style'
...
closes #106
2017-09-08 10:46:41 +02:00
Stefan Zermatten
2e9440e325
Merge branch 'enhancement-spell-library-style'
2017-09-08 09:47:53 +02:00
Stefan Zermatten
e4ac400cbd
Replaced spell library spell selection highlighting with checkboxes
...
Makes it more intuitive that multiple items can be selected
2017-09-08 09:47:43 +02:00
Stefan Zermatten
f600999c5f
Guarded against error when hiding feature description portion of card
2017-09-08 09:46:58 +02:00
Stefan Zermatten
0af905699a
Uncommented buffs from spell library
2017-09-08 09:46:00 +02:00
Stefan Zermatten
6e900cfaae
Merge pull request #123 from Dumbgenius/spells-improvements
...
Spells improvements
2017-09-08 08:30:56 +02:00
Stefan Zermatten
1f42d3c622
Merge pull request #128 from Dumbgenius/fix-127
...
[#127 ] Arrow library items should give 20 arrows rather than one "Arrows (20)"
2017-09-08 08:29:56 +02:00
Stefan Zermatten
ee453d968f
Merge pull request #134 from Dumbgenius/fixbug-attackview-damage-type
...
attackView now correctly shows damage type
2017-09-07 16:31:26 +02:00
Stefan Zermatten
0850e59b30
Merge pull request #122 from Dumbgenius/feature-22-temp-hp, requires migration
...
Feature - TempHP as a character attribute,
2017-09-07 16:29:55 +02:00
Stefan Zermatten
f3e44cf033
Moved polymer styling to app-theme
2017-09-07 16:26:09 +02:00
Stefan Zermatten
907f9d15d4
Merge pull request #131 from Dumbgenius/feature-custom-buffs
...
Feature - custom buffs
2017-09-07 14:42:05 +02:00
Stefan Zermatten
4c3d5d40dd
Merge branch 'master' into feature-custom-buffs
2017-09-07 14:41:33 +02:00
Stefan Zermatten
ef0deb20aa
Swapped dropdown box for full character list
2017-09-07 14:36:45 +02:00
Stefan Zermatten
b43ee08d75
Fixed some editing bugs on new buffs, improved style
2017-09-07 14:33:59 +02:00
Stefan Zermatten
7e7f1ec997
Merge pull request #132 from Dumbgenius/enhancement-blank-descriptions
...
Removed blank bit of card on features with no short description
2017-09-07 12:03:32 +02:00
Stefan Zermatten
0f652f5c74
Merge pull request #126 from Dumbgenius/feature-unsharing-characters
...
Added ability to "unshare" a character.
2017-09-07 12:01:14 +02:00
Stefan Zermatten
3e02875eaf
Merge pull request #130 from Dumbgenius/enhancement-85
...
Added "carried" checkbox to container edit screen (resolves #85 )
2017-09-07 11:54:11 +02:00
Stefan Zermatten
b9a5230344
Merge pull request #129 from Dumbgenius/enhancement-84
...
Added attacks to features (resolves #84 )
2017-09-07 11:49:03 +02:00
Stefan Zermatten
28780b96c3
Merge pull request #120 from Dumbgenius/feature-drag-drop-spells
...
Feature - drag and drop spells
2017-09-07 11:43:34 +02:00
Jacob
bec0b33805
attackView now correctly shows damage type
2017-09-06 18:45:43 +01:00
Jacob
ad9ccbe7ef
Removed blank bit of card on features with no short description
2017-09-05 14:31:26 +01:00
Jacob
e2933c2df5
Fixed a couple of places where "Buff" should've been "Condition"
2017-09-05 13:56:15 +01:00
Jacob
87583fdac6
Added buff details to apply buff dialog
2017-09-05 13:48:26 +01:00
Jacob
68e1382aed
Buffs/conditions now have a delete button on the list on Stats
2017-09-04 20:36:13 +01:00
Jacob
7b62c82e32
Buff and condition view dialogs now only have the delete button
2017-09-04 20:16:56 +01:00
Jacob
6dd92586a4
Conditions are now separate from buffs, like in #109
2017-09-04 20:16:38 +01:00
Jacob
b3d0db1f02
Merge branch 'master' into feature-custom-buffs
2017-09-04 18:22:04 +01:00
Jacob
5f35c71c9d
Added "carried" checkbox to container edit screen
...
Resolves #85
2017-09-04 15:50:57 +01:00
Jacob
85baf4e5d1
Added attacks to features ( resolves #84 )
2017-09-04 15:35:52 +01:00
Jacob
15d797131e
Fixes #127 . Also fixes it for other ammo as well as iron spikes
2017-09-04 15:22:45 +01:00
Stefan Zermatten
06ac9f70c8
Merge pull request #119 from Dumbgenius/srd-fixes
...
SRD fixes,
Merging this pull request doesn't change the deployed version of DiceCloud, but indicates that the database has been updated using the affected JSON files
2017-09-04 10:50:42 +02:00
Jacob
471a3e274e
Refactored code which applies buffs
2017-08-10 02:49:29 +01:00
Jacob
d4031dc4a7
Removed an unnecessary console log
2017-08-09 16:11:09 +01:00
Jacob
18e5ab3f21
Can now set target of buffs
...
...to "Self only", "Others only", or "Both".
2017-08-09 16:08:19 +01:00
Jacob
c9fe2f17a0
If buff's target is "self", dialog is no longer shown
2017-08-09 15:48:12 +01:00
Jacob
818cb3905f
Can now access the name of public characters for buffs
...
the buffDialog can now access the name of a publicly-available character
so it can display their name as the caster
2017-08-09 15:30:33 +01:00
Jacob
64ef426035
Applying character no longer duplicated in buff apply list
2017-08-09 15:30:25 +01:00
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
Jacob
08735ea4f7
Added ability to add/edit buffs
2017-08-09 15:01:20 +01:00
Jacob
bce1b85600
Relocated the buff list to be inline in stats.html
2017-08-09 11:39:18 +01:00
