external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,578 Commits 32 Branches 187 Tags
2e24d43ab6216b51a7de75c71810f5fb5ce23b94
Commit Graph

7651 Commits

Author SHA1 Message Date
Northmoc
32ba1f7fa4 tom_bombadil.txt + TriggerAbilityResolves 2023-03-29 11:05:58 -04:00
tool4EvEr
99f8cca233 Clean up 2023-03-29 16:02:58 +02:00
Hans Mackowiak
03924a4044 CardFactory getCloneStates set PT for Vehicle (#2713) 
* Update CardFactory.java

Set PT should also be done for vehicle

* Update CardFactory.java

* Clean up

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-03-29 05:53:26 +03:00
tool4ever
4329e2b0c8 Improve a few parts from previous PR (#2770) 2023-03-28 21:11:13 +00:00
tool4ever
3f58fb9531 Fix script (#2767) 2023-03-27 16:37:36 +02:00
Anthony Calosa
b9d55a9afa Merge branch 'master' into newmaster2 2023-03-27 13:51:32 +08:00
Anthony Calosa
0b3d2e8567 prevent NPE 2023-03-27 13:50:06 +08:00
tool4EvEr
9eb7f591dd Just let the KW handle it 2023-03-26 23:22:19 +02:00
Anthony Calosa
68dc1fdce9 refactor ManaShards 
- remove Mana Shards as countertype
 2023-03-26 19:36:41 +08:00
Anthony Calosa
f18c525fe1 prevent proliferate affecting manashards 2023-03-26 14:22:54 +08:00
Anthony Calosa
2a0c36eaa1 Update TokenEffectBase.java 
fix ConcurrentModificationException (anointed procession and divine visitation in play, then cast benevolent offering, then choose replacement effect divine visitation, hit ok)
 2023-03-26 10:45:13 +08:00
tool4EvEr
e53e6723c5 Fix some cards via cleanup 2023-03-25 15:41:15 +01:00
tool4ever
23875bcc16 Support Supertype for Deckhints (#2750) 2023-03-25 10:23:02 +00:00
Paul Hammerton
9bc6904e38 Merge pull request #2732 from Northmoc/qs 
quicksilver_servitor.txt and support
 2023-03-23 13:34:50 +00:00
tool4EvEr
fad1327a08 Update Charm desc when turn restriction is lifted 2023-03-23 11:10:46 +01:00
tool4EvEr
eaee14f3ca Clean up 2023-03-23 11:10:04 +01:00
Anthony Calosa
e309f77069 Merge pull request #2726 from Card-Forge/MaxFromEffectv2 
CountersPutEffect: remove MaxFromEffect, let the CounterTable handle it
 2023-03-23 13:56:11 +08:00
Northmoc
2de115d829 quicksilver_servitor.txt and support 2023-03-22 22:33:14 -04:00
Anthony Calosa
b697068570 fix splashscreen NPE, disable flip sfx 2023-03-23 07:58:00 +08:00
Hans Mackowiak
580856bcaa Card: add extra check for DREAM counters 2023-03-22 21:00:54 +01:00
Hans Mackowiak
dbd75ec08c CountersPutEffect: remove MaxFromEffect, let the CounterTable handle it 2023-03-22 06:22:47 +01:00
Anthony Calosa
7d43ba42cd Merge pull request #2725 from tool4ever/crashfix 
Fix Mist of Stagnation
 2023-03-22 07:54:45 +08:00
tool4EvEr
08b0aad84f Fix Mist of Stagnation 2023-03-21 23:02:57 +01:00
Anthony Calosa
442699380c Update GameEventCardStatsChanged.java 2023-03-21 22:16:41 +08:00
Anthony Calosa
94be6a7e48 .. 2023-03-21 22:09:45 +08:00
Anthony Calosa
865d228cb2 Fix Android Music, Add flip_card sfx 
- fix secondary music not playing on Android (let assetmanager unload them on exit)
- fix MapDialog audio bgm fade
- add Flip sfx on RewardActor flip and transform setstate effect
 2023-03-21 21:56:41 +08:00
Northmoc
b4d2742f66 Seek effect + SeekAll trigger for new Arena stuff (#2590) 
* trove_mage.txt refactor + support

* SeekEffect + SeekAll trigger initial

* SeekEffect better

* SeekEffect.getStackDescription basic

* more refactored

* gitrog_horror_of_zhava.txt needs ImprintFound

* 10 more refactors

* more

* SeekEffect fix bad imprint line

* SeekEffect fix better remember/imprint

* gitrog_horror_of_zhava.txt with Branch

* more cards

* last ones?

* SeekEffect tighten up based on Hanmac ver

* optimize imports

* fix param discrepancies

* SeekEffect tighten up
 2023-03-21 11:58:23 +03:00
Hans Mackowiak
f166394db0 GameEntityCounterTable: respect MaxFromEffect for Clockwork 2023-03-21 07:39:19 +01:00
tool4EvEr
348670776e Clean up 2023-03-20 18:25:03 +01:00
tool4EvEr
84aef29d69 Fix NPE when trying to build Charm description 2023-03-20 18:24:32 +01:00
Hans Mackowiak
c5e52aab7d AbilityUtils: add Convoked as DefinedCards (#2710) 2023-03-20 06:20:35 +01:00
Anthony Calosa
33189271b1 Merge pull request #2709 from tool4ever/defile 
Fix Defilers applying twice with MayPlay
 2023-03-20 11:50:22 +08:00
tool4EvEr
714baa47ee Fix Defilers applying twice with MayPlay 2023-03-19 21:13:27 +01:00
tool4ever
25d2aa82b6 Bunch of fixes (#2706) 
* Fix Tawnos's Coffin not using ETB counters

* Cost fix

* Saga tweaks

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-03-19 22:07:03 +03:00
Hans Mackowiak
6b61d7fc7e CardFactoryUtil: Read Ahead use DisableTriggers (#2703) 2023-03-19 18:34:47 +03:00
Hans Mackowiak
a4b52b4b40 Merge pull request #2699 from tool4ever/copycleanup 
CardFactory: remove redundant copying
 2023-03-19 15:14:12 +01:00
Hans Mackowiak
eef4dd58fc CardFactoryUtil: Equip shouldn't care if it is a creature (#2696) 2023-03-18 07:02:08 +03:00
tool4EvEr
11ca3ca7b0 remove redundant calls 2023-03-17 22:19:15 +01:00
Anthony Calosa
81efb2737f add Commander Gauntlet 2023-03-17 08:18:52 +08:00
tool4EvEr
298ff0465e Fix Thelon 2023-03-15 16:12:50 +01:00
tool4ever
9b47a7fee2 Remove some obsolete stuff (#2685) 
* Remove obsolete code

* Fix uncounterable being invisible

* Fix CantHappen requiring choice
 2023-03-15 12:37:22 +00:00
Suthro
a3883b0ba5 LTR: Gandalf the Grey + The One Ring 
LTR: Add card scripts for spoiled LTR cards Gandalf the Grey and The One Ring.

- Gandalf the Grey
- The One Ring
 2023-03-13 19:21:31 -05:00
tool4ever
812f4062dd Fix undo when it gets cleared during payment (#2674) 2023-03-13 22:06:49 +00:00
tool4EvEr
cf4f6f7f49 Clean up 2023-03-12 17:20:22 +01:00
tool4EvEr
419c66daa5 Anti-Cheat: fix refunding wrong mana 2023-03-12 16:37:10 +01:00
Anthony Calosa
1f908465d5 Merge pull request #2620 from Card-Forge/rebalancedFormatCheck 
GameFormat: filter Rebalanced cards
 2023-03-10 13:09:10 +08:00
Anthony Calosa
7de1495049 Merge pull request #2649 from tool4ever/clean93 
Some cleanup
 2023-03-10 09:53:04 +08:00
tool4EvEr
b7105e1ee9 Some cleanup 2023-03-09 22:43:50 +01:00
Anthony Calosa
7c9982f8eb Merge pull request #2644 from tool4ever/makeanexample 
Fix Make an Example
 2023-03-09 06:10:09 +08:00
jjayers99
2cf3f508fb Merge branch 'master' of https://github.com/jjayers99/forge 2023-03-08 07:11:35 -05:00