external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,012 Commits 33 Branches 187 Tags
65291259ee265e8d1f1acf4dd1335c5da99ec1dc
Commit Graph

50012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
65291259ee Merge branch 'fix_get_total_shield_npe' into 'master' 
Fix NPE in getTotalPreventionShieldAmount

Closes #1827

See merge request core-developers/forge!4678
 2021-05-09 04:00:20 +00:00
Lyu Zong-Hong
d42ee05740 Fix NPE in getTotalPreventionShieldAmount 2021-05-09 07:46:04 +09:00
Michael Kamensky
c4bf644240 Merge branch 'refactor_static_prevention' into 'master' 
Refactor Damage Prevention - Step 2

See merge request core-developers/forge!4676
 2021-05-08 13:57:04 +00:00
Alumi
fe95ad2e11 Refactor Damage Prevention - Step 2 2021-05-08 13:57:03 +00:00
Michael Kamensky
644f80df57 Merge branch 'Williams-master-patch-45382' into 'master' 
Update Resale Promos.txt

See merge request core-developers/forge!4677
 2021-05-08 13:56:17 +00:00
Michael Kamensky
46e5c3233a Merge branch 'master' into 'master' 
Spoiled cards from MH2 and AFR

See merge request core-developers/forge!4674
 2021-05-08 13:56:08 +00:00
John
1da27edde6 Update Resale Promos.txt 2021-05-08 09:37:38 +00:00
Hythonia
75da8833dc Urza's Saga fix 2021-05-08 10:22:33 +02:00
Michael Kamensky
c40a132811 Merge branch 'refactor_prevention' into 'master' 
Refactor Damage Prevention - Step 1

See merge request core-developers/forge!4675
 2021-05-08 04:34:44 +00:00
Alumi
288267ae11 Refactor Damage Prevention - Step 1 2021-05-08 04:34:42 +00:00
Michael Kamensky
8f1a493327 Merge branch 'digreveal' into 'master' 
add support to Dig for Reveal$ False

See merge request core-developers/forge!4667
 2021-05-08 04:34:08 +00:00
Northmoc
f97adc325f simplify boolean function 2021-05-07 15:06:40 -04:00
Hythonia
8aa72e9397 MH2 and AFR 2021-05-07 19:45:55 +02:00
Michael Kamensky
5a1d5c0a2d Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!4670
 2021-05-07 13:11:36 +00:00
Churrufli
d98d2915ca Net Deck Archive Updates 2021-05-07 09:18:14 +02:00
Anthony Calosa
634dced5aa Merge branch 'master' into 'master' 
[Mobile] NullPointerException forge.toolbox.FChoiceList in showAlternate

See merge request core-developers/forge!4669
 2021-05-07 00:48:38 +00:00
Anthony Calosa
5ee94199bb Merge branch 'fixturns' into 'master' 
Fix multiplayer extra turns deadlock

See merge request core-developers/forge!4665
 2021-05-07 00:48:21 +00:00
Anthony Calosa
23422220ce [Mobile] update check 2021-05-07 08:43:40 +08:00
Sol
c141462432 Merge branch 'migrate-upcoming' into 'master' 
Migrate STX and other scripts to alpha folders

See merge request core-developers/forge!4668
 2021-05-07 00:43:28 +00:00
Anthony Calosa
41abf876a2 [Mobile] Fix NPE on FChoiceList.java 2021-05-07 08:42:17 +08:00
friarsol
28793abc7a Migrate STX and other scripts to alpha folders 2021-05-06 20:42:17 -04:00
Northmoc
1ce213004a add support to Dig for Reveal$ False 2021-05-06 17:23:45 -04:00
tool4EvEr
e223fa2002 Fix extra turns deadlock 2021-05-06 21:39:24 +02:00
Michael Kamensky
6fc542ff7d Merge branch 'clash' into 'master' 
ClashEffect: Fix Triggers

Closes #1821

See merge request core-developers/forge!4662
 2021-05-06 03:46:14 +00:00
Michael Kamensky
a1dd4ab0e9 Merge branch 'escalate' into 'master' 
Fix Escalate Cost

Closes #1819

See merge request core-developers/forge!4663
 2021-05-06 03:45:50 +00:00
tool4EvEr
1232f1be28 Fix Escalate Cost 2021-05-05 22:20:57 +02:00
tool4EvEr
738c7b968a Fix Triggers 2021-05-05 21:59:01 +02:00
Michael Kamensky
6fcdee14e4 Merge branch 'master' into 'master' 
Better AI for SpecificCard Auras

See merge request core-developers/forge!4660
 2021-05-05 17:47:31 +00:00
Hythonia
8c139ad044 Better AI for SpecificCard Auras, attempt 2 2021-05-05 15:47:43 +02:00
Michael Kamensky
122baba999 Merge branch 'master' into 'master' 
Update hyperlinks to point to the git.cardforge.org wiki pages instead of the old slightlymagic.net

See merge request core-developers/forge!4659
 2021-05-05 13:06:29 +00:00
Jimmy
27b12f5263 Update hyperlinks to point to the git.cardforge.org wiki pages instead of the old slightlymagic.net 2021-05-05 13:06:28 +00:00
Hythonia
a801424b35 Better AI for SpecificCard Auras 2021-05-05 14:48:40 +02:00
Hans Mackowiak
717a3eaede Merge branch 'fixstatic' into 'master' 
Fix StaticEffect missing changes from RemoveLandTypes

See merge request core-developers/forge!4655
 2021-05-05 10:41:02 +00:00
Anthony Calosa
0061f35b46 Merge branch 'master' into 'master' 
[Mobile] add Alternate Player Zone Layout (Landscape)

See merge request core-developers/forge!4658
 2021-05-05 03:53:49 +00:00
Anthony Calosa
ff20646a63 Merge branch 'escape' into 'master' 
Fix Escape Protocol

Closes #1817

See merge request core-developers/forge!4657
 2021-05-05 03:53:26 +00:00
Anthony Calosa
a5f4375ff2 Merge branch 'fixpay' into 'master' 
Fix playSpellAbilityWithoutPayingManaCost not checking amount modifiers

Closes #1816

See merge request core-developers/forge!4656
 2021-05-05 03:53:16 +00:00
Anthony Calosa
99b2cbb606 [Mobile] add Alternate Player Zone Layout (Landscape) 2021-05-05 11:34:36 +08:00
tool4EvEr
15e8eee373 Fix Escape Protocol 2021-05-04 20:38:03 +02:00
tool4EvEr
4cd2bc266a Fix playSpellAbilityWithoutPayingManaCost not checking amount modifiers 2021-05-04 20:30:56 +02:00
Michael Kamensky
92472c815a Merge branch 'partner2' into 'master' 
Partner with: better fix

See merge request core-developers/forge!4650
 2021-05-04 18:18:02 +00:00
Michael Kamensky
a246257eff Merge branch 'master' into 'master' 
Update simplified chinese translation

See merge request core-developers/forge!4652
 2021-05-04 18:17:55 +00:00
Michael Kamensky
b6bab552be Merge branch 'fix-auto-updater' into 'master' 
Fix AutoUpdater to point to the new snapshot location

See merge request core-developers/forge!4651
 2021-05-04 18:17:44 +00:00
Michael Kamensky
1afce00069 Merge branch 'controllers' into 'master' 
getAllPossibleAbilities: Restore old controllers

Closes #1806

See merge request core-developers/forge!4646
 2021-05-04 18:17:41 +00:00
Michael Kamensky
9ddfdf3638 Merge branch 'master' into 'master' 
Better AI logic for Boltlands and more

Closes #1573

See merge request core-developers/forge!4654
 2021-05-04 18:17:03 +00:00
tool4EvEr
06230ffa40 Fix StaticEffect missing changes from RemoveLandTypes 2021-05-04 19:21:47 +02:00
Hythonia
cac7ac2a8a Remove UnlessAI from shocklands and boltlands 2021-05-04 12:12:26 +02:00
Hythonia
fbbe4f5579 Magus of the Scroll AI 2021-05-04 10:34:38 +02:00
Hythonia
7d8373643f Remove leftover code 2021-05-04 09:25:35 +02:00
Hythonia
97bf88421e Better AI logic for Boltlands 2021-05-04 09:24:41 +02:00
CCTV-1
c067ab7cc9 translate new setting 2021-05-04 09:38:03 +08:00