external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,548 Commits 31 Branches 187 Tags
73b1cb15c39e57a8cb235127eeec30a4634c53d2
Commit Graph

7475 Commits

Author SHA1 Message Date
tool4EvEr
cb097e642c CostDraw merging 2022-04-06 11:40:05 +02:00
Michael Kamensky
e5eb263f2f Merge branch 'countersfix' into 'master' 
Fix cumulative upkeep counters

See merge request core-developers/forge!6488
 2022-04-06 04:39:40 +00:00
Michael Kamensky
22ce529d12 Merge branch 'rivet' into 'master' 
SNC: Riveteers Charm and support

See merge request core-developers/forge!6484
 2022-04-06 04:37:48 +00:00
Tim Mocny
c3b5e2e270 SNC: Riveteers Charm and support 2022-04-06 04:37:45 +00:00
Michael Kamensky
b18be765e2 Merge branch 'millsdfix' into 'master' 
MillEffect remove unneeded StackDesc line

See merge request core-developers/forge!6491
 2022-04-06 04:36:12 +00:00
Northmoc
eaf5a993d1 MillEffect remove unneeded StackDesc line 2022-04-05 23:33:07 -04:00
tool4EvEr
56e9a1259c Copy ReduceCost 2022-04-05 20:22:19 +02:00
tool4EvEr
758825a4f6 Fix foretell + additional costs 2022-04-05 20:22:18 +02:00
Michael Kamensky
896490bf25 Merge branch 'resetAttack' into 'master' 
Don't clear attackedThisTurn too early

See merge request core-developers/forge!6486
 2022-04-05 18:01:11 +00:00
TRT
5d25939070 Update merge logic 2022-04-05 16:14:26 +02:00
TRT
c26bf7a60e Fix cumulative upkeep counters 2022-04-05 15:31:40 +02:00
TRT
500789e42c Update check 2022-04-05 14:51:09 +02:00
TRT
21043e50d5 Fix Charm NPE 2022-04-05 13:41:17 +02:00
TRT
806922dafa Cleanup todo (actually fixes corner case with Chandra's Incinerator) 2022-04-05 11:48:52 +02:00
TRT
ce1cacbaee Don't clear attackedThisTurn too early 2022-04-05 11:36:32 +02:00
Michael Kamensky
311002069a Merge branch 'kevlahnota-master-patch-16223' into 'master' 
[Mobile] Fix Mobile GUI Illegal cast

Closes #2127

See merge request core-developers/forge!6470
 2022-04-04 14:42:48 +00:00
Anthony Calosa
9248d06141 only show eligible players on mayplay ability text 2022-04-04 13:53:40 +00:00
Anthony Calosa
493f3f25f8 fix as foretold + revelation illegal cast 2022-04-04 00:48:49 +00:00
Michael Kamensky
d9f9a86ed4 Merge branch 'tgtcap' into 'master' 
AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType

See merge request core-developers/forge!6472
 2022-04-02 04:55:06 +00:00
Tim Mocny
2e047ee410 AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType 2022-04-02 04:55:06 +00:00
Sol
93f4701592 Fix unused import 2022-04-01 18:21:51 +00:00
Anthony Calosa
467c51cadd update mayplay 2022-04-01 14:33:54 +00:00
Anthony Calosa
041fbfe523 Update check to viewable cards 2022-04-01 13:26:23 +00:00
Anthony Calosa
0f8286ec8f Merge branch 'NewMaster' into 'master' 
[Mobile] update PlayEffect

See merge request core-developers/forge!6467
 2022-04-01 11:27:44 +00:00
Anthony Calosa
746a2ce568 remove unnecessary methods 2022-04-01 16:43:05 +08:00
TRT
69f3859c45 Fix Shambling Ghast NPE 2022-04-01 10:19:29 +02:00
Anthony Calosa
2516fa6f94 Merge remote-tracking branch 'core/master' 2022-04-01 11:16:25 +08:00
Michael Kamensky
f2a51a98b6 Merge branch 'hasManaAbility' into 'master' 
fix hasManaAbility

Closes #2130

See merge request core-developers/forge!6465
 2022-04-01 03:04:38 +00:00
Anthony Calosa
fa05ab7373 Merge remote-tracking branch 'core/master' 2022-04-01 10:50:24 +08:00
Anthony Calosa
218caf8b33 Update check 2022-04-01 07:08:36 +08:00
tool4EvEr
88c7e87095 Use getOverridingAbility 2022-03-31 19:53:32 +02:00
Michael Kamensky
c9b1a8d904 Merge branch 'demonstrate' into 'master' 
Demonstrate: fix copy order

Closes #1957

See merge request core-developers/forge!6463
 2022-03-31 15:02:29 +00:00
TRT
e3596b279e Clean up 2022-03-31 14:28:57 +02:00
TRT
3d8a008378 fix hasManaAbility 2022-03-31 10:31:37 +02:00
TRT
ef00f41bcc Demonstrate: fix copy order 2022-03-31 09:40:17 +02:00
Michael Kamensky
226c91636e Merge branch 'netplayFIX' into 'master' 
Fix hidden cards when tutoring on client side

See merge request core-developers/forge!6455
 2022-03-30 12:22:49 +00:00
tool4EvEr
30113522e0 Slight improvement to mustBlockAnAttacker 2022-03-29 19:39:59 +02:00
tool4EvEr
1ae39dd270 Fix hidden cards when tutoring on client side 2022-03-28 23:46:06 +02:00
Michael Kamensky
d0d08573f5 [maven-release-plugin] prepare for next development iteration 2022-03-28 17:48:30 +03:00
Michael Kamensky
31144ad505 [maven-release-plugin] prepare release forge-1.6.49 2022-03-28 17:48:16 +03:00
Bug Hunter
e9c2f49a2d Fix UntilEndOfCombat 2022-03-28 14:18:54 +00:00
Michael Kamensky
4e340ac286 Merge branch 'sac_sd' into 'master' 
SacrificeEffect stackDesc - uncap if valid is a CoreType

See merge request core-developers/forge!6449
 2022-03-28 04:22:47 +00:00
Northmoc
f863f6e534 SacrificeEffect stackDesc - uncap if valid is a CoreType 2022-03-27 14:38:29 -04:00
Bug Hunter
c0ede21c31 declareAttackers fixes 2022-03-26 00:36:17 +00:00
Michael Kamensky
933b147eb4 Merge branch 'clb_abd' into 'master' 
CLB: Ancient Brass Dragon & support

See merge request core-developers/forge!6440
 2022-03-25 10:40:04 +00:00
Tim Mocny
ae8d4c38c4 CLB: Ancient Brass Dragon & support 2022-03-25 10:40:04 +00:00
TRT
f7d38a7f75 Fix bad refactor 2022-03-25 08:16:28 +01:00
Anthony Calosa
47fe7d4df1 Merge branch 'combatfix' into 'master' 
AttackRequirement: don't filter out attackers with costs too early

Closes #2118

See merge request core-developers/forge!6434
 2022-03-25 04:42:22 +00:00
Bug Hunter
0a2982ad26 assignAttackersDamage fixes 2022-03-25 04:40:17 +00:00
Michael Kamensky
8a5a39e6c1 Merge branch 'yneo_inch' into 'master' 
YNEO: Inchblade Companion and support

See merge request core-developers/forge!6423
 2022-03-24 13:38:42 +00:00