external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,905 Commits 31 Branches 187 Tags
bd7da33e779cbc1c35939bb7368e302b10a4918c
Commit Graph

37905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
bd7da33e77 - Fix logic in DamageDealAi, update logic for Chandra, Fire of Kaladesh. 2018-06-22 12:04:08 +03:00
Michael Kamensky
7dc6573513 Merge branch 'flingCopyFix' into 'master' 
SpellAbility: do not reset the PaidHash for copied spells

Closes #526

See merge request core-developers/forge!663
 2018-06-22 07:21:49 +00:00
Hanmac
59c95f2ccf SpellAbility: do not reset the PaidHash for copied spells 2018-06-22 08:22:25 +02:00
Michael Kamensky
ce2841b05e Merge branch 'migrate_global_series' into 'master' 
Migrate upcoming for Global Series set

See merge request core-developers/forge!661
 2018-06-21 03:39:48 +00:00
Chris H
bdc44a4395 Migrate upcoming 2018-06-20 22:02:07 -04:00
Hans Mackowiak
f5c119e27c Merge branch 'playerProtection' into 'master' 
Player: fixed Protection from everything

See merge request core-developers/forge!660
 2018-06-20 19:10:03 +00:00
Hanmac
785c8ecdd8 Player: fixed Protection from everything 2018-06-20 20:03:26 +02:00
Michael Kamensky
58275457de Merge branch 'dom-puzzles' into 'master' 
Added puzzle PS_DOM8.

See merge request core-developers/forge!659
 2018-06-19 06:11:38 +00:00
Agetian
fb7d3115ce - Added puzzle PS_DOM8. 2018-06-19 09:10:43 +03:00
Michael Kamensky
c96d9c2bf7 Merge branch 'damageUpdates' into 'master' 
Damage updates

Closes #579, #582, #583, and #584

See merge request core-developers/forge!657
 2018-06-18 18:40:09 +00:00
Michael Kamensky
0dff0c488b Merge branch 'master' into 'master' 
CardThemedDeckBuilder: disable debug logging by default

See merge request core-developers/forge!658
 2018-06-18 09:42:09 +00:00
Agetian
a740bc262e - CardThemedDeckBuilder: disable debug logging by default. 2018-06-18 12:40:02 +03:00
Hanmac
8ab986f2e9 updated Flaming Gambit 2018-06-18 08:23:59 +02:00
Hanmac
1bbe8cd17c cards: more damage map for cards that deal X to something and Y to something else 2018-06-18 08:18:38 +02:00
Hanmac
2169e15742 cards: unify 'damage dealt this way' cards 2018-06-18 07:29:06 +02:00
Michael Kamensky
fa590b5eb1 Merge branch 'master' into 'master' 
Fixed a bug written on Forum.

See merge request core-developers/forge!650
 2018-06-17 09:11:51 +00:00
Michael Kamensky
196ab76e30 Merge branch 'master' into 'master' 
Fix compile.

See merge request core-developers/forge!656
 2018-06-17 08:23:17 +00:00
Agetian
8329a0f653 - Fix compile. 2018-06-17 11:22:50 +03:00
Michael Kamensky
8b1c9e0b7d Merge branch 'deckgenerationbugfixes' into 'master' 
Deckgenerationbugfixes

See merge request core-developers/forge!655
 2018-06-17 08:21:10 +00:00
maustin
b9d18fd38c Merge remote-tracking branch 'Austin/deckgenerationbugfixes' into deckgenerationbugfixes 2018-06-17 09:11:03 +01:00
austinio7116
30656d38c4 Removing debugging flag 2018-06-17 09:10:09 +01:00
austinio7116
b9e8528029 Fixed bug where adding random cards to deck would mess up land count - also shuffling random cards before adding. This code is only executed for rare cases where the learnt archetypes have a very tight cardlist, so if cards are non-AI playable or get randomly removed from the pool, the generator has a way to validly fill the gap. 2018-06-17 08:33:10 +01:00
austinio7116
cb082f1e31 Updated modern LDA data now run with identical parameters to the other formats. 
(cherry picked from commit f207dc9)
 2018-06-17 08:33:10 +01:00
Michael Kamensky
f270e4d9cd Merge branch 'master' into 'master' 
Fix a check in MayPlay not properly accounting for some data after LKI copy.

See merge request core-developers/forge!654
 2018-06-17 07:12:19 +00:00
Agetian
ba5b48cb2b Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-06-17 10:11:13 +03:00
Agetian
407616c515 - Fixed Gonti, Lord of Luxury not allowing to cast exiled cards (and other similar issues, potentially) 2018-06-17 10:10:37 +03:00
austinio7116
29ae8f5446 Fixed bug where adding random cards to deck would mess up land count - also shuffling random cards before adding. This code is only executed for rare cases where the learnt archetypes have a very tight cardlist, so if cards are non-AI playable or get randomly removed from the pool, the generator has a way to validly fill the gap. 2018-06-17 07:30:41 +01:00
austinio7116
2cc8166583 Updated modern LDA data now run with identical parameters to the other formats. 
(cherry picked from commit f207dc9)
 2018-06-17 07:00:34 +01:00
Michael Kamensky
85bd53b0c6 Merge branch 'trickster' into 'master' 
Remove Abilities and */* creatures

Closes #562

See merge request core-developers/forge!649
 2018-06-17 05:45:41 +00:00
yataka\pochiel
7d04f015f4 Fixed a bug written on Forum. 
https://www.slightlymagic.net/forum/viewtopic.php?f=52&t=6333&sd=d&start=15#p225086.
 2018-06-17 02:08:57 +09:00
Hanmac
51fd3f7647 StaticAbility: CDA PT use timestamp 2018-06-16 11:16:25 +02:00
Hanmac
ba362ede36 CardFace: allow to parse PT with * 2018-06-16 11:13:00 +02:00
Michael Kamensky
193336f5f3 Merge branch 'ldaarchetypedeckgenerationchanges' into 'master' 
Archetype based deck generation - Legacy and Vintage

See merge request core-developers/forge!648
 2018-06-16 03:57:44 +00:00
austinio7116
5cf63692a8 Fixed legacy and vintage deck generation for gauntlets on desktop and android 2018-06-15 22:01:20 +01:00
austinio7116
4612dbbc59 Updated deck generation to include Legacy and Vintage - fixed a few bugs that lead to incorrect land counts and random cards being added. Fixed Snow land issue so Skred red should be more playable. 2018-06-15 21:51:26 +01:00
Michael Kamensky
84a82990fa Merge branch 'master' into 'master' 
More SVar spam fixes.

Closes #591 and #593

See merge request core-developers/forge!647
 2018-06-15 07:31:22 +00:00
Agetian
04af457676 - Added a couple missing references. 2018-06-15 10:27:26 +03:00
Agetian
708c43edbf - Fix AI spam related to Tetsuko, Umezawa Fugitive. 2018-06-15 10:25:01 +03:00
Michael Kamensky
93ee8f7c7b Merge branch 'master' into 'master' 
AttachAi: fix parameter source for P/T calculation.

Closes #592

See merge request core-developers/forge!646
 2018-06-15 07:17:22 +00:00
Agetian
ebe7d72789 - AttachAi: fix parameter source in pump target P/T calculation 2018-06-15 10:16:04 +03:00
Michael Kamensky
6fa5e16d5f Merge branch 'fightFix' into 'master' 
FightEffect: some reworks to make it rules conform

Closes #589

See merge request core-developers/forge!643
 2018-06-15 06:40:43 +00:00
Hanmac
78f652dd43 FightAi: hotfix for cards like Arena 2018-06-15 08:03:52 +02:00
austinio7116
10724a5161 Added Legacy and Vintage LDA data (plus updated standard) 
(cherry picked from commit 8e9aeb0)
 2018-06-15 06:53:00 +01:00
Sol
6c40e8214d Merge branch 'emergency-patch-1' into 'master' 
Emergency patch: fix rare/mythic slot - unintentional bang and also redundancy

See merge request core-developers/forge!645
 2018-06-14 02:27:14 +00:00
Rob Schnautz
a73bd2fa3d fix rare/mythic slot - unintentional bang and also redundancy 2018-06-14 02:25:29 +00:00
Hanmac
9ee851dabc FightEffect: some reworks to make it rules conform 2018-06-13 21:22:08 +02:00
Rob Schnautz
d9fba35f64 Merge branch 'cm2' into 'master' 
Cm2

See merge request core-developers/forge!557
 2018-06-13 18:14:48 +00:00
Rob Schnautz
60c62c4713 Update Commander Anthology Vol. II.txt 2018-06-13 18:13:18 +00:00
Hans Mackowiak
832db1d89d Merge branch 'schnautzr-master-patch-54169' into 'master' 
RemoveCounter -> SubCounter

See merge request core-developers/forge!642
 2018-06-13 14:28:49 +00:00
Rob Schnautz
91d34b404d RemoveCounter -> SubCounter 2018-06-13 14:18:23 +00:00