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
55,094 Commits 33 Branches 187 Tags
bc85d9fcbe01c3be80426c76b36b78692901f21c
Commit Graph

55094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
7cb5445d81 dormant_grove_gnarled_grovestrider.txt 2021-11-01 13:32:40 -04:00
Northmoc
393e8c7f29 kindly_ancestor_ancestors_embrace.txt 2021-11-01 13:26:52 -04:00
Michael Kamensky
8093b276b4 Merge branch 'sac' into 'master' 
Some sac prompt touch-ups (Exploit)

See merge request core-developers/forge!5708
 2021-11-01 16:42:51 +00:00
Michael Kamensky
5ea9ed6f5b Merge branch 'lands' into 'master' 
VOW dual land cycle - new templating

See merge request core-developers/forge!5680
 2021-11-01 14:52:23 +00:00
Michael Kamensky
5f29d09f52 Merge branch 'vow_1' into 'master' 
VOW: 1 Nov

See merge request core-developers/forge!5707
 2021-11-01 14:40:04 +00:00
Northmoc
4b579466c8 Some sac prompt touch-ups (Exploit) 2021-11-01 09:19:12 -04:00
Northmoc
317ba3034d geralf_visionary_stitcher.txt 2021-11-01 09:16:19 -04:00
Northmoc
874657fc40 mindleech_ghoul.txt 2021-11-01 09:15:47 -04:00
Michael Kamensky
7b20ca11e1 Merge branch 'cleave' into 'master' 
VOW Cleave keyword and some cards

See merge request core-developers/forge!5668
 2021-11-01 06:21:09 +00:00
Michael Kamensky
907fb93f72 Merge branch 'vow_31' into 'master' 
VOW: 31 Oct

See merge request core-developers/forge!5705
 2021-11-01 04:12:31 +00:00
Michael Kamensky
7429a73a15 Merge branch 'nick' into 'master' 
if/else for Nickname

See merge request core-developers/forge!5706
 2021-11-01 04:08:08 +00:00
Northmoc
c720996872 path_of_peril.txt 2021-10-31 21:42:44 -04:00
Northmoc
5bd65e6f94 initial Cleave 2021-10-31 21:42:43 -04:00
Northmoc
0067702836 if/else for Nickname 2021-10-31 21:40:29 -04:00
Northmoc
44527cd6b7 archghoul_of_thraben.txt 2021-10-31 21:39:43 -04:00
Northmoc
08c4e77750 halana_and_alena_partners.txt 2021-10-31 20:01:43 -04:00
Northmoc
d20c2df914 hallowed_haunting.txt and token 2021-10-31 19:56:28 -04:00
Northmoc
522cb122d1 dawnhart_geist.txt 2021-10-31 17:40:56 -04:00
Northmoc
307fead240 manaform_hellkite.txt and token 2021-10-31 16:05:56 -04:00
Northmoc
1f6fd5c542 change_of_fortune.txt 2021-10-31 16:05:55 -04:00
Northmoc
18f19b7d01 vampires_vengeance.txt (Suthro) 2021-10-31 16:05:54 -04:00
Northmoc
102eed0abb volatile_arsonist_dire_strain_anarchist.txt (Suthro) 2021-10-31 15:56:11 -04:00
Northmoc
3fe9871faa geistlight_snare.txt (medusa) 2021-10-31 15:50:27 -04:00
Northmoc
f146ea45c4 demonic_bargain.txt fix StackDesc and NoReveal 2021-10-31 15:46:54 -04:00
Michael Kamensky
ce171b366a Merge branch 'vow_31' into 'master' 
VOW: 31 Oct

See merge request core-developers/forge!5704
 2021-10-31 19:38:10 +00:00
Michael Kamensky
9d9aad7d1d Merge branch 'poison-trigs' into 'master' 
Predict Poison from triggers like Poisonous or Fynn

See merge request core-developers/forge!5702
 2021-10-31 19:36:55 +00:00
Northmoc
8d25ab383c fell_stinger.txt 2021-10-31 15:16:18 -04:00
Northmoc
1309832181 dominating_vampire.txt 2021-10-31 15:16:05 -04:00
Northmoc
941e77ad33 demonic_bargain.txt (medusa) 2021-10-31 15:08:52 -04:00
tool4EvEr
fc8a5dd52d Extend predictPoisonFromTriggers for other deathtouchers with Fynn 2021-10-31 20:05:35 +01:00
Northmoc
2f405b7a45 anje_maid_of_dishonor.txt 2021-10-31 14:53:54 -04:00
Michael Kamensky
b6631f190f Merge branch 'master' into 'master' 
Fix imports.

See merge request core-developers/forge!5703
 2021-10-31 16:26:42 +00:00
Michael Kamensky
34346b38a3 - Fix imports. 2021-10-31 19:25:58 +03:00
Michael Kamensky
c35ca9e88c - Minor tweak (remove an accidental change) 2021-10-31 19:12:36 +03:00
Michael Kamensky
020c405a42 - Predict poison from triggers for Poisonous 2021-10-31 19:10:56 +03:00
Michael Kamensky
9fdc7c604e Merge branch 'deck-importer-decks-file-format' into 'master' 
Better control on Deck save and editor state set + FIX set deck name

See merge request core-developers/forge!5699
 2021-10-31 15:25:34 +00:00
Hans Mackowiak
cfe346f34c StaticAbilityContinuous: fix setPower & setToughness 2021-10-31 16:23:02 +01:00
leriomaggio
27ab606824 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-31 11:14:21 +00:00
leriomaggio
1109cc15bf FIXING same bug for all editor, generalising **same** implementation on Constructed Editors (View and Controller) 2021-10-31 11:14:12 +00:00
Michael Kamensky
04639af59d Merge branch 'ward' into 'master' 
Improve Ward checking

See merge request core-developers/forge!5700
 2021-10-31 10:27:02 +00:00
Michael Kamensky
235f8266a8 Merge branch 'master' into 'ward' 
# Conflicts:
#   forge-ai/src/main/java/forge/ai/AiController.java
#   forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
 2021-10-31 10:25:32 +00:00
Michael Kamensky
2eafcb0aad Merge branch 'master' into 'master' 
More advanced implementation for vs-Ward AI

See merge request core-developers/forge!5701
 2021-10-31 09:46:26 +00:00
Michael Kamensky
50442b9909 - More advanced implementation for vs-Ward AI 2021-10-31 12:43:20 +03:00
tool4EvEr
bc7867c58c Improve Ward checking 2021-10-31 10:07:35 +01:00
leriomaggio
c0e7e2f63a FIXING same bug for Commander editor too 2021-10-31 08:54:05 +00:00
leriomaggio
003646be6e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-31 08:39:22 +00:00
Michael Kamensky
b580daee8e Merge branch 'master' into 'master' 
Add a TODO for Ward AI

See merge request core-developers/forge!5698
 2021-10-31 06:20:57 +00:00
Michael Kamensky
fcc1380712 - Add a TODO for Ward AI 2021-10-31 09:20:17 +03:00
Michael Kamensky
266ca8286e Merge branch 'master' into 'master' 
Tweak Savior of Ollenbock AI logic.

See merge request core-developers/forge!5697
 2021-10-31 06:14:25 +00:00
Michael Kamensky
28f7a56c46 - Tweak Savior of Ollenbock AI logic. 2021-10-31 09:13:34 +03:00