external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,062 Commits 33 Branches 187 Tags
e927d76cb583c1264a3a321d81f99bb800a131cc
Commit Graph

49062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hythonia
3f3ce39b30 STX: Yet more cards 2021-03-30 10:02:08 +02:00
Bug Hunter
8a5692e9df Merge branch 'TRT-master-patch-00357' into 'master' 
ActivateAbilityAi: small revert/align for multiplayer

See merge request core-developers/forge!4309
 2021-03-30 07:58:56 +00:00
Bug Hunter
5cf96b1154 Update forge-ai/src/main/java/forge/ai/ability/ActivateAbilityAi.java 2021-03-30 07:56:46 +00:00
Michael Kamensky
2d392de9ef Merge branch 'spellAbilityAdditionalAbilities' into 'master' 
SpellAbility: use SpellAbility for additionalAbilities so Trigger can have cost

See merge request core-developers/forge!4303
 2021-03-30 04:47:45 +00:00
Hans Mackowiak
f53aff1882 SpellAbility: use SpellAbility for additionalAbilities so Trigger can have cost 2021-03-30 04:47:44 +00:00
Michael Kamensky
0cf6cbf3bc Merge branch 'proliferate' into 'master' 
Fix AI killing itself with poison + proliferate

See merge request core-developers/forge!4307
 2021-03-30 04:12:46 +00:00
Michael Kamensky
28b428a6f1 Merge branch 'Williams-master-patch-92703' into 'master' 
STX more cards

See merge request core-developers/forge!4300
 2021-03-30 04:12:10 +00:00
Northmoc
d311ced441 campus_guide.txt 2021-03-29 19:10:17 -04:00
tool4EvEr
3ccce18f23 Fix AI killing itself with poison + proliferate 2021-03-29 23:27:38 +02:00
Northmoc
0ecd719799 curate.txt 2021-03-29 17:12:12 -04:00
Northmoc
5438e20b01 lorehold_campus.txt 2021-03-29 15:10:42 -04:00
Northmoc
b5f72ecc5c hofri_ghostforge.txt 2021-03-29 14:06:35 -04:00
Hythonia
dd20c8caf0 STX: Some more cards 2021-03-29 19:49:27 +02:00
Northmoc
c3b96e4f68 illuminate_history.txt 2021-03-29 13:09:51 -04:00
Northmoc
b3132aa757 reconstruct_history.txt 2021-03-29 13:09:50 -04:00
Northmoc
7685e3233f blade_historian.txt 2021-03-29 13:09:50 -04:00
Northmoc
ee3e66580d lorehold_excavation.txt 2021-03-29 13:09:50 -04:00
Northmoc
26cd2acbcd velomachus_lorehold.txt 2021-03-29 13:09:49 -04:00
Northmoc
0c3b099265 radiant_scrollwielder.txt 2021-03-29 13:09:49 -04:00
Bug Hunter
6971d320ae Merge branch 'fixRemembered' into 'master' 
Fix RememberDiscarded

See merge request core-developers/forge!4304
 2021-03-29 17:03:48 +00:00
John
2dd6305e54 Add new file 2021-03-29 17:02:42 +00:00
tool4EvEr
baf5479d0b Fix RememberDiscarded 2021-03-29 18:52:13 +02:00
Hythonia
c57be04143 STX: Some cards 2021-03-29 18:40:17 +02:00
John
f1030c2f10 Add new file 2021-03-29 16:31:09 +00:00
John
1f1639e661 Update quintorius_field_historian.txt 2021-03-29 16:10:06 +00:00
John
04d3445834 Add new file 2021-03-29 16:05:58 +00:00
John
1559a14e39 Add new file 2021-03-29 15:58:22 +00:00
John
fbbc6aa005 Update quintorius_field_historian.txt 2021-03-29 15:31:58 +00:00
John
9c573b9bfd Update returned_pastcaller.txt 2021-03-29 15:01:17 +00:00
John
96bbe2c7dc Update returned_pastcaller.txt 2021-03-29 14:59:55 +00:00
John
ec9f6b82d9 Update quintorius_field_historian.txt 2021-03-29 14:58:26 +00:00
John
2c120c3c45 Add new file 2021-03-29 14:58:03 +00:00
John
b911f5c45b Update returned_pastcaller.txt 2021-03-29 14:56:38 +00:00
John
6366a22ff3 Update returned_pastcaller.txt 2021-03-29 14:55:17 +00:00
John
5fc819d8f5 Add new file 2021-03-29 14:43:15 +00:00
John
df9d1ddcbf Add new file 2021-03-29 14:00:44 +00:00
Anthony Calosa
eed7b282d3 Merge branch 'master' into 'master' 
Refactor carddb for Deck Editor/Workshop Catalog

Closes #1436

See merge request core-developers/forge!4298
 2021-03-29 13:44:55 +00:00
Anthony Calosa
fc6237cd29 update advance filter 
support alternate parts limited to card names, keywords, rules text, types and subtypes
 2021-03-29 21:26:14 +08:00
John
c473e634e0 Add new file 2021-03-29 12:20:38 +00:00
John
28866fc1dc Add new file 2021-03-29 12:17:00 +00:00
John
8028e8ca12 Add new file 2021-03-29 12:13:42 +00:00
Anthony Calosa
28d1cc2055 Merge remote-tracking branch 'core/master' 2021-03-29 18:30:55 +08:00
Anthony Calosa
cffd99b68d update advance filter 2021-03-29 18:30:09 +08:00
Michael Kamensky
ac92a92090 Merge branch 'targetselection' into 'master' 
TargetSelection: Fix stack peeking detection

See merge request core-developers/forge!4295
 2021-03-29 08:00:21 +00:00
Bug Hunter
28dbb309cf TargetSelection: Fix stack peeking detection 2021-03-29 08:00:21 +00:00
Michael Kamensky
7b585aaa05 Merge branch 'descriptions' into 'master' 
Fix alternate state descriptions when viewed from original

See merge request core-developers/forge!4277
 2021-03-29 07:59:43 +00:00
Bug Hunter
82f0c85bd0 Fix alternate state descriptions when viewed from original 2021-03-29 07:59:43 +00:00
Michael Kamensky
1c0a7d8475 Merge branch 'Williams-master-patch-39368' into 'master' 
Update adrix_and_nev_twincasters.txt

See merge request core-developers/forge!4296
 2021-03-29 07:58:48 +00:00
Michael Kamensky
5f63b5f907 Merge branch 'card-fixes' into 'master' 
Inzerva doesn't target

See merge request core-developers/forge!4297
 2021-03-29 07:58:38 +00:00
Anthony Calosa
7459cd65d9 unused variable 2021-03-29 15:23:57 +08:00