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
64,596 Commits 32 Branches 187 Tags
db89c2bc4ceebf4a2f2a16ba1152389ae162c23b
Commit Graph

64596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
db89c2bc4c Merge pull request #3283 from kevlahnota/newmaster2 
[Android] support receiving text intent
 2023-06-17 16:22:03 +08:00
Anthony Calosa
68d98eeb55 Update Main.java 2023-06-17 16:14:31 +08:00
Anthony Calosa
9b540831db [Android] support receiving text intent 
- allow deck manager to import shared text intent
 2023-06-17 16:11:15 +08:00
Hans Mackowiak
3901758327 CardChangedType: use Enum Flags for removeAllSubTypes (#3230) 
* CardChangedType: use Enum Flags for removeAllSubTypes

* extract RemoveType

* ~ fix missing type
 2023-06-17 10:47:41 +03:00
Agetian
34c4506ddd Allow puzzles with full human control (for puzzles where the AI can't manage to work optimally) (#3280) 
* - Added several puzzles from MtgPuzzles.com

* - Minor text fix in MTGP_02.

* - Human-controlled puzzle support (for puzzles with poor AI support)

* - Indicate human control for PS_GRNS

* - Simpler mark for human controlled puzzles.

* - Slightly tweaked description text.
 2023-06-17 10:08:02 +03:00
Paul Hammerton
5b219bbc64 Merge pull request #3278 from JohnWilliams77/patch-86 
Update Store Championships.txt
 2023-06-16 16:48:00 +01:00
Agetian
e7fb3f1f48 Add several puzzles from MtgPuzzles.com (#3277) 
* - Added several puzzles from MtgPuzzles.com

* - Minor text fix in MTGP_02.
 2023-06-16 17:56:01 +03:00
JohnWilliams77
9100bd99a8 Update Store Championships.txt 2023-06-16 09:41:33 +01:00
Agetian
8b0fa88546 Adventure: several minor fixes / QoL changes (#3258) 
* - Fix double music playback in deck selection/deck editor screens.
- Make shops use Esc to quit (consistent with other screens).
- Very minor style correction.

* - Experimental: sort editions by name in the SpellSmith card filter.

* - Experimental: sort editions by name in the SpellSmith card filter.

* - Revert the button assignment for the shop button until a better solution can be devised.

* - Added puzzles PS_MOM4, PS_MOM5.
- Fixed the name of PS_MOM3.

* - Avoid resetting the music for some of the scene events.

* - One more music tweak.

* - Fix imports.

* - Take care of seamless music in the inn.

* - Fix imports.

* - Fix more imports.
 2023-06-16 07:54:52 +03:00
Anthony Calosa
ceb8e00e62 Merge pull request #3276 from tool4ever/loseEnchant 
Aura without Enchant shouldnt't stay attached
 2023-06-16 05:11:19 +08:00
Simisays
11ebc4d23d LOTR 10 cards (#3275) 2023-06-15 19:26:53 +00:00
Simisays
88ecaf89d5 LOTR 10 cards (#3261) 2023-06-15 19:26:34 +00:00
tool4EvEr
39ae4b5c83 Aura without Enchant can't stay attached 2023-06-15 20:32:26 +02:00
Anthony Calosa
203a7a4f73 Merge pull request #3274 from kevlahnota/newmaster2 
fix panglacial wurm hidden cardview
 2023-06-15 21:31:54 +08:00
Anthony Calosa
4e108bbdaa fix panglacial wurm hidden cardview 2023-06-15 21:26:27 +08:00
Anthony Calosa
da0dca319b Merge pull request #3273 from kevlahnota/newmaster2 
update hasLegalCardsPredicate when deckconformance is turned off
 2023-06-15 06:48:53 +08:00
Anthony Calosa
cabd79b6b4 update hasLegalCardsPredicate when deckconformance is turned off 
- fixes #3271
 2023-06-15 06:25:35 +08:00
tool4ever
f59cf3791e Update sword_of_once_and_future.txt (#3270) 2023-06-14 22:33:17 +03:00
Anthony Calosa
92cfd313e2 Merge pull request #3266 from Simisays/ADVENTUREFIX 
Master green wizard crash fix
 2023-06-15 00:26:49 +08:00
Simisays
913fede917 Update greenwizard_hard_rampbis.dck 2023-06-14 18:20:11 +02:00
tool4ever
5e6c433a42 Fix AI not being able to use mana from tapped sources (#3264) 
* Fix AI not being able to use mana from tapped sources

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-14 16:28:39 +03:00
Paul Hammerton
9d772e0906 Merge pull request #3265 from paulsnoops/lotr_legal 
Formats update: Add LTR & LTC (also add tokens to editions)
 2023-06-14 14:24:27 +01:00
paulsnoops
8481926ab2 Formats update: Add LTR & LTC (also add tokens to editions) 2023-06-14 14:19:20 +01:00
tool4ever
1dbe024db4 Update kaya_the_inexorable.txt 2023-06-14 11:15:51 +02:00
Hans Mackowiak
0625752dc4 Update pollenbright_wings.txt 2023-06-14 07:07:50 +02:00
TabletopGeneral
1adb7e5462 Adventure - draft fixes (#3260) 
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
 2023-06-13 19:01:54 +03:00
Anthony Calosa
705dd1518f Merge pull request #3256 from Simisays/LOTR10 
LOTR 10 cards
 2023-06-13 17:50:23 +08:00
Agetian
ca948c6b81 - Added puzzles PS_MOM4, PS_MOM5. (#3259) 
- Fixed the name of PS_MOM3.
 2023-06-12 23:15:57 +03:00
Simisays
a112d4895e Update shire_shirriff.txt 2023-06-12 20:55:53 +02:00
Simisays
220cdc5493 update 2023-06-12 20:10:04 +02:00
Anthony Calosa
5576c1d94e Merge pull request #3255 from Agetian/ai-revealorchoose-cost 
AI: Support for RevealOrChoose (Dragon's Fire)
 2023-06-13 02:01:15 +08:00
Anthony Calosa
41c65cc250 Merge pull request #3257 from kevlahnota/newmaster2 
Update Winlose
 2023-06-13 01:55:39 +08:00
Anthony Calosa
b5d1b37ba0 update winlose 2023-06-13 01:48:00 +08:00
Simisays
aafe2b8f76 Update dunland_crebain.txt 2023-06-12 19:06:17 +02:00
Agetian
582f949791 - Simplify source lookup 2023-06-12 18:56:18 +03:00
Simisays
2c1014cc37 Merge remote-tracking branch 'upstream/master' into LOTR10 2023-06-12 17:51:47 +02:00
Simisays
021dee0534 update 2023-06-12 17:51:38 +02:00
Agetian
4b9ff0d23f - For Dragon's Fire, only reveal stuff if power is 4 or greater. 2023-06-12 18:39:33 +03:00
Anthony Calosa
65be16f551 Merge branch 'master' into newmaster2 2023-06-12 23:33:37 +08:00
Anthony Calosa
227d7e88b7 Update tazri_stalwart_survivor.txt 2023-06-12 23:32:16 +08:00
Anthony Calosa
0f5a9071b2 Update danitha_new_benalias_light.txt 2023-06-12 23:30:11 +08:00
Agetian
83b8cacdd4 - More robust RevealOrChoose detection 2023-06-12 18:24:29 +03:00
Agetian
59e8c5aab3 - Fix imports + avoid using variable assignment 2023-06-12 18:23:05 +03:00
Agetian
67e0610d38 - Add logic for RevealOrChoose cost for the AI (Dragon's Fire) 2023-06-12 18:21:00 +03:00
Anthony Calosa
e87618a77d Merge branch 'master' into newmaster2 2023-06-12 23:09:15 +08:00
tool4ever
5160a33bdc Update tomb_of_horrors_adventurer.txt 2023-06-12 14:36:17 +00:00
Anthony Calosa
6fb1bc862c Merge branch 'master' into newmaster2 2023-06-12 22:13:19 +08:00
Agetian
c35d5c2fb4 - Fix a card name in the MOM printsheet. (#3254) 2023-06-12 17:10:29 +03:00
Agetian
38d2b95000 - Fix a card name in the MOM printsheet. 2023-06-12 17:09:02 +03:00
Anthony Calosa
1950ea58fe Merge branch 'master' into newmaster2 2023-06-12 20:40:09 +08:00