external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,404 Commits 33 Branches 187 Tags
f1f96557c2a08d30a84a68f9bd731c94b0fc715c
Commit Graph

38404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
d6b29340c6 Added M19 card Marauder's Axe 
(cherry picked from commit c995e7e)
 2018-06-26 07:42:22 +01:00
austinio7116
904a852f1b Added M19 card Meteor Golem 
(cherry picked from commit 8ef0a9f)
 2018-06-26 07:42:09 +01:00
Michael Kamensky
ae252e0649 Merge branch 'master' into 'master' 
Fixed a couple missing references.

See merge request core-developers/forge!680
 2018-06-26 06:33:45 +00:00
Agetian
c02028f6f8 - Fixed a couple missing references. 2018-06-26 09:33:13 +03:00
Michael Kamensky
2905c2920c Merge branch 'm19scripts' into 'master' 
M19 - 4 cards added

See merge request core-developers/forge!676
 2018-06-26 06:05:39 +00:00
Michael Kamensky
ce66959034 Merge branch 'hexproofUpdate' into 'master' 
Hexproof: recode ability to bypass Hexproof

See merge request core-developers/forge!677
 2018-06-26 05:53:26 +00:00
Michael Kamensky
73d0c5e92d Merge branch 'master' into 'master' 
Planeswalker achievements (GS1)

See merge request core-developers/forge!679
 2018-06-26 05:45:34 +00:00
Agetian
5dcf2ffc76 - Contracted the GS1 achievement names. 
- Corrected the card name.
 2018-06-26 08:44:41 +03:00
Agetian
d21d7afe9a - Added planeswalker achievements for Global Series 1 (by Marek). 2018-06-26 08:40:59 +03:00
Michael Kamensky
1e0676562d Merge branch 'dom-puzzles' into 'master' 
Added puzzle PS_DOM9 and improved PS_DOM4.

See merge request core-developers/forge!678
 2018-06-26 05:38:29 +00:00
Agetian
ee2361d012 - Added a set spec in PS_DOM9. 2018-06-26 08:38:09 +03:00
Agetian
66c4769d78 - Added a way to add persistent mana in game states (for puzzles). 
- Added basic logic for Evra, Halcyon Witness.
- Added puzzle PS_DOM9.
- Improved implementation for puzzle PS_DOM4.
 2018-06-26 08:36:06 +03:00
austinio7116
0585181b28 Added M19 card Transmogrifying Wand 2018-06-26 06:27:56 +01:00
Hanmac
eb2208ce1e Hexproof: recode ability to bypass Hexproof 2018-06-26 07:27:17 +02:00
maustin
1968c3e1fc Merge remote-tracking branch 'Austin/m19scripts' into m19scripts 2018-06-26 06:26:21 +01:00
austinio7116
2b1a2340ff Removed detection tower as WIP 2018-06-26 06:24:58 +01:00
austinio7116
0703a6885f Delete transmogrifying_wand.txt 2018-06-26 05:23:02 +00:00
Michael Kamensky
76c197cd7b Merge branch 'optimizing' into 'master' 
Reduce method call count.

See merge request core-developers/forge!672
 2018-06-26 04:15:07 +00:00
Hans Mackowiak
0e194d7574 Merge branch 'cherry-pick-e171e802' into 'master' 
Add support for pumping a player UntilLoseControlOfHost

See merge request core-developers/forge!675
 2018-06-26 04:07:05 +00:00
austinio7116
488e3a1121 Added M19 card Sigiled Sword of Valeron 2018-06-25 23:24:17 +01:00
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