external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,054 Commits 32 Branches 187 Tags
12be76899a7e68ad0ff394d024128e96e2c72f53
Commit Graph

51054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
0de9a0dfd6 CountersMoveAi: avoid buffing opponent creatures with The Ozolith 2021-06-19 16:25:36 +02:00
Brock Fanning
4ad137a23d Fix syntax in Vermin Gorger 2021-06-19 07:11:58 -04:00
Michael Kamensky
f9651796f8 Merge branch 'seal' into 'master' 
Fix Seal of the Guildpact

See merge request core-developers/forge!4902
 2021-06-19 09:38:46 +00:00
Churrufli
ce02772161 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 
# Conflicts:
#	forge-gui/src/main/java/forge/deck/NetDeckCategory.java
#	forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
 2021-06-19 11:02:06 +02:00
tool4EvEr
84f2d2ead2 Fix Seal of the Guildpact 2021-06-19 07:28:56 +02:00
Michael Kamensky
d232cefe57 Merge branch 'combomana' into 'master' 
Fix ComboMana payment

See merge request core-developers/forge!4900
 2021-06-19 04:55:51 +00:00
Lyu Zong-Hong
84882cd4fa Update Ranar the Ever-Watchful and other similar cards 2021-06-19 13:55:02 +09:00
Lyu Zong-Hong
0d592c4096 Update types 2021-06-19 13:40:33 +09:00
Lyu Zong-Hong
c7d7130344 Update oracle for MH2 release 2021-06-19 12:47:36 +09:00
tool4EvEr
7672817a6e Fix ComboMana payment 2021-06-18 23:43:40 +02:00
Michael Kamensky
b23e550263 Merge branch 'TRT-master-patch-16657' into 'master' 
Update forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt

See merge request core-developers/forge!4899
 2021-06-18 15:43:27 +00:00
Bug Hunter
b1f13cf2f0 Update forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt 2021-06-18 12:47:00 +00:00
Michael Kamensky
afeedf064e Merge branch 'specify_mana_combo' into 'master' 
[UI] Use VAssignGenericAmount dialog to specify mana combo

See merge request core-developers/forge!4898
 2021-06-18 10:50:50 +00:00
Lyu Zong-Hong
9a21f038ad Not use VAssignGenericAmount dialog for TwoEach ability 2021-06-18 18:28:15 +09:00
Lyu Zong-Hong
afa6c9986a Use VAssignGenericAmount dialog to assign mana combo 2021-06-18 17:58:52 +09:00
Michael Kamensky
c7e489b477 Merge branch 'ui_update_divided_as_you_choose' into 'master' 
[UI] Use VAssignGenericAmount dialog to assign DividedAsYouChoose values

See merge request core-developers/forge!4897
 2021-06-18 03:10:35 +00:00
Michael Kamensky
bd060e9090 Merge branch 'twosat-master-patch-92329' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4896
 2021-06-18 03:09:46 +00:00
Lyu Zong-Hong
dfecf5d40a Use VAssignGenericAmount dialog to assign DividedAsYouChoose values 2021-06-18 11:21:23 +09:00
Andreas Bendel
db3919ab90 Update de-DE.properties 
translated lblAssignCombatDamageAsChoose and lblAssignCombatDamageToCreature
 2021-06-17 19:11:54 +00:00
Michael Kamensky
5193447625 Merge branch 'sld_update' into 'master' 
SLD update

See merge request core-developers/forge!4895
 2021-06-17 18:56:21 +00:00
paul_snoops
42c5b890a7 SLD update 2021-06-17 19:24:00 +01:00
Michael Kamensky
31192889d1 Merge branch 'fixes' into 'master' 
Minor card fixes

See merge request core-developers/forge!4894
 2021-06-17 17:50:21 +00:00
tool4EvEr
b5e55a3a47 Minor card fixes 2021-06-17 17:05:16 +02:00
Michael Kamensky
5e39a2979b Merge branch 'update_damage_replacement_cards' into 'master' 
Update some damage replacement related cards

See merge request core-developers/forge!4893
 2021-06-17 09:48:53 +00:00
Michael Kamensky
be3c26676e Merge branch 'update_illusionary_terrain' into 'master' 
Update Illusionary Terrain and Vision Charm

See merge request core-developers/forge!4892
 2021-06-17 09:48:30 +00:00
Alumi
20dc234ec1 Update Illusionary Terrain and Vision Charm 2021-06-17 09:48:30 +00:00
Lyu Zong-Hong
cd29194824 Update some damage replacement related cards 2021-06-17 15:44:12 +09:00
Michael Kamensky
777514dc7d Merge branch 'fixes' into 'master' 
Small Card fixes

See merge request core-developers/forge!4891
 2021-06-17 02:58:47 +00:00
tool4EvEr
28ee56baea Small Card fixes 2021-06-16 20:02:56 +02:00
Michael Kamensky
cc362cec5c Merge branch 'fix_trigger_damage_map' into 'master' 
Fix crash when triggered ability is using damage map

See merge request core-developers/forge!4889
 2021-06-16 15:04:26 +00:00
Michael Kamensky
b698b49256 Merge branch 'triggers' into 'master' 
AddToCombat: add missing block trigger

See merge request core-developers/forge!4887
 2021-06-16 15:04:14 +00:00
Michael Kamensky
0b74be743a Merge branch 'fixes' into 'master' 
Minor fixes

See merge request core-developers/forge!4890
 2021-06-16 15:04:03 +00:00
Michael Kamensky
d844df988f Merge branch 'misc_card_panel' into 'master' 
[Desktop] Add MiscCardPanel to render player avatar when assigning trample damage or divide shields

See merge request core-developers/forge!4888
 2021-06-16 15:03:38 +00:00
tool4EvEr
410ceb2bfc Fix facedown reveal 2021-06-16 16:32:43 +02:00
tool4EvEr
da1dbfc9cf Add AI hint 2021-06-16 16:19:34 +02:00
Lyu Zong-Hong
06fa495b0c Fix crash when triggered ability is using damage map by redirect them to the underlying sa 2021-06-16 20:48:50 +09:00
Lyu Zong-Hong
21d5aeca09 Add MiscCardPanel to render player avatar when assigning trample damage or divide shields 2021-06-16 18:14:10 +09:00
Michael Kamensky
c7d7f5c622 Merge branch 'paycheat' into 'master' 
Fix casting SA while refusing to pay CostSacrifice

See merge request core-developers/forge!4881
 2021-06-16 03:15:52 +00:00
Sol
50221ef138 Update Modern.txt 2021-06-16 01:38:54 +00:00
tool4EvEr
d59d5b3b46 AddToCombat: add missing block triggers 2021-06-15 21:26:13 +02:00
Michael Kamensky
6fadafa19a Merge branch 'net_decks' into 'master' 
Small net decks update

See merge request core-developers/forge!4886
 2021-06-15 17:45:19 +00:00
Michael Kamensky
400eb62c76 Merge branch 'fixes' into 'master' 
Small fixes

Closes #1891 and #1890

See merge request core-developers/forge!4885
 2021-06-15 17:45:13 +00:00
paul_snoops
68d78acc00 Small net decks update 2021-06-15 17:29:29 +01:00
tool4EvEr
b3fe2a55db Improve AI 2021-06-15 18:15:16 +02:00
tool4EvEr
9697d697bd Multiplayer improvements 2021-06-15 18:09:12 +02:00
tool4EvEr
b1b06dd0f4 Fix Reflect 2021-06-15 17:41:02 +02:00
tool4EvEr
9dada96de3 Clean up 2021-06-15 17:25:00 +02:00
tool4EvEr
93d80b3ee5 Basic SkipPhase AI 2021-06-15 17:01:59 +02:00
tool4EvEr
f584c581d8 Improve AI hint 2021-06-15 16:46:22 +02:00
tool4EvEr
001106ea7b Small fixes 2021-06-15 16:36:33 +02:00