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
48,264 Commits 31 Branches 187 Tags
e030e28d80ed48a8c778d0aedb51d71f75b18344
Commit Graph

48264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
92c6ab27a0 [Mobile] revert fillTriangle 2021-03-01 17:36:13 +08:00
Churrufli
8d3238cefa Net Deck Archive Legacy (Desktop implementation) 2021-03-01 09:34:17 +01:00
Anthony Calosa
276370fdec Merge branch 'master' into 'master' 
[Mobile] Add Scroll Indicator Option on Matchscreen

See merge request core-developers/forge!4055
 2021-03-01 05:53:55 +00:00
Anthony Calosa
0ed07d91cb [Mobile] Add Scroll Indicator on Matchscreen 2021-03-01 13:50:41 +08:00
Michael Kamensky
7664a62eb9 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-03-01 08:43:23 +03:00
Michael Kamensky
26a67bd44f Merge branch 'nexus' into 'master' 
Maskwood Nexus: Workaround for dependency on animated creatures

See merge request core-developers/forge!4049
 2021-03-01 04:32:40 +00:00
Michael Kamensky
b5a1887a1a Merge branch 'card-fixes' into 'master' 
Fix MayFlashSac

See merge request core-developers/forge!4052
 2021-03-01 04:32:07 +00:00
Michael Kamensky
a83f46927a Merge branch 'remove-svar' into 'master' 
Remove some incorrect uses of SVars

See merge request core-developers/forge!4047
 2021-03-01 04:31:32 +00:00
Michael Kamensky
2703ea20c4 Merge branch 'card-fixes-2' into 'master' 
Fix Caller of the Untamed AI

See merge request core-developers/forge!4053
 2021-03-01 04:31:19 +00:00
Sol
2f4961c75f Merge branch 'cardfixes' into 'master' 
Fix cards

See merge request core-developers/forge!4050
 2021-03-01 02:38:16 +00:00
Adam Pantel
2cee420928 Fix Caller of the Untamed AI 2021-02-28 21:19:29 -05:00
Adam Pantel
b7bdbcfe72 Fix MayFlashSac 2021-02-28 17:21:46 -05:00
tool4EvEr
ecbe7c586d Fix cards 2021-02-28 21:39:35 +01:00
tool4EvEr
dc40564385 Workaround for dependency on animated creatures 2021-02-28 20:42:38 +01:00
Michael Kamensky
804d20e15a Merge branch 'master' into 'master' 
Skip promo sets when determining starter Planeswalker options in Planar Conquest.

See merge request core-developers/forge!4048
 2021-02-28 18:29:04 +00:00
Michael Kamensky
8f2b268f75 Skip promo sets when determining starter Planeswalker options in Planar Conquest. 2021-02-28 18:29:04 +00:00
Michael Kamensky
13485decd9 - Fix imports 2021-02-28 21:28:26 +03:00
Michael Kamensky
074fdee408 - Skip promo sets when determining starter Planeswalker options in Planar Conquest. 2021-02-28 21:27:10 +03:00
Adam Pantel
1e95d19718 Remove incorrect uses of SVars 2021-02-28 12:37:43 -05:00
Michael Kamensky
25ad301ff3 Merge branch 'master' into 'master' 
Better AI logic spec for Niv-Mizzet, the Firemind

See merge request core-developers/forge!4046
 2021-02-28 12:08:26 +00:00
Michael Kamensky
3cfe3b1920 - Better AI logic spec for Niv-Mizzet, the Firemind 2021-02-28 15:07:54 +03:00
Anthony Calosa
07baab466a Merge branch 'kevlahnota-master-patch-32824' into 'master' 
Update AbstractGuiGame.java

See merge request core-developers/forge!4045
 2021-02-28 10:09:54 +00:00
Anthony Calosa
58bc169b6e Update AbstractGuiGame.java 2021-02-28 10:09:42 +00:00
Michael Kamensky
9e3f7a72e2 Merge branch 'master' into 'master' 
Update some Default AI profile preferences

See merge request core-developers/forge!4043
 2021-02-28 04:48:25 +00:00
Michael Kamensky
0701bb0097 - Update some Default AI profile preferences. 2021-02-28 07:47:38 +03:00
Michael Kamensky
08351c2e4b Merge branch 'master' into 'master' 
Fix dev features "Remove...", "Exile..."

Closes #1746

See merge request core-developers/forge!4042
 2021-02-28 04:41:39 +00:00
Michael Kamensky
50425bf68e - Rewrite Dev features to use getGui().many correctly. 
- Revert the ListChooser thing for now.
 2021-02-28 07:40:21 +03:00
Michael Kamensky
dc26f99309 - Fix ListChooser to accept -1 as a valid max choice number (used e.g. by Dev Mode) 2021-02-28 07:29:31 +03:00
Michael Kamensky
68bbfabc56 Merge branch 'fixMana' into 'master' 
Fix mana restriction check for subabilities

Closes #1743

See merge request core-developers/forge!4041
 2021-02-28 03:53:31 +00:00
tool4EvEr
4226cd21d2 Fix mana restriction check for subabilities 2021-02-27 21:00:36 +01:00
Michael Kamensky
08bd2df74f Merge branch 'master' into 'master' 
Better way to simulate counters in Crawling Barrens logic

See merge request core-developers/forge!4040
 2021-02-27 17:35:52 +00:00
Michael Kamensky
3c4f797234 - Better way to simulate counters in Crawling Barrens logic 2021-02-27 20:35:14 +03:00
Michael Kamensky
89547fc247 Merge branch 'master' into 'master' 
Added AI logic for Crawling Barrens

See merge request core-developers/forge!4039
 2021-02-27 17:22:41 +00:00
Michael Kamensky
cbb96e1878 - Tweak the logic a little. 2021-02-27 20:22:13 +03:00
Michael Kamensky
876457047e - Added logic for Crawling Barrens 
- Minor fix in ChooseGenericEffectAi
 2021-02-27 20:13:52 +03:00
Michael Kamensky
b50f30d27e Merge branch 'updateES' into 'master' 
Update es-ES.properties and possesive translation

See merge request core-developers/forge!4038
 2021-02-27 15:13:37 +00:00
klaxnek
eef0d6eac2 Removed done TODO from es-ES.properties 2021-02-27 16:08:10 +01:00
klaxnek
d287e81d5e Update es-ES.properties and possesive translation 2021-02-27 16:05:37 +01:00
Hans Mackowiak
aeb868d427 InputSelectTargets: fix use of isWithSameCardType for GUI 2021-02-27 15:31:35 +01:00
Michael Kamensky
85bd48ddfb Merge branch '1742-morph-not-checking-restriction-before-turning-face-up' into 'master' 
Resolve "Morph not checking restriction before turning face up"

Closes #1742

See merge request core-developers/forge!4037
 2021-02-27 10:57:20 +00:00
Hans Mackowiak
2280d02617 SpellAbilityRestriction: If the permanent wouldn’t have a morph cost if it were face up, it can’t be turned face up this way. 2021-02-27 11:53:35 +01:00
Hans Mackowiak
7e9ea10bb0 AbstractGuiGame: have many call choices when max is <= 1 2021-02-27 10:57:29 +01:00
Hans Mackowiak
3b1096410d fix trigger desc elder_gargaroth 2021-02-27 10:56:12 +01:00
Hans Mackowiak
d2f55c7d6f fix Trickster-God's Heist 2021-02-27 09:54:48 +01:00
Michael Kamensky
f10401c9b6 Merge branch 'master' into 'master' 
Minor ChangeZoneAi tweak

See merge request core-developers/forge!4035
 2021-02-27 07:22:41 +00:00
Michael Kamensky
2f72b3de0f - Unneeded code since we're already in the "own stuff" branch 2021-02-27 10:22:04 +03:00
Michael Kamensky
aa474a7e88 Merge branch 'master' into 'master' 
Further tweak ChangeZoneAi

See merge request core-developers/forge!4034
 2021-02-27 07:15:12 +00:00
Michael Kamensky
ffb7b6984d - Further tweak ChangeZoneAi 2021-02-27 10:14:37 +03:00
Michael Kamensky
f02e16e392 Merge branch 'master' into 'master' 
Improve ChangeZoneAI for exiling any number of stuff from the battlefield

See merge request core-developers/forge!4033
 2021-02-27 07:11:46 +00:00
Michael Kamensky
2081e9d23a - A little tweak to the ChangeZoneAi exile any number logic 2021-02-27 10:11:20 +03:00