external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,270 Commits 31 Branches 187 Tags
c89c0181d364961a24d0daa6f37a76c5cb94691c
Commit Graph

53270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
18eddce33a unused imports 2021-10-14 16:28:15 +08:00
Anthony Calosa
1d74e27ee7 Merge branch 'master' into 'master' 
[Mobile] fix NPE

See merge request core-developers/forge!5546
 2021-10-14 08:21:15 +00:00
Anthony Calosa
40ea769ac5 [Mobile] fix NPE 2021-10-14 16:19:53 +08:00
Michael Kamensky
e00c4da560 Merge branch 'master' into 'master' 
Fix Split the Party AI

See merge request core-developers/forge!5544
 2021-10-14 05:28:00 +00:00
Michael Kamensky
3f6a7c2d12 - Fix Split the Party AI 2021-10-14 08:27:24 +03:00
Michael Kamensky
cf0221554c Merge branch 'master' into 'master' 
October 13, 2021 Banned and Restricted announcement

See merge request core-developers/forge!5542
 2021-10-14 04:01:02 +00:00
Hythonia
1d014b6a63 Update subversive_acolyte.txt 2021-10-13 17:37:46 +00:00
Hythonia
fc901735c3 Update sarkhan_wanderer_to_shiv.txt 2021-10-13 17:35:44 +00:00
Hythonia
780cd830e0 Update faceless_agent.txt 2021-10-13 17:34:12 +00:00
Hythonia
a4dd05efec Update davriel_soul_broker.txt 2021-10-13 17:33:46 +00:00
Hythonia
adbd51f05e Update davriels_withering.txt 2021-10-13 17:32:16 +00:00
Hythonia
ce3ef1544b October 13, 2021 Banned and Restricted Announcement 2021-10-13 17:30:53 +00:00
Michael Kamensky
cf86688b61 Merge branch 'brawl' into 'master' 
Brawl Pithing Needle banned and HTR20 update

See merge request core-developers/forge!5541
 2021-10-13 17:24:08 +00:00
paul_snoops
20cecd0985 Brawl Pithing Needle banned and HTR20 update 2021-10-13 14:35:50 +01:00
Michael Kamensky
1617c433d0 Merge branch 'panhar' into 'master' 
Panharmonicon: Fix missing trigger due to ETB with old state

Closes #1986

See merge request core-developers/forge!5540
 2021-10-13 09:06:04 +00:00
TRT
fa9dd99f6e Fix missing trigger due to ETB with old state 2021-10-12 17:13:53 +02:00
Bug Hunter
09900d112f Merge branch 'TRT-master-patch-53744' into 'master' 
Update forge-gui/res/cardsfolder/r/rousing_of_souls.txt

See merge request core-developers/forge!5539
 2021-10-12 08:41:16 +00:00
Bug Hunter
fed312a862 Update forge-gui/res/cardsfolder/r/rousing_of_souls.txt 2021-10-12 08:40:56 +00:00
Michael Kamensky
53dd6d6933 Merge branch 'cleanup' into 'master' 
CardLists.filter(*).isEmpty -> Iterables.any

See merge request core-developers/forge!5538
 2021-10-11 20:14:42 +00:00
tool4EvEr
091cb077e9 Clean up 2021-10-11 21:42:38 +02:00
tool4EvEr
1280cb384a CardLists.filter(*).isEmpty -> Iterables.any 2021-10-11 20:20:32 +02:00
Michael Kamensky
e224d8790d Merge branch 'aifix' into 'master' 
staticDamagePrevention: fix check

See merge request core-developers/forge!5537
 2021-10-11 04:19:59 +00:00
Michael Kamensky
a855979d06 Merge branch 'counters' into 'master' 
CountersAi: skip for only one against Vorinclex

See merge request core-developers/forge!5536
 2021-10-11 04:19:30 +00:00
tool4EvEr
72d0de96e2 Improve poison combat checks 2021-10-10 23:57:02 +02:00
tool4EvEr
76f7fbbb08 staticDamagePrevention: fix check 2021-10-10 23:14:23 +02:00
tool4EvEr
f0a3d19d38 CountersAi: skip for only one against Vorinclex 2021-10-10 19:17:35 +02:00
Michael Kamensky
a5016c4afc Merge branch 'klaxnek-master-patch-24357' into 'master' 
Update es-ES.properties (UseLaserArrows and ReplaceCard)

See merge request core-developers/forge!5535
 2021-10-10 10:06:09 +00:00
klaxnek
a7fc9b0882 Update es-ES.properties (UseLaserArrows and ReplaceCard) 2021-10-10 08:27:34 +00:00
Michael Kamensky
e773868f18 Merge branch 'commander-tracker' into 'master' 
Add a tracker unfreeze-refreeze to State Based Action 903.9a to avoid Commander visualization issues

See merge request core-developers/forge!5533
 2021-10-10 04:53:02 +00:00
Michael Kamensky
77b46d0a84 Merge branch 'junk' into 'master' 
Fix Junk Winder

See merge request core-developers/forge!5534
 2021-10-10 04:46:41 +00:00
tool4EvEr
d359d6dc3c Fix Junk Winder 2021-10-10 01:05:05 +02:00
Michael Kamensky
a693083b05 - Minor refactoring to make the ugliness less ugly. 2021-10-09 16:51:59 +03:00
Michael Kamensky
ca71fa97cf - Remove unneeded variable. 2021-10-09 16:42:39 +03:00
Michael Kamensky
02de8ee70a - Add a tracker unfreeze-refreeze to State Based Action 903.9a to avoid Commander visualization issues. 2021-10-09 16:39:57 +03:00
Bug Hunter
e9b93e2215 Merge branch 'payfix' into 'master' 
canPlayAndPayFor: Improve check

See merge request core-developers/forge!5532
 2021-10-09 11:11:00 +00:00
tool4EvEr
53499296bc Improve check 2021-10-09 13:00:10 +02:00
Michael Kamensky
29f836344b Merge branch 'payfix' into 'master' 
canPlayAndPayFor: check for RaiseCost

Closes #871

See merge request core-developers/forge!5531
 2021-10-09 10:52:09 +00:00
Michael Kamensky
e99e535ee4 Merge branch 'twosat-master-patch-15209' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5530
 2021-10-09 10:51:38 +00:00
tool4EvEr
6789c29c6b canPlayAndPayFor: check for RaiseCost 2021-10-09 12:37:21 +02:00
Andreas Bendel
ab6fc6e2bf Update de-DE.properties 
translated UseLaserArrows and ReplaceCard
 2021-10-09 10:06:34 +00:00
Michael Kamensky
514cd61863 Merge branch 'gristAgain' into 'master' 
Card: fix Grist again

Closes #1985

See merge request core-developers/forge!5529
 2021-10-09 09:18:20 +00:00
Hans Mackowiak
93a0a83854 Card: fix Grist again 2021-10-09 10:37:36 +02:00
Michael Kamensky
029b72573b Merge branch 'bearer' into 'master' 
Bearer of the Heavens: fix crash

See merge request core-developers/forge!5528
 2021-10-09 04:17:34 +00:00
Michael Kamensky
3f810f3907 Merge branch 'changezoneall' into 'master' 
Allow additional reordering when moving cards together

See merge request core-developers/forge!5524
 2021-10-09 04:17:16 +00:00
tool4EvEr
04c1b2664f Clean up 2021-10-08 21:35:50 +02:00
tool4EvEr
9f7012f718 fix crash 2021-10-08 20:00:49 +02:00
Michael Kamensky
77f7966a2c Merge branch 'kamahl' into 'master' 
Kamahl's Sledge: fix crash

See merge request core-developers/forge!5527
 2021-10-08 17:54:43 +00:00
tool4EvEr
ffacead162 fix crash 2021-10-08 19:45:22 +02:00
tool4EvEr
8c3fe81669 Allow reordering of multiple attachments 2021-10-08 19:34:23 +02:00
tool4EvEr
421474b025 Fix for Null Profusion 2021-10-08 19:34:23 +02:00