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

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
7cb02e3cb3 Added M19 card Skyscanner 2018-06-25 23:13:24 +01:00
austinio7116
9586e7f87e Added M19 card Suspicious Bookcase 2018-06-25 23:08:03 +01:00
Rob Schnautz
426e452ab5 convert tabs to spaces 2018-06-25 21:56:24 +00:00
schnautzr
7e7d83564f Add support for pumping a player UntilLoseControlOfHost 
(cherry picked from commit e171e802c1)
 2018-06-25 21:36:17 +00:00
schnautzr
e171e802c1 Add support for pumping a player UntilLoseControlOfHost 2018-06-25 16:29:50 -05:00
schnautzr
dfb713eb79 Add Suncleanser 2018-06-25 16:28:38 -05:00
austinio7116
b28001def5 Added M19 card Transmogrifying Wand 2018-06-25 21:39:28 +01:00
Michael Kamensky
c67194d5e6 Merge branch 'm19' into 'master' 
M19 new cards

See merge request core-developers/forge!671
 2018-06-25 18:26:33 +00:00
Michael Kamensky
5ce68f2d8b Merge branch 'setPT' into 'master' 
Rework SetPT to use Map, and CharacteristicDefining

See merge request core-developers/forge!670
 2018-06-25 17:46:22 +00:00
austinio7116
20b17cbdbe Added M19 card Detection Tower - corrected effect description 2018-06-25 07:01:02 +01:00
austinio7116
61697ea941 Added M19 card Detection Tower 2018-06-25 06:58:54 +01:00
Sol
edf5c132ce Merge branch 'patch-1' into 'master' 
Shouldn't be an artifact. Thanks, Cryptix!

See merge request core-developers/forge!673
 2018-06-25 03:28:03 +00:00
Rob Schnautz
dca2d7db48 Shouldn't be an artifact. Thanks, Cryptix! 2018-06-25 03:26:59 +00:00
schnautzr
d885390cab M19 white cards are scripted and tested except Suncleanser. 2018-06-24 22:21:54 -05:00
Rob Schnautz
8e54b0e742 Reduce method call count. 2018-06-24 21:18:33 +00:00
schnautzr
2401aa7ab5 White cards, A-M. Tested all of them. 2018-06-24 11:23:04 -05:00
Hanmac
6c0ca4ff08 Card: rework SetPT to use Map, and CharacteristicDefining 2018-06-24 17:52:39 +02:00
Michael Kamensky
366de65e8b Merge branch 'master' into 'master' 
- Fix logic in DamageDealAi, update logic for Chandra, Fire of Kaladesh.

See merge request core-developers/forge!664
 2018-06-24 06:23:32 +00:00
Agetian
efe493d179 - Unify AI logic checks. 2018-06-24 09:17:01 +03:00
Agetian
a4374b61d7 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-06-24 08:52:00 +03:00
Michael Kamensky
3b5fa24950 Merge branch 'patch-1' into 'master' 
Add logging to indicate which card is causing Forge to hang.

See merge request core-developers/forge!666
 2018-06-24 05:48:52 +00:00
Michael Kamensky
7411807922 Merge branch 'morphDieFix' into 'master' 
GA: facedown from battlefield need reset

Closes #590

See merge request core-developers/forge!665
 2018-06-24 05:48:14 +00:00
Michael Kamensky
efcdb5a300 Merge branch 'cherry-pick-886d7c29' into 'master' 
Add edition file for M19.

See merge request core-developers/forge!669
 2018-06-24 05:42:28 +00:00
schnautzr
0c06d78551 Add edition file for M19. 
(cherry picked from commit 886d7c29d583b1e8b761a06fb3d432e9ebcf6d5a)
 2018-06-24 01:03:51 +00:00
Rob Schnautz
573b4c9377 Add logging to indicate which card is causing Forge to hang. 2018-06-23 22:26:11 +00:00
Hanmac
f9bbe4b0d6 GA: facedown from battlefield need reset 2018-06-23 16:20:28 +02:00
Agetian
f192e1cf27 - Different logic update, seems more appropriate. 2018-06-22 13:26:34 +03:00
Agetian
07383f7c4c - Minor code tweak. 2018-06-22 12:07:20 +03:00
Agetian
4498547824 - Remove unused code. 2018-06-22 12:06:17 +03:00
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