external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,359 Commits 31 Branches 187 Tags
94f73d0812cd792e90b0aed73b374dbf9941422b
Commit Graph

54359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
f30dbac72e Merge branch 'master' into 'master' 
Reimplement the AI logic for Astral cards again.

See merge request core-developers/forge!5696
 2021-10-31 05:15:56 +00:00
Michael Kamensky
1e161359dc - Reimplement the AI logic for Astral cards again. 2021-10-31 08:14:40 +03:00
Michael Kamensky
bc982fde74 Merge branch 'master' into 'master' 
Improved AI logic vs. Ward

See merge request core-developers/forge!5695
 2021-10-31 04:38:44 +00:00
Michael Kamensky
2275771714 - Improved AI logic vs. Ward. 2021-10-31 07:37:33 +03:00
Grimm
deb813a768 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-10-30 23:52:28 +02:00
Michael Kamensky
c2b52e2218 Merge branch 'retrace' into 'master' 
Fix Wrenn and Six Emblem not allowing to retrace adventures

See merge request core-developers/forge!5694
 2021-10-30 17:58:26 +00:00
tool4EvEr
a40592ce72 Fix Wrenn and Six Emblem not allowing to retrace adventures 2021-10-30 19:55:28 +02:00
Michael Kamensky
4e7bbfbd32 Merge branch 'twosat-master-patch-16548' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5693
 2021-10-30 17:38:47 +00:00
Andreas Bendel
80a9cf4094 Update de-DE.properties 
translated lblTrains
 2021-10-30 16:54:59 +00:00
Michael Kamensky
8885d4cb44 Merge branch 'master' into 'master' 
ChooseNumberAi: logic for By Invitation Only.

See merge request core-developers/forge!5692
 2021-10-30 14:38:54 +00:00
Michael Kamensky
a2de2ba7ed - ChooseNumberAi: logic for By Invitation Only. 2021-10-30 17:37:38 +03:00
Michael Kamensky
18c6db3fd9 Merge branch 'vow_30' into 'master' 
VOW: 30 Oct

See merge request core-developers/forge!5690
 2021-10-30 14:06:00 +00:00
Michael Kamensky
86149f69b8 Merge branch 'disturb' into 'master' 
VOW: Disturb keyword tweaks and cards

See merge request core-developers/forge!5678
 2021-10-30 14:05:23 +00:00
Michael Kamensky
24528da790 Merge branch 'vow_29' into 'master' 
VOW: 29 Oct

See merge request core-developers/forge!5676
 2021-10-30 14:05:16 +00:00
Michael Kamensky
44d8b2d788 Merge branch 'blood' into 'master' 
add Blood to ArtifactTypes

See merge request core-developers/forge!5689
 2021-10-30 14:04:43 +00:00
Michael Kamensky
b883a402f8 Merge branch '1997-flashback-checking-fails-in-some-scenarios-with-alternate-state-cards' into 'master' 
Resolve "Flashback checking fails in some scenarios with alternate state cards"

Closes #1997

See merge request core-developers/forge!5691
 2021-10-30 14:03:03 +00:00
Michael Kamensky
4f4cd6e9d6 Merge branch 'master' into 'master' 
[Mobile] Show target/imprinted card if possible for input confirmation

See merge request core-developers/forge!5688
 2021-10-30 14:02:37 +00:00
Hans Mackowiak
b5ed6ef87e GameActionUtil: remove only keywords from static abilities, not from Pump 2021-10-30 15:34:28 +02:00
Anthony Calosa
80fb8b3f41 [Mobile] Support showing imprinted card on Play effect (ie Cascade) 2021-10-30 21:04:24 +08:00
Northmoc
aef9aa0a69 wedding_announcement_wedding_festivity.txt and token 2021-10-30 08:55:58 -04:00
Northmoc
7b3e19728d massive_might.txt 2021-10-30 08:45:53 -04:00
Northmoc
74abe68ede wedding_invitation.txt 2021-10-30 08:45:12 -04:00
Northmoc
4c0339ecf1 savior_of_ollenbock.txt Oracle typo 2021-10-30 08:22:38 -04:00
Northmoc
3bd6e2096a by_invitation_only.txt add RemoveDeck for now 2021-10-30 08:22:12 -04:00
Anthony Calosa
e96b91a718 [Mobile] Show target card if possible for input confirmation 
- If the host card has a card target (ie Merrow Reejerey targets a permanent to Tap or Untap), show the card target instead
 2021-10-30 20:08:23 +08:00
Michael Kamensky
bb4eddbba5 Merge branch 'layer3TextChange' into 'master' 
Card: do Layer3 Text Change better

Closes #1983

See merge request core-developers/forge!5687
 2021-10-30 09:32:15 +00:00
Hans Mackowiak
6e4924bd86 Card: do Layer3 Text Change better 2021-10-30 09:32:13 +00:00
Michael Kamensky
8f8b5822a4 Merge branch 'master' into 'master' 
Faerie Dragon AI logic, minor tweaks to the Crazy Dungeon Master deck.

See merge request core-developers/forge!5686
 2021-10-30 06:03:59 +00:00
Michael Kamensky
d8fa4ce4b4 - Minor tweaks to the Crazy Dungeon Master deck. 2021-10-30 09:03:05 +03:00
Michael Kamensky
2a86c7a471 - Logic setting for Faerie Dragon AB. 2021-10-30 09:02:20 +03:00
Michael Kamensky
8d839937de Merge branch 'master' into 'master' 
Minor AI tweak

See merge request core-developers/forge!5685
 2021-10-30 05:43:55 +00:00
Michael Kamensky
9001a47fb0 - Minor tweak 2021-10-30 08:43:00 +03:00
Michael Kamensky
5346ece7c8 Merge branch 'master' into 'master' 
Implement Savior of Ollenbock AI

See merge request core-developers/forge!5684
 2021-10-30 05:42:10 +00:00
Michael Kamensky
b59612f7b3 - Implement Savior of Ollenbock AI 2021-10-30 08:41:20 +03:00
Michael Kamensky
ee2a3a1790 Merge branch 'master' into 'master' 
Actually update the Crazy Dungeon Master deck.

See merge request core-developers/forge!5683
 2021-10-30 04:48:59 +00:00