external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 33 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

53916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
ee5ede38d4 Merge branch 'master' into 'master' 
[Mobile] Minor fixes

See merge request core-developers/forge!5429
 2021-09-25 09:50:59 +00:00
Anthony Calosa
bf5aadf1cf [Mobile] Prevent card animation while moving FScroller 
- prevents confusion for tapping and untapping permanents automatically since the card animation needs update when drawn.
 2021-09-25 17:37:03 +08:00
Anthony Calosa
af2d02e9f2 #Update Meld Transform 2021-09-25 17:34:36 +08:00
Anthony Calosa
215268cf81 [Mobile] Clear Stagnant Matches screen 2021-09-25 17:32:09 +08:00
Anthony Calosa
45e1ff0494 Merge branch 'venture' into 'master' 
VentureAi: Fix NPE

See merge request core-developers/forge!5428
 2021-09-25 09:28:36 +00:00
tool4EvEr
7f4d71842f Fix NPE 2021-09-25 11:24:41 +02:00
Michael Kamensky
88027d39e2 Merge branch 'master' into 'master' 
Fix "Assorted Card Art" in the generate basic lands dialog.

See merge request core-developers/forge!5427
 2021-09-25 06:51:42 +00:00
Michael Kamensky
49d35d909d - Fix "Assorted Card Art" in the generate basic lands dialog. 2021-09-25 09:49:29 +03:00
Michael Kamensky
0abbedbc95 Merge branch 'kurbis' into 'master' 
MIC: Kurbis, Harvest Celebrant and cost tweak

See merge request core-developers/forge!5426
 2021-09-25 05:06:21 +00:00
Michael Kamensky
cbc60e3071 Merge branch 'gorex' into 'master' 
MIC: Gorex, the Tombshell and some stringbuilder updates

See merge request core-developers/forge!5425
 2021-09-25 05:06:02 +00:00
Michael Kamensky
e5269a1f7f Merge branch 'fixes' into 'master' 
Fixes

Closes #1977 and #1976

See merge request core-developers/forge!5422
 2021-09-25 05:05:30 +00:00
Michael Kamensky
5c209ae380 Merge branch 'troupe' into 'master' 
Fix AI for Ludevic

See merge request core-developers/forge!5424
 2021-09-25 05:05:22 +00:00
Northmoc
e04af38625 triumphant_adventurer.txt fix 2021-09-24 21:48:57 -04:00
Northmoc
d06de1ec85 CostRemoveCounter allow for NICKNAME in desc 2021-09-24 19:44:13 -04:00
Northmoc
734545c2b3 kurbis_harvest_celebrant.txt 2021-09-24 19:43:03 -04:00
Northmoc
d0ddbf07a0 gorex_the_tombshell.txt 2021-09-24 18:34:51 -04:00
Northmoc
50a713365c CostExile support X as amount to exile 2021-09-24 17:57:27 -04:00
Northmoc
a8db6f9370 Card ability stringbuilder updates + support AdditionalDesc 2021-09-24 17:56:47 -04:00
Northmoc
1fb3cc0ca0 falcon_abomination.txt add Flying 2021-09-24 17:16:10 -04:00
tool4EvEr
58e4bc9519 Clean up 2021-09-24 22:15:18 +02:00
Northmoc
1dfc6608dc liesa_forgotten_archangel.txt 2021-09-24 16:06:15 -04:00
Northmoc
731e610ced gavony_silversmith.txt fix PT 2021-09-24 16:02:37 -04:00
tool4EvEr
c88d5b373a Fix AI for Ludevic 2021-09-24 21:55:01 +02:00
Northmoc
0e488ebbac ChangeZoneEffect support SkipCancelPrompt 2021-09-24 15:51:57 -04:00
Northmoc
eb2a864fea distant_memories.txt without ChooseCard 2021-09-24 15:22:30 -04:00
Michael Kamensky
d2b3880cb3 Merge branch 'TRT-master-patch-37742' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/harvesttide_sentry.txt

See merge request core-developers/forge!5423
 2021-09-24 18:53:39 +00:00
Bug Hunter
59000df8ec Update forge-gui/res/cardsfolder/upcoming/harvesttide_sentry.txt 2021-09-24 17:31:31 +00:00
Northmoc
fba174419e distant_memories.txt improve functionality and AI 2021-09-24 09:15:24 -04:00
Northmoc
c306789e14 increasing_confusion.txt fix SVar:Y 2021-09-24 09:14:41 -04:00
Michael Kamensky
d0abc02bc5 Merge branch 'edition_changes' into 'master' 
Edition changes

See merge request core-developers/forge!5421
 2021-09-24 12:34:40 +00:00
paul_snoops
c2723e1c9f primal_adversary fix 2021-09-24 12:18:51 +01:00
paul_snoops
f1527b1451 artist fix 2021-09-24 10:43:36 +01:00
paul_snoops
63330b53a5 Edition changes 2021-09-24 10:39:35 +01:00
Michael Kamensky
b3e878b015 Merge branch 'removeIntrinsic' into 'master' 
Card: remove removeIntrinsic from Trait and Keyword Changes, check ChangedType instead

See merge request core-developers/forge!5420
 2021-09-24 05:41:51 +00:00
Hans Mackowiak
bacf387657 Card: remove removeIntrinsic from Trait and Keyword Changes, check ChangedType instead 2021-09-24 07:23:59 +02:00
Michael Kamensky
2a4f5ef3a3 Merge branch 'mic_23' into 'master' 
MIC - 23 Sep

See merge request core-developers/forge!5419
 2021-09-24 04:56:14 +00:00
Michael Kamensky
dbbb8ec95d Merge branch 'when_dies_this_turn' into 'master' 
Refactor "when X dies this turn" cards from Effect to DelayedTrigger

See merge request core-developers/forge!5351
 2021-09-24 03:56:59 +00:00
Tim Mocny
725eee27e8 Refactor "when X dies this turn" cards from Effect to DelayedTrigger 2021-09-24 03:56:58 +00:00
Northmoc
73e9d4b1c6 new messages 2021-09-23 19:07:47 -04:00
Northmoc
f42ef251a7 celestial_judgment.txt 2021-09-23 19:07:46 -04:00
Northmoc
3fb5e5ea87 sigardian_zealot.txt 2021-09-23 19:07:45 -04:00
Northmoc
4e6abaff0f sigardas_vanguard.txt 2021-09-23 19:07:45 -04:00
Northmoc
59549ef7b0 ChooseCardEffect "EachDifferentPower" 2021-09-23 19:07:45 -04:00
Northmoc
a5ee24e23d ChooseCardEffect "WithDifferentPowers" 2021-09-23 19:07:44 -04:00
Northmoc
3df72b446b crowded_crypt.txt (Marvel) 2021-09-23 19:05:07 -04:00
Northmoc
af0b0df71a curse_of_conformity.txt (Marvel) 2021-09-23 19:05:07 -04:00
Northmoc
1907cf4d41 moorland_rescuer.txt (Marvel) 2021-09-23 19:05:07 -04:00
Northmoc
5655b3b3c2 curse_of_unbinding.txt (Marvel) 2021-09-23 19:05:07 -04:00
Michael Kamensky
6c62df0a48 Merge branch 'stackdesc' into 'master' 
auto Stackdesc updates

See merge request core-developers/forge!5417
 2021-09-23 15:03:29 +00:00
Michael Kamensky
f190bd991e Merge branch 'MID/cards-3' into 'master' 
MID Cards

See merge request core-developers/forge!5338
 2021-09-23 15:03:17 +00:00