Merge branch 'master' into 'v1.2'
# Conflicts: # module/actor.js # module/rdd-roll.js # system.json
This commit is contained in:
		| @@ -1542,9 +1542,9 @@ export class RdDActor extends Actor { | ||||
|       coutreve: Array(20).fill().map((item, index) => 1 + index) | ||||
|     } | ||||
|  | ||||
|     if ( this.currentTMR ) this.currentTMR.minimize(); // Hide | ||||
|     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 | ||||
|       }, | ||||
|       { | ||||
| @@ -1562,7 +1562,7 @@ export class RdDActor extends Actor { | ||||
|           this.createCallbackExperience(), | ||||
|           { action: r => this._rollUnSortResult(r, true) } | ||||
|         ] | ||||
|       } | ||||
|       }, | ||||
|     ); | ||||
|     dialog.render(true); | ||||
|   } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user