giteadmin
|
2d777f7ea2
|
Merge branch 'v1.4' of https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.4
|
2021-05-09 16:51:08 +02:00 |
|
giteadmin
|
06cbabb229
|
Merge branch 'marafal1/foundryvtt-reve-de-dragon-feature-ethylisme-refactor' into v1.4
|
2021-05-09 16:50:36 +02:00 |
|
giteadmin
|
5f314497d4
|
Merge branch 'v1.4-fatigue' into 'v1.4'
Option pour ne pas utiliser la fatigue
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!232
|
2021-05-09 14:49:10 +00:00 |
|
giteadmin
|
bf9df5d68e
|
Merge branch 'v1.4' of https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.4
|
2021-05-08 07:48:33 +02:00 |
|
giteadmin
|
84ba8b0fa1
|
Merge branch 'v1.4-commerce' into 'v1.4'
#184 Améliorations du commerce
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!230
|
2021-05-08 05:41:03 +00:00 |
|
giteadmin
|
b78d9dd31a
|
Merge branch 'v1.4' of https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.4
|
2021-05-07 07:31:08 +02:00 |
|
giteadmin
|
28abc35a21
|
Merge branch 'v1.4-equipement' into 'v1.4'
Petites corrections
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!228
|
2021-05-07 05:30:58 +00:00 |
|
giteadmin
|
2bf718c2f7
|
Merge branch 'v1.4' of https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.4
|
2021-05-07 00:01:09 +02:00 |
|
giteadmin
|
f80a8a8bb2
|
Minor fixes
|
2021-05-07 00:01:07 +02:00 |
|
giteadmin
|
b064ce22f0
|
Merge branch 'feature-add-materiel' into 'v1.4'
Add materiel de base for character creation
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!227
|
2021-05-06 22:00:24 +00:00 |
|
giteadmin
|
cc103b88ac
|
Merge branch 'v1.4-fix' into 'v1.4'
Amélioration Haut-rêve
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!226
|
2021-05-04 21:17:06 +00:00 |
|
giteadmin
|
a10311de04
|
Merge branch 'v1.4-tmr' into 'v1.4'
ajout webp et couleurs
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!225
|
2021-05-03 18:23:28 +00:00 |
|
giteadmin
|
e98d99638e
|
Merge branch 'v1.4' of https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.4
|
2021-05-02 21:09:01 +02:00 |
|
giteadmin
|
93b4d2ce7e
|
Make TMR great again....
|
2021-05-02 21:08:50 +02:00 |
|
giteadmin
|
09256ad9a3
|
Merge branch 'fix-calendar-082' into 'v1.4'
Fix calendar 082
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!224
|
2021-05-01 21:51:40 +00:00 |
|
giteadmin
|
66e4f6ad02
|
Merge branch 'v1.4-des' into 'v1.4'
Fix dé dragon sans bords pour tous
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!222
|
2021-05-01 21:50:31 +00:00 |
|
giteadmin
|
ef885710d9
|
Merge branch 'v1.4' into 'v1.4'
Update gitignore
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!221
|
2021-05-01 21:49:58 +00:00 |
|
giteadmin
|
6d7d55e12b
|
Fix 0.8.2 actors
|
2021-05-01 19:12:55 +02:00 |
|
giteadmin
|
c7ba56b90b
|
Merge branch 'feature-ethylisme-to-template' into 'v1.4'
Update "Jet d'éthylisme" to use a handlebars template
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!220
|
2021-04-30 21:10:09 +00:00 |
|
giteadmin
|
4e4e75279d
|
Merge branch 'v1.4-blessures' into 'v1.4'
Amélioration des blessures #173
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!217
|
2021-04-28 07:42:01 +00:00 |
|
giteadmin
|
4ecc8826f6
|
Gestion TMR caché, WIP #135
|
2021-04-28 00:48:39 +02:00 |
|
giteadmin
|
d486fa7aff
|
Merge branch 'v1.4-blessures' into 'v1.4'
Amélioration présentation blessures #173
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!214
|
2021-04-27 07:34:22 +00:00 |
|
giteadmin
|
33ed7bfe2c
|
#185 - Reinit nombres astraux
|
2021-04-25 10:08:40 +02:00 |
|
giteadmin
|
d42de6c316
|
Merge branch 'v1.4-dialog' into 'v1.4'
Rework dialogues
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!212
|
2021-04-24 06:52:28 +00:00 |
|
giteadmin
|
3646fd2033
|
Merge branch 'v1.4-dialog' into 'v1.4'
Présentation des fenêtre de dialogue
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!211
|
2021-04-21 21:20:48 +00:00 |
|
giteadmin
|
226319b067
|
Merge branch 'v1.4-dialogs' into 'v1.4'
V1.4 dialogs
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!210
|
2021-04-21 09:18:48 +00:00 |
|
giteadmin
|
3c793296a6
|
Merge branch 'v1.4-dialog-competence' into 'v1.4'
V1.4 dialog competence
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!209
|
2021-04-20 15:54:41 +00:00 |
|
giteadmin
|
b7c913ac50
|
Merge branch 'v1.4-fix' into 'v1.4'
Fix: après dérobade, impossible ouvrir fiche
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!207
|
2021-04-18 06:38:44 +00:00 |
|
giteadmin
|
a7e9fc6ae4
|
Merge branch 'v1.4-tokens' into 'v1.4'
Ajout de tokens de créatures
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!205
|
2021-04-17 07:17:48 +00:00 |
|
giteadmin
|
afe8e5067a
|
Merge branch 'v1.4-fix' into 'v1.4'
Empêcher doublons sur tête/souffle #175
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!204
|
2021-04-16 21:39:57 +00:00 |
|
giteadmin
|
a7b228afe3
|
Merge branch 'v1.4-cuisine' into 'v1.4'
Séparation qualité/exotisme, ajout de nourriture #168
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!202
|
2021-04-16 07:15:10 +00:00 |
|
giteadmin
|
fde5096c59
|
Merge branch 'v1.4-commerce' into 'v1.4'
Payer donne l'argent à qui de droit
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!200
|
2021-04-15 06:16:42 +00:00 |
|
giteadmin
|
93865f2c4b
|
Merge branch 'v1.4-regrouper' into 'v1.4'
Regrouper des équipements #169
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!199
|
2021-04-13 20:56:29 +00:00 |
|
giteadmin
|
1cab660a2f
|
Menues corrections
|
2021-04-13 22:36:03 +02:00 |
|
giteadmin
|
6e29f497eb
|
Merge branch 'v1.4-split' into 'v1.4'
Séparer les piles d'éléments #169
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!198
|
2021-04-13 07:36:06 +00:00 |
|
giteadmin
|
870ca61d7d
|
Merge branch 'v1.4-consommer' into 'v1.4'
Continuer la nourriture
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!197
|
2021-04-12 06:03:35 +00:00 |
|
giteadmin
|
07b68020b2
|
#181 Gestion potions (fabrication)
|
2021-04-11 12:07:43 +02:00 |
|
giteadmin
|
daa2421ba4
|
#181 Gestion potions (fabrication)
|
2021-04-10 21:08:55 +02:00 |
|
giteadmin
|
1b3c5f524d
|
#181 Gestion potions (fabrication)
|
2021-04-10 21:07:53 +02:00 |
|
giteadmin
|
1cea9753a9
|
#171 - Gestion potions / consommation
|
2021-04-09 18:13:34 +02:00 |
|
giteadmin
|
cc24471926
|
#171 - Gestion potions / consommation
|
2021-04-09 17:30:32 +02:00 |
|
giteadmin
|
31d2c01ebb
|
#171 - Gestion des potions de repos
|
2021-04-09 15:23:48 +02:00 |
|
giteadmin
|
38b58cd4b0
|
Merge branch 'v1.4-fix-182' into 'v1.4'
Fix xp des compétences tronc #182
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!194
|
2021-04-09 06:05:29 +00:00 |
|
giteadmin
|
f25ae66de1
|
Merge branch 'v1.4-cuisine' into 'v1.4'
Créer des plats cuisinés
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!193
|
2021-04-08 19:17:42 +00:00 |
|
giteadmin
|
8a7d8a6930
|
Sync
|
2021-04-07 22:46:57 +02:00 |
|
giteadmin
|
62261d1748
|
Merge branch 'v1.4-nourriture' into 'v1.4'
Nourriture et boissons #168
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!192
|
2021-04-07 18:04:29 +00:00 |
|
giteadmin
|
dc48f08203
|
#171 - Gestion potion de soins (WIP)
|
2021-04-04 23:07:13 +02:00 |
|
giteadmin
|
9cc73e971d
|
#171 - Gestion potion de soins (WIP)
|
2021-04-04 22:47:33 +02:00 |
|
giteadmin
|
f7c1ed0749
|
#171 - Gestion potion de soins (WIP)
|
2021-04-04 22:34:59 +02:00 |
|
giteadmin
|
18f1d314b7
|
#171 - Gestion potion de soins (WIP)
|
2021-04-04 18:42:09 +02:00 |
|
giteadmin
|
a5561b7b88
|
#171 - Gestion potion de soins (WIP)
|
2021-04-04 18:37:16 +02:00 |
|
giteadmin
|
e4f432c781
|
#171 - Gestion potion de soins
|
2021-04-04 09:37:35 +02:00 |
|
giteadmin
|
f8171fecc3
|
Message explicite HR
|
2021-04-04 09:03:06 +02:00 |
|
giteadmin
|
795e80d575
|
Message explicite HR
|
2021-04-04 08:58:57 +02:00 |
|
giteadmin
|
4538472fc0
|
Merge branch 'v1.4-report-master' into 'v1.4'
Demi-surprise: Réussite normale => échec #181
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!191
|
2021-04-04 06:50:26 +00:00 |
|
giteadmin
|
31bff0861f
|
Fix sur commande astro
|
2021-04-03 23:01:47 +02:00 |
|
giteadmin
|
56cf4243a8
|
#179 - Fix reve-actuel
|
2021-04-03 08:31:01 +02:00 |
|
giteadmin
|
97d53d3f31
|
Merge branch 'v1.4' of https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.4
|
2021-04-03 08:19:30 +02:00 |
|
giteadmin
|
65348b0710
|
#180 - Fix
|
2021-04-03 08:19:19 +02:00 |
|
giteadmin
|
70add73ad7
|
Merge branch 'v1.4-hautreve' into 'v1.4'
Draconic pour les haut-rêvants - HUD
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!187
|
2021-04-03 06:16:30 +00:00 |
|
giteadmin
|
8f58e12c05
|
Merge branch 'v1.4-hautreve' into 'v1.4'
#174: Limiter le draconic aux Haut rêvant
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!186
|
2021-04-02 06:44:58 +00:00 |
|
giteadmin
|
852cf51dc1
|
Merge branch 'v1.4-fix' into 'v1.4'
Fix ajout list/filterItemsData
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!183
|
2021-04-01 05:41:50 +00:00 |
|
giteadmin
|
e1f0d199c1
|
Merge branch 'v1.4-fix' into 'v1.4'
Fix sur tests
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!181
|
2021-03-31 06:41:06 +00:00 |
|
giteadmin
|
3f14d2b833
|
Merge branch 'v1.4-fix-items' into 'v1.4'
Methode getItemOfType, Misc.data pour Items, remplacement de OwnedItems, fix casetmrs, et plus
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!180
|
2021-03-30 04:38:14 +00:00 |
|
giteadmin
|
36df301144
|
Various fixes for TMR, WIP
|
2021-03-28 22:37:04 +02:00 |
|
giteadmin
|
f043c3b504
|
Fix : monnaie, endurance, encombrement
|
2021-03-28 09:43:26 +02:00 |
|
giteadmin
|
3df76c589f
|
Fix : monnaie, endurance, encombrement
|
2021-03-28 09:41:14 +02:00 |
|
giteadmin
|
67bb14795c
|
Fix /payer
|
2021-03-27 14:57:25 +01:00 |
|
giteadmin
|
5de4dd016f
|
Fix conteneur/objet
|
2021-03-25 19:03:28 +01:00 |
|
giteadmin
|
5b53d4c2c9
|
Debug sorts, WIP
|
2021-03-25 18:33:10 +01:00 |
|
giteadmin
|
be04157fb0
|
Item ingredient livre potion munition rencontre queue ombre souffle tete competencecreature tarot monnaie nombrestral
|
2021-03-25 18:04:57 +01:00 |
|
giteadmin
|
ceb73b9944
|
Item arme, armure, competences, sorts, herbes -> OK
|
2021-03-25 17:51:03 +01:00 |
|
giteadmin
|
1616931476
|
Edition des items, WIP
|
2021-03-25 09:28:36 +01:00 |
|
giteadmin
|
fd6c3ac7c6
|
Merge branch 'v1.4-adapt-acteur' into 'v1.4'
Adaptation Feuilles Acteurs
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!176
|
2021-03-25 06:30:26 +00:00 |
|
giteadmin
|
d95a0ebfc1
|
Merge branch 'master-prepare-080' into 'master'
Preparation access documentData
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!173
|
2021-03-22 19:20:02 +00:00 |
|
giteadmin
|
2b6d1d8de1
|
Merge branch 'master-fixes' into 'master'
Fix: recalcul des nombres astraux
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!172
|
2021-03-20 17:42:29 +00:00 |
|
giteadmin
|
c99ac0675a
|
Sync version
|
2021-03-20 10:38:51 +01:00 |
|
giteadmin
|
d5fbca4778
|
Merge branch 'master-fixes' into 'master'
Reports de la branche 0.8.0 non liés à Foundry
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!171
|
2021-03-19 12:24:23 +00:00 |
|
giteadmin
|
6025f5d1de
|
Merge branch 'master' of gitlab.com:LeRatierBretonnien/foundryvtt-reve-de-dragon
|
2021-03-18 17:08:47 +01:00 |
|
giteadmin
|
0b898b1ee7
|
Sync fix/version
|
2021-03-18 17:08:34 +01:00 |
|
giteadmin
|
1ad457f25f
|
Merge branch 'master-fixes' into 'master'
Stress transformé avec les compétences
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!170
|
2021-03-18 06:24:02 +00:00 |
|
giteadmin
|
a86ac0ffa2
|
Merge branch 'master-fixes' into 'master'
Moral sur les oeuvres
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!169
|
2021-03-17 07:38:29 +00:00 |
|
giteadmin
|
c58c9636d2
|
Merge branch 'master-fixes' into 'master'
Afficher le jet d'endurance pour les personnages
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!168
|
2021-03-15 07:42:18 +00:00 |
|
giteadmin
|
bc45ffa7bb
|
Minor fixes
|
2021-03-14 20:29:21 +01:00 |
|
giteadmin
|
b5e2f892a5
|
Merge branch 'master-fixes' into 'master'
Plein de petits fixes
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!167
|
2021-03-14 19:20:52 +00:00 |
|
giteadmin
|
c281551603
|
Fix combat mains nues
|
2021-03-12 23:19:34 +01:00 |
|
giteadmin
|
5e9f1cd8a6
|
Increase version
|
2021-03-11 12:10:26 +01:00 |
|
giteadmin
|
9245c7da44
|
Ajout portrait des voyageurs
|
2021-03-10 22:30:37 +01:00 |
|
giteadmin
|
1d69e1dc5a
|
Fix #167
|
2021-03-09 23:28:21 +01:00 |
|
giteadmin
|
ec0e1ac257
|
Ajout des points de voyage
|
2021-03-08 16:43:00 +01:00 |
|
giteadmin
|
aec5d6f239
|
Fix moral
|
2021-03-06 10:16:57 +01:00 |
|
giteadmin
|
e09bdadba7
|
Merge branch 'bugFixAppelAuMoral' into 'master'
Bugfix Appel au moral.
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!164
|
2021-03-06 09:09:58 +00:00 |
|
giteadmin
|
38adf22e82
|
Sync head
|
2021-02-28 08:37:42 +01:00 |
|
giteadmin
|
da7d67b3d7
|
Merge branch 'v1.3-fixes' into 'master'
V1.3 fixes
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!161
|
2021-02-28 07:34:44 +00:00 |
|
giteadmin
|
950e050051
|
Merge branch 'v1.3' into 'master'
V1.3
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!159
|
2021-02-27 22:10:43 +00:00 |
|
giteadmin
|
33b676e214
|
Merge branch 'master' into 'v1.3'
# Conflicts:
# module/actor.js
# module/rdd-combat.js
# module/rdd-resolution-table.js
# module/rdd-roll.js
# system.json
# templates/chat-resultat-parade.html
|
2021-02-27 22:06:27 +00:00 |
|
giteadmin
|
8ddd47844f
|
Merge branch 'v1.3' of gitlab.com:LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.3
|
2021-02-27 23:02:52 +01:00 |
|
giteadmin
|
bcbd4ab58c
|
Fix initiative
|
2021-02-27 22:59:10 +01:00 |
|
giteadmin
|
89d66c1347
|
#164 : une seule fenêtre de jet autorisée
|
2021-02-26 23:54:17 +01:00 |
|
giteadmin
|
d3388d13cf
|
Merge branch 'texte-ambiance' into 'v1.3'
handlebar partiel pour texte d'ambiance
See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!157
|
2021-02-26 20:31:07 +00:00 |
|