Hans Mackowiak
|
0b262ef773
|
SpellAbility: fix SpellAbilityPickerTest
|
2020-11-30 13:50:28 +01:00 |
|
Anthony Calosa
|
c79ae7a110
|
Merge branch 'master' into 'master'
Unused import
See merge request core-developers/forge!3465
|
2020-11-30 12:02:43 +00:00 |
|
Anthony Calosa
|
e3e047d0b2
|
Unused import
|
2020-11-30 20:01:56 +08:00 |
|
Hans Mackowiak
|
a3ec4817a2
|
Fixed mindSlaveMaster == controller causing StackoverflowError
|
2020-11-30 11:59:19 +01:00 |
|
Michael Kamensky
|
e2227f53f1
|
Merge branch 'CMR-collation-fix-cleanup' into 'master'
Fix CMR booster collation / Small cleanup of printsheets.txt
See merge request core-developers/forge!3463
|
2020-11-30 10:50:39 +00:00 |
|
Michael Kamensky
|
6ae1fe87d1
|
Merge branch 'withFlashStatic' into 'master'
WithFlash: refactor into Static
Closes #1638
See merge request core-developers/forge!3440
|
2020-11-30 10:50:15 +00:00 |
|
Hans Mackowiak
|
49e7f20a41
|
WithFlash: refactor into Static
|
2020-11-30 10:50:15 +00:00 |
|
pfirpfel
|
09a9a96c4d
|
Fix CMR booster collation
Cleanup printsheets.txt
|
2020-11-30 10:04:17 +01:00 |
|
Michael Kamensky
|
779da47dcf
|
Merge branch 'master' into 'master'
Add puzzle PS_ZNR03, fix the AI bouncing Dimir Aqueduct and similar cards back to hand.
See merge request core-developers/forge!3462
|
2020-11-30 05:30:47 +00:00 |
|
Michael Kamensky
|
aecd72b2d1
|
- Fix a logic error causing the AI to bounce lands like Dimir Aqueduct back to hand.
|
2020-11-30 08:24:46 +03:00 |
|
Michael Kamensky
|
acf908d12b
|
- Added puzzle PS_ZNR03.
|
2020-11-30 08:20:26 +03:00 |
|
Michael Kamensky
|
338ed786b0
|
Merge branch 'oppage' into 'master'
CMR: Opposition Agent
See merge request core-developers/forge!3431
|
2020-11-30 04:42:35 +00:00 |
|
Michael Kamensky
|
4682b6aee7
|
Merge branch 'sengir' into 'master'
CMR: Sengir, the Dark Baron + Curse of Vengeance
Closes #1334, #50, and #1545
See merge request core-developers/forge!3391
|
2020-11-30 04:41:58 +00:00 |
|
swordshine
|
248940fd3d
|
Merge branch 'huatli_fix' into 'master'
Huatli - [Pump w/ Defined] better than [PumpAll w/ Valid]
See merge request core-developers/forge!3461
|
2020-11-30 02:27:36 +00:00 |
|
Hans Mackowiak
|
3f78aee7e2
|
Player: fix StackError
|
2020-11-29 16:13:42 -05:00 |
|
Hans Mackowiak
|
5e71acb082
|
Opposition Agent: use timestamp for controlledBy effects
|
2020-11-29 16:13:42 -05:00 |
|
Northmoc
|
db4ed8d27e
|
set up trackable ControlOppSearchLib
|
2020-11-29 16:13:41 -05:00 |
|
Northmoc
|
1ca31d6fab
|
rudimentary Timestamp check
|
2020-11-29 16:13:41 -05:00 |
|
Northmoc
|
056950747d
|
working except timestamps
|
2020-11-29 16:13:41 -05:00 |
|
Northmoc
|
86d79f66c9
|
work on second ability
|
2020-11-29 16:13:40 -05:00 |
|
Northmoc
|
969d948bd7
|
work on second ability
|
2020-11-29 16:13:40 -05:00 |
|
Northmoc
|
731f63ac40
|
opposition_agent.txt VERY ROUGH
|
2020-11-29 16:13:39 -05:00 |
|
Northmoc
|
6eb6d5d758
|
support "notDrawnThisTurn"
|
2020-11-29 16:13:39 -05:00 |
|
Northmoc
|
0e8c879445
|
[Pump w/ Defined] better than [PumpAll w/ Valid]
|
2020-11-29 16:10:18 -05:00 |
|
Northmoc
|
c8bbc8b95e
|
finalize change to Player.java
|
2020-11-29 16:08:29 -05:00 |
|
Northmoc
|
615f2a47aa
|
curse_of_vengeance.txt
|
2020-11-29 16:08:29 -05:00 |
|
Northmoc
|
2dd8fc27b5
|
support "that player's life total as the turn began"
|
2020-11-29 16:08:28 -05:00 |
|
Northmoc
|
af9e11059f
|
sengir_the_dark_baron.txt
|
2020-11-29 16:08:28 -05:00 |
|
Hans Mackowiak
|
cf25c1aaa8
|
AnimateEffectBase: add OverridingAbility to created Trigger
|
2020-11-29 15:50:41 +01:00 |
|
Michael Kamensky
|
be37314500
|
Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt (bag of rocks fix) working
See merge request core-developers/forge!3460
|
2020-11-29 12:51:07 +00:00 |
|
Michael Kamensky
|
cbc293edff
|
Merge branch 'master' into 'master'
Oracle text patch for Lifelink
See merge request core-developers/forge!3454
|
2020-11-29 12:50:45 +00:00 |
|
Hans Mackowiak
|
81bfaf2a15
|
Match: add extra Event Loop to Match for Events when the Game is closed
|
2020-11-29 11:19:00 +01:00 |
|
Hans Mackowiak
|
88c017f962
|
GameView: do not store Game anymore, get it from Match
|
2020-11-29 11:18:58 +01:00 |
|
Hythonia
|
2163aadeb1
|
Update lifelink.txt
|
2020-11-29 09:44:26 +00:00 |
|
John
|
65ce17eb19
|
Update Secret Lair Drop Series.txt
|
2020-11-29 09:03:03 +00:00 |
|
Hans Mackowiak
|
70e75bde91
|
PlayerControllerAI: fix trigger shouldn't be added to stack if target is invalid
|
2020-11-29 09:47:03 +01:00 |
|
Michael Kamensky
|
f6d2053a47
|
Merge branch 'huatli_fix' into 'master'
huatli_warrior_poet.txt fix
See merge request core-developers/forge!3459
|
2020-11-29 04:05:20 +00:00 |
|
Northmoc
|
ae1e25c8d8
|
huatli_warrior_poet.txt fix
|
2020-11-28 19:15:51 -05:00 |
|
Tim Mocny
|
517f27a012
|
Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt bag of rocks fix
See merge request core-developers/forge!3456
|
2020-11-28 21:14:59 +00:00 |
|
Hans Mackowiak
|
1def6b4b9d
|
Merge branch '1652-java-lang-runtimeexception-abilityfactory-getability-parallax-dementia-has-no-svar-trigdestroy' into 'master'
Resolve "java.lang.RuntimeException: AbilityFactory : getAbility -- Parallax Dementia has no SVar: TrigDestroy"
Closes #1652
See merge request core-developers/forge!3458
|
2020-11-28 19:35:00 +00:00 |
|
Hans Mackowiak
|
5ee627bf87
|
Update parallax_dementia
|
2020-11-28 19:34:41 +00:00 |
|
John
|
0e599d804f
|
Update Secret Lair Drop Series.txt
|
2020-11-28 17:45:46 +00:00 |
|
Michael Kamensky
|
af0900a48c
|
Merge branch 'spentColorsSpellAbility' into 'master'
SpellAbility: moved ManaSpent from Card into CastSA
See merge request core-developers/forge!3455
|
2020-11-28 17:13:38 +00:00 |
|
Hans Mackowiak
|
ab0331cd6e
|
SpellAbility: moved ManaSpent from Card into CastSA
|
2020-11-28 11:44:24 +01:00 |
|
Hythonia
|
bc87a57036
|
add Oracle to Lifelink
|
2020-11-28 09:38:07 +00:00 |
|
Hans Mackowiak
|
a7c474cea4
|
AbilityUtils: fix NPE then using TriggeredCount with TokenScript
|
2020-11-28 10:05:30 +01:00 |
|
Michael Kamensky
|
c9f9781576
|
Merge branch 'doubleagenda' into 'master'
Double agenda - Summoner's Bond!
Closes #113
See merge request core-developers/forge!3449
|
2020-11-28 04:23:01 +00:00 |
|
Michael Kamensky
|
dca773420e
|
Merge branch 'call_bandaid' into 'master'
update call_the_coppercoats.txt
See merge request core-developers/forge!3450
|
2020-11-28 04:22:34 +00:00 |
|
Michael Kamensky
|
fede5cb41c
|
Merge branch 'fix-headless' into 'master'
Finally block blowing up when no exception is thrown.
See merge request core-developers/forge!3453
|
2020-11-28 04:22:23 +00:00 |
|
swordshine
|
c8457d8ded
|
Merge branch 'master' into 'master'
Ethereal Forager corner case fix
Closes #1364
See merge request core-developers/forge!3447
|
2020-11-28 04:05:47 +00:00 |
|