external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,065 Commits 31 Branches 187 Tags
c7c6c574e65c7ab85fac8c3a6063a0c7458c820c
Commit Graph

47065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
0d16ced6d2 Merge branch 'printsheet-cleanup' into 'master' 
Printsheet cleanup - first batch

See merge request core-developers/forge!3464
 2020-11-30 19:59:37 +00:00
pfirpfel
547a6301c2 KLD, AER cleanup 2020-11-30 17:16:34 +01:00
pfirpfel
325d9d26f6 XLN, RIX cleanup 2020-11-30 17:07:56 +01:00
pfirpfel
73c16bdf83 DGM, FRF cleanup 2020-11-30 16:57:33 +01:00
pfirpfel
cb0a88349e ME4 cleanup 2020-11-30 16:54:50 +01:00
pfirpfel
b38ca8e4ed THB cleanup 2020-11-30 16:32:04 +01:00
pfirpfel
49242e2fa9 Remove excess new lines at the end 2020-11-30 15:15:14 +01:00
pfirpfel
a301ac0d9e cleanup MB1 (Mystery Booster) 2020-11-30 15:13:54 +01:00
pfirpfel
a63e774afa Fix 2XM double first pick 2020-11-30 14:58:43 +01:00
pfirpfel
e01cb9d466 cleanup 2XM, fix foil collation 2020-11-30 14:58:18 +01:00
pfirpfel
5ecad7091c AKR cleanup 2020-11-30 14:07:48 +01:00
pfirpfel
1d4ab145b9 ZNR cleanup 2020-11-30 14:03:03 +01:00
pfirpfel
a52ab815a3 Adding alternate art as section 2020-11-30 13:51:45 +01:00
pfirpfel
b19a9aed66 IKO cleanup 2020-11-30 13:51:45 +01:00
pfirpfel
2cd50eb08a M21 cleanup 2020-11-30 13:51:45 +01:00
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