Commits · master · Aidan Maskelyne / FoundryVTT Conan 2d20 System · GitLab

Jan 16, 2022
- Merge branch '244-modify-consumable-uses-with-buttons' into 'master' · a27417d6
  Ian Henry authored Jan 16, 2022
  a27417d6
- alignment of available uses label · b4d56703
  Paul Maskelyne authored Jan 16, 2022
  b4d56703
- Merge branch 'master' into 244-modify-consumable-uses-with-buttons · 0ecbf0b7
  Paul Maskelyne authored Jan 16, 2022
  
  0ecbf0b7
- Merge branch '243-equipped-weapon-encumbrance' into 'master' · 30d94a47
  Ian Henry authored Jan 16, 2022
  30d94a47
- Merge branch '251-fix-condition-labels' into 'master' · 043125a0
  Ian Henry authored Jan 16, 2022
  043125a0
- Merge branch '252-shield-armor-soak-display' into 'master' · b396a649
  Ian Henry authored Jan 16, 2022
  b396a649
- Merge branch '253-inconsistent-icon-and-font-sizes' into 'master' · 88ab7b8b
  Ian Henry authored Jan 16, 2022
  88ab7b8b
- Merge branch '254-collapsable-character-sheet-sections' into 'master' · f1f3435a
  Ian Henry authored Jan 16, 2022
  f1f3435a
- closes #254 · cf19b7c9
  Paul Maskelyne authored Jan 16, 2022
  cf19b7c9
- closes #253 · fc35d342
  Paul Maskelyne authored Jan 16, 2022
  fc35d342
Jan 15, 2022
- closes #252 · 2ae53223
  Paul Maskelyne authored Jan 15, 2022
  2ae53223
- fixes #251 · 8c74343a
  Paul Maskelyne authored Jan 15, 2022
  8c74343a
Jan 12, 2022
- Hook up the increase/decrease buttons to uses for consumable items · d4189895
  Paul Maskelyne authored Jan 12, 2022
  d4189895
Jan 11, 2022
- misleading comments · 41f43241
  Paul Maskelyne authored Jan 11, 2022
  
  41f43241
- removed ready for new transport encumbrance work · a9bc3373
  Paul Maskelyne authored Jan 11, 2022
  a9bc3373
- Merge branch 'master' into 243-equipped-weapon-encumbrance · 069f848d
  Paul Maskelyne authored Jan 11, 2022
  
  069f848d
- closes #243 · e9cb8828
  Paul Maskelyne authored Jan 11, 2022
  e9cb8828
- Merge branch 'muttley/add-to-authors' into 'master' · 19c6b59c
  Ian Henry authored Jan 11, 2022
  19c6b59c
Jan 10, 2022
- added myself to authors as requested · 10738be8
  Paul Maskelyne authored Jan 10, 2022
  10738be8
- remove unecessary check · c5c2125d
  Paul Maskelyne authored Jan 10, 2022
  c5c2125d
- Merge branch 'muttley/cosmetic-work-on-chat-cards' into 'master' · b754d05f
  Ian Henry authored Jan 10, 2022
  b754d05f
- Merge branch '242-npc-corruption' into 'master' · ec121d47
  Ian Henry authored Jan 10, 2022
  ec121d47
- Merge branch '237-npc-stat-block-reorder' into 'master' · 71b02ae1
  Ian Henry authored Jan 10, 2022
  71b02ae1
Jan 09, 2022
- tweaks to header style for cards · 204e2f28
  Paul Maskelyne authored Jan 09, 2022
  204e2f28
- modified, longer version of chat background image to handle longer chat messages without distorting · 6f08b674
  Paul Maskelyne authored Jan 09, 2022
  6f08b674
Jan 08, 2022
- A few instances of deprecated deleteOwnedItem being used. closes #242 · 71186c87
  Paul Maskelyne authored Jan 08, 2022
  71186c87
- closes #237 · 0df14869
  Paul Maskelyne authored Jan 08, 2022
  0df14869
- closes #104 · 1f042fcf
  Paul Maskelyne authored Jan 08, 2022
  1f042fcf
- incorrect value field name used for traumas · bb1e6559
  Paul Maskelyne authored Jan 08, 2022
  bb1e6559
Jan 07, 2022
- Merge branch 'eeyun/release_1.5.0' into 'master' · d266ceef
  Ian Henry authored Jan 07, 2022
  View commits for tag v1.5.0 v1.5.0
  
  d266ceef
- Release v1.5.0 · 73a647db
  Ian Henry authored Jan 07, 2022
  73a647db
- Merge branch '239-enhanced-mouse-controls' into 'master' · cf673c99
  Ian Henry authored Jan 07, 2022
  cf673c99
- forgot to add the despair/fatigue controls. tidied up the actor-health template a little as well · e5b3eaf8
  Paul Maskelyne authored Jan 07, 2022
  e5b3eaf8
- Merge branch 'master' into 239-enhanced-mouse-controls · bfea0245
  Paul Maskelyne authored Jan 07, 2022
  
  bfea0245
- closes #239 · 5549e9c2
  Paul Maskelyne authored Jan 07, 2022
  5549e9c2
- bit of a tidy up and removal of code duplication · cf5680b4
  Paul Maskelyne authored Jan 07, 2022
  cf5680b4
- Merge branch 'eeyun/bugs' into 'master' · d198d6b1
  Ian Henry authored Jan 07, 2022
  d198d6b1
- Fixes chat card and broken traits for lotusPollen enchantments · c03af07f
  Ian Henry authored Jan 07, 2022
  c03af07f
Jan 06, 2022
- Merge branch 'eeyun/dmg_rerolls' into 'master' · 2ad597a8
  Ian Henry authored Jan 06, 2022
  2ad597a8
- Fixes broken damage rerolls · 77633059
  Ian Henry authored Jan 06, 2022
  77633059