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
44,177 Commits 31 Branches 187 Tags
aede20c610ef9ae6f7c20545061a8844d427fc8c
Commit Graph

44177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
1218786b3e Merge branch 'master' into 'master' 
A basic AI logic hook for Timmerian Fiends

See merge request core-developers/forge!2617
 2020-03-14 16:45:51 +00:00
Agetian
62a1ee6d3d - A basic AI logic hook for Timmerian Fiends 2020-03-14 19:23:37 +03:00
Michael Kamensky
64f17b49fe Merge branch 'timmerian' into 'master' 
Timmerian Fiends!

Closes #116

See merge request core-developers/forge!2610
 2020-03-14 15:48:57 +00:00
Tim Mocny
0d939da60d Timmerian Fiends! 2020-03-14 15:48:56 +00:00
Michael Kamensky
cc321b1b2e Merge branch 'fixes' into 'master' 
Fixes

Closes #1291, #1317, and #1322

See merge request core-developers/forge!2615
 2020-03-14 15:42:36 +00:00
Michael Kamensky
71bf43b63a Merge branch 'glyphre' into 'master' 
Glyph of Reincarnation!

Closes #64

See merge request core-developers/forge!2616
 2020-03-14 15:41:43 +00:00
Tim Mocny
2d7840aa7d Glyph of Reincarnation! 2020-03-14 15:41:43 +00:00
Anthony Calosa
a1be9d0278 Fix Inventory View for Cards without Card Image 2020-03-14 13:34:31 +08:00
Anthony Calosa
8a18f815b4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-14 10:42:07 +08:00
Sol
2b529a07c2 Merge branch '1323-numberformatexception-for-input-string-2secondary-true' into 'master' 
Resolve "NumberFormatException: For input string: "2Secondary$ True""

Closes #1323

See merge request core-developers/forge!2613
 2020-03-14 00:55:55 +00:00
Jamin W. Collins
c0349d87fb implement and use new PredicateCard 
This fixes the THB and ELD draft, possibly others

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:45:36 -06:00
Jamin W. Collins
c488ab4772 increase maximal heap size to 4096m 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Jamin W. Collins
d83f8deb7a remove vestigial scripts 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Jamin W. Collins
f1f480d16a explicitly set the encoding to UTF-8 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Hans Mackowiak
a1ffa625e1 CardFactoryUtil: fix Saga 2020-03-13 20:34:34 +00:00
Anthony Calosa
d7e38f7fd8 Format Stack Text 
(Should be cleaner)
 2020-03-14 03:05:29 +08:00
Anthony Calosa
a5683d4f12 Adjust Card Name & Ability Icons Ordering 2020-03-14 03:02:15 +08:00
Sol
cb1d4b7904 Merge branch 'updatertranslation' into 'master' 
Auto Updater: Add missing translation strings

See merge request core-developers/forge!2598
 2020-03-13 15:50:09 +00:00
Michael Kamensky
c6def2cc5b Merge branch 'Hanmac-Saga-Trigger' into 'master' 
Sage Trigger Combined

See merge request core-developers/forge!2609
 2020-03-13 15:11:05 +00:00
Hans Mackowiak
81dc9fecba Sage Trigger Combined 2020-03-13 15:11:05 +00:00
Sol
4629817268 Merge branch '12Mar20' into 'master' 
the_triumph_of_anax.txt typo

See merge request core-developers/forge!2607
 2020-03-12 22:11:37 +00:00
Tim Mocny
b6bbe3d18b the_triumph_of_anax.txt typo 2020-03-12 22:11:37 +00:00
Hans Mackowiak
b437db8ffa Merge branch 'tinyleadersPWcomm' into 'master' 
Make Planeswalkers possible for Tiny Leaders

Closes #1311

See merge request core-developers/forge!2606
 2020-03-12 16:00:04 +00:00
Tim Mocny
3be58fee75 Make Planeswalkers poss commander for Tiny Leaders, cleanup Brawl commander syntax 
Legendary Planeswalkers only

Clean up Commander syntax for TL and Brawl
 2020-03-12 16:00:03 +00:00
Michael Kamensky
fe09671795 Merge branch 'etbCounterManaPaid' into 'master' 
ManaPart: use Effect for enter the battlefield when mana was spent

See merge request core-developers/forge!2604
 2020-03-12 13:34:27 +00:00
Hans Mackowiak
9f35da4698 ManaPart: use Effect for enter the battlefield when mana was spent 2020-03-12 13:34:27 +00:00
Michael Kamensky
3c5a62056b Merge branch 'edfix9mar' into 'master' 
Various fixes

See merge request core-developers/forge!2599
 2020-03-12 05:40:05 +00:00
Tim Mocny
43a38e3c6d Various fixes 2020-03-12 05:40:05 +00:00
Michael Kamensky
f5a89afa93 Merge branch 'newBranch' into 'master' 
remade border to have thin line edges

See merge request core-developers/forge!2603
 2020-03-12 05:38:32 +00:00
Anthony Calosa
7a49dd28e1 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-12 12:16:20 +08:00
Sol
d14f20bc43 Merge branch 'collector_number' into 'master' 
handle more complex imageKey parsing

See merge request core-developers/forge!2602
 2020-03-12 02:56:33 +00:00
Anthony Calosa
14a40e493f Try first variant art for .fullborder images 
(ie WAR variant has alternate art)
 2020-03-12 08:54:08 +08:00
Anthony Calosa
9b8e63501a Reduce whiteborder sides 2020-03-11 22:21:48 +08:00
Anthony Calosa
61097e9f80 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-11 22:13:42 +08:00
Sol
404ce34076 Merge branch 'mar9banres' into 'master' 
Brawl, Legacy, Modern bans

See merge request core-developers/forge!2605
 2020-03-11 13:08:44 +00:00
Northmoc
e546b6a689 Brawl, Legacy, Modern bans 2020-03-11 09:01:11 -04:00
Anthony Calosa
7e31e15ead Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-11 16:52:34 +08:00
Anthony Calosa
62d7824155 remade border to have thin line edges 
(simulate card edges)
 2020-03-11 14:52:21 +08:00
Jamin W. Collins
8c5a90d6e9 handle more complex imageKey parsing 
Should now be able to handle:
c:Town Gossipmonger|SOI|1$alt

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-10 21:23:29 -06:00
Sol
9345ff6725 Merge branch 'cardfixes' into 'master' 
Card Fixes: Settle the Wreckage, Cavalier of Dawn

See merge request core-developers/forge!2601
 2020-03-11 01:25:13 +00:00
Michael Kamensky
c45573ff2e Merge branch 'newBranch' into 'master' 
Minor Visual Improvement & Update Android target SDK

See merge request core-developers/forge!2600
 2020-03-10 18:10:14 +00:00
Adam Pantel
55300347ce Fix Settle the Wreckage, Cavalier of Dawn 2020-03-10 12:46:51 -04:00
Anthony Calosa
c85584445e update project.properties 2020-03-10 17:16:08 +08:00
Anthony Calosa
ceeb5d623f Increase Android target SDK so it will work with Android 10. 
Need to download SDK 26 to compile.

(Just tested this on Android 6 and Android 9, it works, but need to test the change for Android 5 and Android 10, for Android 10, It needs to turn the storage permission settings manually since the project don't have running permission setup currently)
 2020-03-10 16:53:59 +08:00
Anthony Calosa
1f4eff8b1c Adjust CroppedArea for Non Modern Card Frames 
(fullborder images)
 2020-03-10 16:45:08 +08:00
Anthony Calosa
41af869d3c Update Font 2020-03-10 16:35:39 +08:00
Michael Kamensky
2747d93e4c Merge branch 'fixXonCancel' into 'master' 
GameAction: refactor setting CastSA

Closes #1320

See merge request core-developers/forge!2585
 2020-03-10 06:35:34 +00:00
Hans Mackowiak
5c9251e295 SpellAbility: adding an Announce needs to be to originalMapParams too 2020-03-10 07:13:04 +01:00
Hans Mackowiak
fa67ee73a5 Card: cleanup multikicker values 2020-03-10 07:13:04 +01:00
Hans Mackowiak
e1659a4539 Combat: use lkiCase only if blocker itself is an lki 2020-03-10 07:13:04 +01:00