external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,730 Commits 32 Branches 187 Tags
07db8e5a94e70d1e204bac56e630fde0b4e12097
Commit Graph

4425 Commits

Author SHA1 Message Date
Jetz
c347ff5810 Merge remote-tracking branch 'origin/master' into code-cleanup 
# Conflicts:
#	forge-core/src/main/java/forge/StaticData.java
 2024-11-13 09:20:00 -05:00
Jetz
e879abca85 Merge remote-tracking branch 'origin/master' into code-cleanup 2024-11-13 09:17:45 -05:00
Jetz
d81c5a40cf Revert .toList() for Android compatibility 2024-11-13 09:17:33 -05:00
Anthony Calosa
88613c555a refactor some vars, and save to deck file 
todo validate
 2024-11-13 22:13:18 +08:00
Anthony Calosa
4012469910 refactor var name 2024-11-13 19:12:34 +08:00
Anthony Calosa
8fd521b949 update desktop editor 2024-11-13 13:43:47 +08:00
Anthony Calosa
31abd61a3f fix render for ImageView 2024-11-13 11:10:27 +08:00
Anthony Calosa
5afaff814a update deck editor for spire 2024-11-13 10:29:18 +08:00
Anthony Calosa
cb2ddf39f8 update auditer 2024-11-11 17:00:04 +08:00
Anthony Calosa
b130f45fe1 update watermark 
- show watermark on catalogpage only
 2024-11-09 10:17:40 +08:00
Jetz
2b5fc37232 Remove unused imports 2024-11-08 20:02:02 -05:00
Jetz
c6ad1226b0 Guava migration - Swap in StreamUtil.stream 2024-11-08 19:49:03 -05:00
Jetz
4bbc165460 Guava migration - Use .toList() 2024-11-08 19:33:45 -05:00
Anthony Calosa
ac15b32f32 fix SealedScreen 
bind directly the back button to open the LoadSealedScreen on Sealed Editor
 2024-11-09 08:21:19 +08:00
Jetz
d6c8e9a692 Merge remote-tracking branch 'origin/master' into code-cleanup 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java
#	forge-ai/src/main/java/forge/ai/ability/ScryAi.java
#	forge-core/src/main/java/forge/card/DeckHints.java
#	forge-core/src/main/java/forge/util/TextUtil.java
#	forge-gui-mobile/src/forge/itemmanager/ItemManager.java
#	forge-gui/src/main/java/forge/download/AutoUpdater.java
#	forge-gui/src/main/java/forge/player/HumanCostDecision.java
 2024-11-08 18:37:02 -05:00
Anthony Calosa
e9e14360f7 fix room choicelist render 2024-11-08 10:31:15 +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
Anthony Calosa
7f7248f825 fix sellAll 2024-11-06 23:24:01 +08:00
Anthony Calosa
a8bc8d42e1 format 2024-11-06 21:30:43 +08:00
Anthony Calosa
6b31d101db prevent townPriceModifier NPE 2024-11-06 21:29:38 +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
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
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
Anthony Calosa
5d057837ff reuse headerLabel as marker for loot 2024-11-05 15:32:30 +08:00
Anthony Calosa
87d242028f refactor HeroListData, update CoverScreen 
- remove redundant autosave
 2024-11-03 21:24:20 +08:00
Anthony Calosa
2d85fd845e update teleport animation 2024-11-03 15:27:30 +08:00
Anthony Calosa
74f9d05b08 update NPE prevention 2024-11-03 12:14:43 +08:00
Anthony Calosa
4a1bbdc3ba update VZoneDisplay 2024-11-03 10:15:29 +08:00
Anthony Calosa
0ddf5b25d7 refactor VCardDisplayArea, prevent NPE 2024-11-03 10:07:14 +08:00
Anthony Calosa
c6aecafe6b add missing translation, minor speedup generating map 2024-11-03 05:58:28 +08:00
Anthony Calosa
fa74a3b01c fix newgame/newgame plus entering spawn point 2024-11-02 19:45:01 +08:00
Anthony Calosa
55d945857a fix format 2024-11-02 14:23:29 +08:00
Anthony Calosa
660a16a772 fix infinite collision on Worldstage 
- closes #6485
 2024-11-02 14:20:36 +08:00
Anthony Calosa
8d9f17fbac move key indicators 2024-11-02 11:08:30 +08:00
Anthony Calosa
7f16956942 increase allowance for update 2024-11-01 08:57:49 +08:00
Anthony Calosa
ce1d4b6a58 update date check, fix version String 2024-11-01 08:17:11 +08:00
Anthony Calosa
43912cbbb2 prevent NPE 2024-11-01 06:52:18 +08:00
Anthony Calosa
52d77c6862 fix NPE and update keyboard visibility 2024-10-31 17:28:30 +08:00
Anthony Calosa
1f369732e5 fix updater message 2024-10-31 13:29:38 +08:00
Anthony Calosa
4664ff441b Merge branch 'master' into master2 2024-10-31 11:56:28 +08:00
Anthony Calosa
cea913e03c update tmxmaploader 2024-10-31 11:50:12 +08:00
Chris H
5f5e871840 Add a toggle to reenable declaring combatant ordering (#6467) 
* Add a toggle to reenable declaring combatant ordering

* update translation

---------

Co-authored-by: kevlahnota <anthonycalosa@gmail.com>
 2024-10-30 12:27:25 +03:00
Anthony Calosa
a2419137e1 fix timestamp differences on build.txt 2024-10-30 00:57:56 +08:00