external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,212 Commits 32 Branches 187 Tags
ecb47ad8484dbd92d1035e86fef96b99feaf2567
Commit Graph

45212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
4aca6ed3fa Merge branch 'master' into 'master' 
Fix a NPE in the AI code related to Unless cost

See merge request core-developers/forge!3048
 2020-08-04 18:45:47 +00:00
Michael Kamensky
4a97e593e9 - Fix NPE in the Unless cost AI. 2020-08-04 21:09:09 +03:00
Michael Kamensky
e19925470d Merge branch 'CurrentBrawlMetagame' into 'master' 
Current brawl metagame

See merge request core-developers/forge!3047
 2020-08-04 10:05:44 +00:00
Michael Kamensky
920d4c0e77 Merge branch 'fix_reg_exp' into 'master' 
fix regular expression

See merge request core-developers/forge!3046
 2020-08-02 15:38:35 +00:00
CCTV-1
03ec616b77 fix regular expressions that do not take effect 2020-08-02 21:34:51 +08:00
Michael Kamensky
bd1b87401a Merge branch 'costFlipCoinRefactor' into 'master' 
Refactor how human pays for FlipCoin part

See merge request core-developers/forge!3041
 2020-08-02 10:45:21 +00:00
Michael Kamensky
b3e66af66a Merge branch 'master' into 'master' 
DestroyAllAi: check for the outcome from DB subabilities (fixes Shatter the Sky logic)

See merge request core-developers/forge!3045
 2020-08-02 10:41:44 +00:00
Michael Kamensky
e2b94c6d1e Merge branch '1534-activating-sorin-imperious-bloodlord-to-deal-damage-to-the-opponent-s-thorn-lieutenant-doesn-t' into 'master' 
Resolve "Activating Sorin, Imperious Bloodlord to deal damage to the opponent's Thorn Lieutenant doesn't produce a token"

Closes #1534

See merge request core-developers/forge!3044
 2020-08-02 10:19:48 +00:00
Michael Kamensky
602fd96a6d - DestroyAllAi: check for the outcome from DB subabilities (fixes Shatter the Sky logic) 2020-08-02 13:17:45 +03:00
Hans Mackowiak
f3145e4fc8 TriggerBecomesTarget: fix ValidSource checking for SpellAbility too 2020-08-02 08:41:45 +02:00
Hans Mackowiak
45b6a0b0a6 Refactor how human pays for FlipCoin part 2020-08-02 08:21:33 +02:00
Sol
2d5c94aac8 Update primordial_mist.txt 2020-08-02 02:04:23 +00:00
Michael Kamensky
6d7a3bde75 Merge branch 'master' into 'master' 
Tweak Sarkhan Vol's PlayMain1 AI hint.

See merge request core-developers/forge!3043
 2020-08-01 19:29:29 +00:00
Michael Kamensky
7778da8d7a Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-08-01 16:25:02 +03:00
Michael Kamensky
cd9b25e2dd Merge branch 'substractAllCounterModificationException' into 'master' 
CountersRemove: fix ConcurrentModificationException when removing all counters

See merge request core-developers/forge!3042
 2020-08-01 13:21:32 +00:00
Michael Kamensky
2b1a8735e5 - Tweak Sarkhan Vol's PlayMain1 AI hint. 2020-08-01 16:20:13 +03:00
Hans Mackowiak
99c0f0a939 CountersRemove: fix ConcurrentModificationException when removing all counters 2020-08-01 12:46:47 +02:00
Michael Kamensky
50193447f9 Revert "Merge branch '2xm' into 'master'" 
This reverts commit 2f71beb001.
 2020-07-31 20:54:51 +02:00
Michael Kamensky
2f71beb001 Merge branch '2xm' into 'master' 
Initial Double Masters support

See merge request core-developers/forge!3040
 2020-07-31 18:53:02 +00:00
Churrufli
e7fadd4397 Adding Current Brawl Metagame 
Adding Current Brawl Metagame
 2020-07-31 20:49:53 +02:00
Churrufli
fc3ca506d5 Merge remote-tracking branch 'Developers/master' 2020-07-31 19:32:32 +02:00
Northmoc
2e844843a1 Initial Double Masters support 2020-07-31 09:11:26 -04:00
Michael Kamensky
bb63bcfeb7 Merge branch 'TriggerAttackerBlockedOnce' into 'master' 
Trigger: AttackerBlockedOnce for Neyith

See merge request core-developers/forge!3039
 2020-07-31 06:26:56 +00:00
Hans Mackowiak
419d827ad0 Trigger: AttackerBlockedOnce for Neyith 2020-07-31 07:28:59 +02:00
swordshine
1aa091bdf6 Merge branch 'branchingfix' into 'master' 
branching_evolution.txt R:Event wrong param fix

Closes #1532

See merge request core-developers/forge!3038
 2020-07-29 12:28:31 +00:00
Northmoc
0c10cfc510 branching_evolution.txt R:Event wrong param fix 2020-07-29 07:31:32 -04:00
swordshine
c00b1eebbc Merge branch 'see_bottom' into 'master' 
see_the_truth.txt - rest go to bottom of library

See merge request core-developers/forge!3037
 2020-07-29 03:55:28 +00:00
Northmoc
249e4aa5ba see_the_truth.txt - rest go to bottom of library 2020-07-28 23:02:24 -04:00
Michael Kamensky
67603dc6ed Merge branch 'giantopp' into 'master' 
Better - giant_opportunity.txt with ConditionDefined$ RememberedLKI

See merge request core-developers/forge!3036
 2020-07-28 04:44:00 +00:00
Northmoc
8aa64ee280 giant_opportunity.txt with ConditionDefined$ RememberedLKI 2020-07-27 19:05:49 -04:00
Michael Kamensky
4054cb6431 Merge branch 'giantopp' into 'master' 
giant_opportunity.txt with RememberedLKI

Closes #1526

See merge request core-developers/forge!3035
 2020-07-27 20:25:19 +00:00
Northmoc
9fc57f8ed5 giant_opportunity.txt with RememberedLKI 2020-07-27 13:39:30 -04:00
Michael Kamensky
4a1fc9cbc2 Merge branch 'master' into 'master' 
Fixing Possibility Storm - War of the Spark #00 (Card Preview Puzzle), Tishana...

See merge request core-developers/forge!3034
 2020-07-27 03:32:28 +00:00
Nigol
8883c7dbb3 Fixing Possibility Storm - War of the Spark #00 (Card Preview Puzzle), Tishana should not be in the graveyard, and the 4 cards should be in the aihand not the library 2020-07-26 18:44:18 -04:00
Michael Kamensky
f2b4f0fd7b Merge branch 'master' into 'master' 
Fix NPE in CostPartWithList (will need further rework / generalization later)

See merge request core-developers/forge!3033
 2020-07-26 16:43:40 +00:00
Agetian
55a10bccb7 - Fix NPE in CostPartWithList 2020-07-26 19:36:50 +03:00
Michael Kamensky
47e683b855 Merge branch 'patch-9' into 'master' 
Update net-decks.txt adding Current Penny Dreadful Metagame

See merge request core-developers/forge!3032
 2020-07-25 14:21:49 +00:00
Churrufli
7845383790 Update net-decks.txt adding Current Penny Dreadful Metagame 2020-07-25 07:14:23 +00:00
Michael Kamensky
b8beecbc49 Merge branch 'patch-8' into 'master' 
Update net-decks.txt

See merge request core-developers/forge!3031
 2020-07-24 16:15:29 +00:00
Churrufli
c2d67a3550 Update net-decks.txt 
Removed current MTGA Decks (that information is no longer available)
added Current Historic Metagame (updated in the server)
Pioneer as a Metagame (not as "Decks")
 2020-07-24 12:07:20 +00:00
Michael Kamensky
c1bbef9b3a Merge branch 'fights-once' into 'master' 
Add Neyith of the Dire Hunt (with the triggers support)

See merge request core-developers/forge!3030
 2020-07-23 19:50:46 +00:00
Agetian
335ea61822 - Combat can't be null for the BlockersDeclared trigger (hopefully, anyway). 2020-07-23 18:37:43 +03:00
Agetian
7db9a7b86c - Rewrite FightOnce trigger to use a list. 
- Add support to test for a valid blocked attacker in TriggerBlockersDeclared.
- Add Neyith of the Dire Hunt.
 2020-07-23 18:34:19 +03:00
Michael Kamensky
3bc492f409 Merge branch 'jushi' into 'master' 
fix Kamigawa flip card

See merge request core-developers/forge!3029
 2020-07-23 15:02:03 +00:00
Agetian
ad4123c651 - "Whenever one or more .... fights" (e.g. Neyith) 2020-07-23 17:44:55 +03:00
Northmoc
beb34500aa fix Kamigawa flip card 2020-07-23 10:02:23 -04:00
Michael Kamensky
78a303e4df Merge branch 'master' into 'master' 
Simple Revenge of Ravens combat AI

See merge request core-developers/forge!3028
 2020-07-23 06:52:10 +00:00
Agetian
266fcd392d - Tweak the values for the algorithm a bit. 2020-07-23 09:44:37 +03:00
Agetian
3c23144faf - Account for possible life loss scenarios. 2020-07-23 09:42:41 +03:00
Agetian
8269d13b0f - Simple Revenge of Ravens combat AI 2020-07-23 09:14:34 +03:00