VincentVk/foundryvtt-reve-de-dragon
0
0
Fork 0
forked from public/foundryvtt-reve-de-dragon
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 'v1.2'

Browse Source 
# Conflicts:
#   module/actor.js
#   module/rdd-roll.js
#   system.json
This commit is contained in:
Leratier Bretonnien 2021-01-22 16:12:14 +00:00
commit 6341d2f3b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/actor.js
View File

@ -1542,9 +1542,9 @@ export class RdDActor extends Actor {
coutreve: Array(20).fill().map((item, index) => 1 + index) coutreve: Array(20).fill().map((item, index) => 1 + index)
} }
if ( this.currentTMR ) this.currentTMR.minimize(); // Hide
const dialog = await RdDRoll.create(this, rollData, const dialog = await RdDRoll.create(this, rollData,
{ { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html',
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html',
close: html => { this.currentTMR.maximize() } // Re-display TMR close: html => { this.currentTMR.maximize() } // Re-display TMR
}, },
{ {
@ -1562,7 +1562,7 @@ export class RdDActor extends Actor {
this.createCallbackExperience(), this.createCallbackExperience(),
{ action: r => this._rollUnSortResult(r, true) } { action: r => this._rollUnSortResult(r, true) }
] ]
} },
); );
dialog.render(true); dialog.render(true);
} }

4
system.json
View File

@ -291,7 +291,7 @@
"secondaryTokenAttribute": "sante.endurance", "secondaryTokenAttribute": "sante.endurance",
"socket": true, "socket": true,
"url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/", "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
"manifest": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/raw/v1.2/system.json", "manifest": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/raw/master/system.json",
"download": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/-/archive/v1.2/foundryvtt-reve-de-dragon-master.zip", "download": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/-/archive/master/foundryvtt-reve-de-dragon-master.zip",
"license": "LICENSE.txt" "license": "LICENSE.txt"
} }