Michael Kamensky
|
49b4db24ea
|
Merge branch 'cleanup' into 'master'
Clean up some triggers
See merge request core-developers/forge!5173
|
2021-08-04 05:10:00 +00:00 |
|
Michael Kamensky
|
904524ea6d
|
Merge branch 'changetargets' into 'master'
ChangeTargets: Fix same choices
See merge request core-developers/forge!5174
|
2021-08-04 05:09:35 +00:00 |
|
Michael Kamensky
|
2d16490aab
|
Merge branch 'reveal' into 'master'
allow "Random" and "RevealValid" in same Reveal
See merge request core-developers/forge!5178
|
2021-08-04 05:08:47 +00:00 |
|
Michael Kamensky
|
048995fb47
|
Merge branch 'fix_the_deck_of_many_things' into 'master'
Fix lose effect of The Deck of Many Things
See merge request core-developers/forge!5177
|
2021-08-04 05:08:38 +00:00 |
|
Michael Kamensky
|
aa46867e31
|
Merge branch 'dicesfx' into 'master'
Sound effect for dice rolling!
See merge request core-developers/forge!5176
|
2021-08-04 05:08:28 +00:00 |
|
Northmoc
|
39e9434901
|
allow "Random" and "RevealValid" in same Reveal
|
2021-08-03 23:47:06 -04:00 |
|
Lyu Zong-Hong
|
ead0d809cd
|
Fix lose effect of The Deck of Many Things
|
2021-08-04 10:29:06 +09:00 |
|
Northmoc
|
db4ac4db9d
|
add GameEventRollDie
|
2021-08-03 21:04:58 -04:00 |
|
Northmoc
|
b0c2421419
|
royalty-free die roll mp3 from SoundBible.com
|
2021-08-03 21:04:28 -04:00 |
|
Northmoc
|
62ab654497
|
add die roll event to RollDiceEffect and RollPlanarDiceEffect
|
2021-08-03 21:04:00 -04:00 |
|
Northmoc
|
5c033655c7
|
SoundEffectType.java add RollDie filename
|
2021-08-03 21:03:18 -04:00 |
|
tool4EvEr
|
5b4653754f
|
Fix same choices
|
2021-08-03 22:27:58 +02:00 |
|
tool4EvEr
|
8339745956
|
Clean up
|
2021-08-03 21:19:23 +02:00 |
|
tool4EvEr
|
444bc8cfdd
|
Clean up
|
2021-08-03 19:16:08 +02:00 |
|
Michael Kamensky
|
9886a16c6e
|
Merge branch 'davriel' into 'master'
J21 - fix Davriel, Soul Broker -2 ability
See merge request core-developers/forge!5172
|
2021-08-03 13:32:37 +00:00 |
|
Northmoc
|
d54df10ccd
|
davriel_soul_broker.txt limit number of choices for -2 ability
|
2021-08-03 09:19:58 -04:00 |
|
Northmoc
|
8f53b89b25
|
support "NumRandomChoices" for davriel_soul_broker.txt
|
2021-08-03 09:18:01 -04:00 |
|
Anthony Calosa
|
c24f3ed288
|
Merge branch 'kevlahnota-master-patch-12307' into 'master'
Update EffectEffect.java
See merge request core-developers/forge!5171
|
2021-08-03 10:45:43 +00:00 |
|
Anthony Calosa
|
b9b71e8535
|
Update EffectEffect.java
|
2021-08-03 10:45:25 +00:00 |
|
Anthony Calosa
|
7421e59454
|
Merge branch 'kevlahnota-master-patch-13781' into 'master'
Revert EffectEffect add set to Emblem imagekey
See merge request core-developers/forge!5170
|
2021-08-03 10:43:01 +00:00 |
|
Anthony Calosa
|
356baae747
|
Revert EffectEffect add set to Emblem imagekey
|
2021-08-03 10:39:48 +00:00 |
|
Michael Kamensky
|
471a9e1513
|
Merge branch 'j21_2' into 'master'
Jumpstart Historic Horizons – 2 Aug
See merge request core-developers/forge!5167
|
2021-08-03 03:33:13 +00:00 |
|
Michael Kamensky
|
9ada642605
|
Merge branch 'gamestate#' into 'master'
GameState: Fix typechange Auras not attaching on reload (e.g. Minimus Containment)
See merge request core-developers/forge!5168
|
2021-08-03 03:32:53 +00:00 |
|
tool4EvEr
|
a634860ffd
|
Fix typechange Auras not attaching on reload (e.g. Minimus Containment)
|
2021-08-02 23:37:21 +02:00 |
|
Northmoc
|
131fd8f7cf
|
lumbering_lightshield.txt
|
2021-08-02 17:26:47 -04:00 |
|
Northmoc
|
d280317ff8
|
shoreline_scout.txt
|
2021-08-02 16:03:06 -04:00 |
|
Michael Kamensky
|
a882f56b7e
|
Merge branch 'j21_30' into 'master'
J21 - 30 July
See merge request core-developers/forge!5147
|
2021-08-02 19:13:25 +00:00 |
|
Northmoc
|
e79fbad31d
|
fix StackDescs
|
2021-08-02 15:10:27 -04:00 |
|
Northmoc
|
5bd3062ce2
|
fix spelling
|
2021-08-02 15:10:26 -04:00 |
|
Northmoc
|
d3a464304d
|
longtusk_stalker.txt
|
2021-08-02 15:10:26 -04:00 |
|
Northmoc
|
fa70d55432
|
add whitespace
|
2021-08-02 15:10:25 -04:00 |
|
Northmoc
|
873ff52224
|
kiora_the_tides_fury.txt
|
2021-08-02 15:10:25 -04:00 |
|
Northmoc
|
87e6af657f
|
J21 edition update
|
2021-08-02 15:10:24 -04:00 |
|
Michael Kamensky
|
7f4f0a18f6
|
Merge branch 'chicken' into 'master'
Chicken à la King in editions fix
See merge request core-developers/forge!5165
|
2021-08-02 13:01:39 +00:00 |
|
Michael Kamensky
|
8db5c771dc
|
Merge branch 'TRT-master-patch-45006' into 'master'
Update forge-gui/res/cardsfolder/v/vanish_into_memory.txt
See merge request core-developers/forge!5166
|
2021-08-02 13:01:29 +00:00 |
|
Bug Hunter
|
47d103f493
|
Update forge-gui/res/cardsfolder/v/vanish_into_memory.txt
|
2021-08-02 11:40:48 +00:00 |
|
paul_snoops
|
bf3379279d
|
Chicken à la King in editions fix
|
2021-08-02 11:03:50 +01:00 |
|
Alumi
|
6d72415556
|
Merge branch 'renderer_minor_fix' into 'master'
Minor fix of size calculation for rendering split cards
See merge request core-developers/forge!5164
|
2021-08-02 09:53:37 +00:00 |
|
Lyu Zong-Hong
|
f824c33a85
|
Minor fix of size calculation for rendering split cards
|
2021-08-02 18:51:27 +09:00 |
|
Michael Kamensky
|
ddf8eeb5c9
|
Merge branch 'art_crop' into 'master'
Support art crop in Card Image Renderer
See merge request core-developers/forge!5150
|
2021-08-02 08:21:25 +00:00 |
|
Alumi
|
2c9b3f648d
|
Support art crop in Card Image Renderer
|
2021-08-02 08:21:23 +00:00 |
|
Michael Kamensky
|
d5388b8831
|
Merge branch 'fix_token_crash' into 'master'
Fix token related crash
See merge request core-developers/forge!5162
|
2021-08-02 07:00:05 +00:00 |
|
leriomaggio
|
0e5611cfea
|
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
|
2021-08-02 07:49:18 +01:00 |
|
Bug Hunter
|
a3a6bd20a5
|
Merge branch 'TRT-master-patch-94208' into 'master'
Update forge-gui/res/cardsfolder/h/hazorets_monument.txt
See merge request core-developers/forge!5163
|
2021-08-02 06:37:04 +00:00 |
|
Bug Hunter
|
90ffdcba11
|
Update forge-gui/res/cardsfolder/h/hazorets_monument.txt
|
2021-08-02 06:36:38 +00:00 |
|
Lyu Zong-Hong
|
1cd8255ab6
|
Fix token related crash
|
2021-08-02 14:29:53 +09:00 |
|
Michael Kamensky
|
ab869853ac
|
Merge branch 'j21_31' into 'master'
Fixing/adding some goofy Skeletons
See merge request core-developers/forge!5154
|
2021-08-02 04:00:09 +00:00 |
|
Northmoc
|
8bdf7fe388
|
fix typo in AI hint
|
2021-08-01 20:58:27 -04:00 |
|
Bug Hunter
|
e71c05a985
|
Merge branch 'TRT-master-patch-35684' into 'master'
Update forge-gui/res/cardsfolder/e/exploding_borders.txt
See merge request core-developers/forge!5161
|
2021-08-01 17:20:37 +00:00 |
|
Bug Hunter
|
416f877100
|
Update forge-gui/res/cardsfolder/e/exploding_borders.txt
|
2021-08-01 17:20:01 +00:00 |
|