Commit Graph

69691 Commits

Author SHA1 Message Date
Agetian
ee43570ad9 - Add FDN planeswalker achievement by Marek. (#6546) 2024-11-08 08:07:13 +03:00
Simisays
73c3dd3def Jumpstart 2025 format + new dragon hero sprite + better avatars (#6544)
* update

* Update blocks.txt

* cleanup
2024-11-08 07:17:24 +03:00
kevlahnota
b400e612b4 Merge pull request #6545 from kevlahnota/master2
fix room choicelist render
2024-11-08 10:39:23 +08:00
Anthony Calosa
e9e14360f7 fix room choicelist render 2024-11-08 10:31:15 +08:00
Sagar
9d2c85f4ee Add back to top button to Wiki (#6427)
* Revamp Readme for more appealing

* revert back to top button only
2024-11-07 12:31:46 -05:00
kevlahnota
beb658ae99 Update electroduplicate.txt
- closes #6543
2024-11-07 14:57:43 +08:00
kevlahnota
216e3df533 Merge pull request #6542 from kevlahnota/master2
add confirm to autoSell, update ImageView
2024-11-07 14:23:59 +08:00
Anthony Calosa
4abcb0959a Merge branch 'master' into master2 2024-11-07 14:02:17 +08:00
Anthony Calosa
2ada458bf5 update filter description, add prompt option 2024-11-07 13:46:08 +08:00
Anthony Calosa
66e64995e3 add confirm dialog to autosell 2024-11-07 11:51:06 +08:00
Anthony Calosa
95ca1673b8 update ImageView
show NoSell overlay
2024-11-07 10:34:34 +08:00
kevlahnota
cd4b2a02e5 Merge pull request #6541 from kevlahnota/master2
fix sellAll
2024-11-06 23:24:58 +08:00
Anthony Calosa
7f7248f825 fix sellAll 2024-11-06 23:24:01 +08:00
Paul Hammerton
e7e5f4d9a7 Merge pull request #6540 from paulsnoops/master
Edition updates: FDN, J25, PLG24, PMEI
2024-11-06 13:41:45 +00:00
kevlahnota
9db592b10a Merge pull request #6539 from kevlahnota/master2
prevent townPriceModifier NPE
2024-11-06 21:35:00 +08:00
Anthony Calosa
a8bc8d42e1 format 2024-11-06 21:30:43 +08:00
Paul Hammerton
eed723bde2 Edition updates: FDN, J25, PLG24, PMEI 2024-11-06 13:30:37 +00:00
Anthony Calosa
6b31d101db prevent townPriceModifier NPE 2024-11-06 21:29:38 +08:00
kevlahnota
a140570752 Merge pull request #6538 from kevlahnota/master2
update adventure store/event preview filters
2024-11-06 20:15:50 +08:00
Anthony Calosa
e16468ad84 Merge branch 'master' into master2 2024-11-06 20:11:45 +08:00
Anthony Calosa
d85d00fbfb include ADVENTURE_SIDEBOARD config 2024-11-06 20:11:06 +08:00
Anthony Calosa
07d653d99b update adventure store/event preview filters 2024-11-06 19:47:33 +08:00
kevlahnota
307cf5a908 Merge pull request #6537 from kevlahnota/master2
update format filters for Adventure Deck Editor
2024-11-06 13:26:42 +08:00
Anthony Calosa
13eef9434f update filters 2024-11-06 13:14:22 +08:00
Anthony Calosa
0a3d2202c0 update item manager 2024-11-06 12:31:13 +08:00
Anthony Calosa
026913eebe Merge branch 'master' into master2
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
2024-11-06 10:53:31 +08:00
kevlahnota
e59368422e update translation, remove duplicate single quote 2024-11-05 21:33:47 -05:00
Chris H
9f07bc9a98 Return false instead of throw if an illegal draft choice is made 2024-11-05 21:33:47 -05:00
Anthony Calosa
eb3b620858 update adventure editor default itemConfig 2024-11-06 06:10:22 +08:00
Anthony Calosa
a242f1fe04 update format filters for Adventure Deck Editor
use FormatFilter to filter Collections, AutoSell and NoSell cards
2024-11-05 22:56:47 +08:00
Paul Hammerton
fe52690f17 Merge pull request #6536 from paulsnoops/fix-fdn-edition
Fix FDN edition for boosters
2024-11-05 10:31:55 +00:00
Paul Hammerton
fa63d99d05 Fix FDN edition for boosters 2024-11-05 10:23:23 +00:00
Paul Hammerton
bb2b73d66f Merge pull request #6535 from paulsnoops/edition-updates
Edition updates: FDN
2024-11-05 09:39:41 +00:00
Paul Hammerton
d189a03550 Edition updates: FDN 2024-11-05 09:34:33 +00:00
Hans Mackowiak
a037532cb6 Merge pull request #6533 from Card-Forge/fdn-new-release
Fdn edition stuff
2024-11-05 09:51:58 +01:00
kevlahnota
e9ad6ef63e Merge pull request #6534 from kevlahnota/master2
reuse headerLabel as marker for loot
2024-11-05 15:49:05 +08:00
Anthony Calosa
46c502942b Merge branch 'master' into master2 2024-11-05 15:41:25 +08:00
Anthony Calosa
5d057837ff reuse headerLabel as marker for loot 2024-11-05 15:32:30 +08:00
Chris H
a71f57de3a Foundations new set things 2024-11-04 22:11:42 -05:00
Chris H
0e5303b84e Migrate upcoming 2024-11-04 21:39:55 -05:00
Paul Hammerton
bc6d78c376 Merge pull request #6511 from paulsnoops/combine-ue-into-da1
Combine Unknown Event editions into DA1
2024-11-04 19:01:16 +00:00
kevlahnota
fde2cd4538 Merge pull request #6529 from Card-Forge/kevlahnota-patch-1
Update QuestDataIO.java
2024-11-04 19:59:18 +08:00
tool4ever
41a3b24aef Fix Windfall (#6530) 2024-11-04 11:27:51 +01:00
kevlahnota
d8b86eb606 Update QuestDataIO.java
add EnumMap converter
2024-11-04 12:30:52 +08:00
tool4ever
fe259dafd2 Update fleeting_reflection.txt
Closes #6525
2024-11-03 15:46:11 +00:00
kevlahnota
fc1ba62078 Merge pull request #6523 from kevlahnota/master2
refactor HeroListData, update CoverScreen
2024-11-03 21:29:06 +08:00
Anthony Calosa
87d242028f refactor HeroListData, update CoverScreen
- remove redundant autosave
2024-11-03 21:24:20 +08:00
tool4ever
3e49ec6c88 Fix unattach logic (#6522) 2024-11-03 09:14:17 +00:00
Michael Lo
ecce3ab139 Add info about plotted cards into the game log (#6516) 2024-11-03 08:55:56 +00:00
Paul Hammerton
4fd6b3eff5 Merge pull request #6521 from paulsnoops/fdn-formats
Format updates for FDN & J25
2024-11-03 08:27:28 +00:00