tool4EvEr
c735195d33
Fix source of manapool for payment of second human
2021-06-03 19:16:27 +02:00
leriomaggio
8a1770ffda
FIX Editions in Checkboxlist sorted (latest to earliest)
2021-05-31 11:19:08 +01:00
leriomaggio
1b25438fca
New Extra Panel with Checkbox list for Custom Edition
...
Besides: since Custom Editions can be sometimes not that many, the number of displayed rows in Checkbox lists has been fixed to 20 to have all panels of same height.
2021-05-31 10:39:31 +01:00
Michael Kamensky
51924d16db
Merge branch 'scrolling' into 'master'
...
Workshop: Add scrollbars
Closes #6
See merge request core-developers/forge!4800
2021-05-31 06:43:25 +00:00
Alumi
1eb6f33207
Refactor replace damage to handle all damage related replacments first, then run all buffered SAs after
2021-05-31 06:41:16 +00:00
tool4EvEr
2d23a5b37d
Add scrollbars
2021-05-30 22:26:35 +02:00
leriomaggio
d71d10a97f
Improved translations for CollectorNumber in Italian and Spanish, and while at it...
...
...I got rid of duplication for the lblSet col, while also improving translations.
In particular, the "lblSetEdition" column was translated as the "Mistery column" (for some reason :D), whereas a second lblSet2 was instead defined and used, namely "the label tooltip for the Set Columndef".
On this note, this col was also mistranslated in ES, IT, DE - those are the language I could handle so far.
In fact "Set" was intended (and so translated) as "to set" instead as for "Expansion/Edition".
Corrected accordingly! :)
2021-05-24 15:02:25 +01:00
tool4EvEr
6618f71297
PlayEffect: avoid confirmAction
2021-05-21 23:03:33 +02:00
Michael Kamensky
8440f72e9e
Merge branch 'cascade' into 'master'
...
PlayAi confirmAction only when card is worth it
See merge request core-developers/forge!4661
2021-05-09 04:01:22 +00:00
Alumi
fe95ad2e11
Refactor Damage Prevention - Step 2
2021-05-08 13:57:03 +00:00
tool4EvEr
3ab7886eab
Refactor confirmAction
2021-05-07 18:14:20 +02:00
Michael Kamensky
90afe81856
Merge branch 'modaloption' into 'master'
...
Add preference how to display alternate card states in deck views
See merge request core-developers/forge!4625
2021-05-02 14:25:36 +00:00
Bug Hunter
c13e379908
Add preference how to display alternate card states in deck views
2021-05-02 14:25:35 +00:00
tool4EvEr
3a2ea56c92
Fix NPE
2021-05-01 21:26:49 +02:00
Anthony Calosa
5a2f57172f
[Desktop] remove unnecessary codes
2021-04-29 02:22:26 +08:00
Anthony Calosa
b80f78d12e
[Desktop] update reader
2021-04-29 01:50:37 +08:00
Anthony Calosa
0134d343b2
[Desktop] IIOException: Unsupported Image Type
2021-04-28 22:12:09 +08:00
Michael Kamensky
380a27b83d
Merge branch 'update_in_game_text' into 'master'
...
Update in-game text and also English and Japanese localization (CMC -> mana value and etc.)
See merge request core-developers/forge!4581
2021-04-23 04:30:06 +00:00
Lyu Zong-Hong
2d7e88a8c2
Update in-game text and also English and Japanese localization
2021-04-23 11:01:34 +09:00
tool4EvEr
982400b74d
Clean up
2021-04-21 20:50:13 +02:00
tool4EvEr
c00a384591
Add MouseWheel support
2021-04-21 19:55:14 +02:00
tool4EvEr
50ffd7b4a9
Support scrolling when Popup has too many entries
2021-04-21 19:37:05 +02:00
austinio7116
93ff8cfe1b
Added Historic Random Deck Generation
2021-04-12 14:36:57 +01:00
Hans Mackowiak
f6ee232d9e
GameEntity: when attachment is phased out, treat as not attached
2021-04-11 17:00:20 +02:00
Anthony Calosa
3e096a25f7
Update CEditorConstructed.java
2021-04-08 11:09:16 +00:00
Anthony Calosa
1e5874aed5
update preload itempool
2021-04-08 09:57:26 +08:00
Anthony Calosa
92b0aad937
Update support for Custom Cards
2021-04-07 15:50:24 +08:00
Hans Mackowiak
0627d37f69
- Basic AI for AF Learn
...
- Some minor tweaks and fixes for AF Learn
2021-04-07 05:11:55 +00:00
Anthony Calosa
bf00d79e23
refactor carddb for Deck Editor/Workshop Catalog
2021-03-29 11:19:26 +08:00
Anthony Calosa
163d95800b
Restrict Deck Editor cards
...
- fix duplicate cards
2021-03-28 17:55:23 +08:00
Leandro Doctors
3733ba45e2
add FIXME for hardcoded value
2021-03-25 22:50:13 -03:00
Anthony Calosa
c3dd154ef5
Fix duplicate dependencies
...
-xstream greater than 1.4.9 needs higher android.jar (would remove support for devices lower than Android 8 unless we use the java 7 variant), latest guava and maybe other higher libs needs desugaring for android to work.
2021-03-24 10:22:43 +08:00
tool4EvEr
dda5af5d4d
Code cleanup
2021-03-22 21:54:09 +01:00
Anthony Calosa
e4a0ce9165
[Mobile] Preferred Art Options
2021-03-22 21:46:39 +08:00
Leandro Doctors
5d8bbf8687
Merge branch 'rename-assets-to-skin' into 'master'
...
refactor: rename 'assets' package to 'skin'
See merge request core-developers/forge!4223
2021-03-20 17:58:15 +00:00
Anthony Calosa
d00530700b
Update CMatchUI.java
...
removed unused imports
2021-03-20 07:55:08 +00:00
Anthony Calosa
5cc2aaa07a
Merge branch 'customCards_Folder' into 'master'
...
Support loading Custom Cards & Editions from User Folder
See merge request core-developers/forge!4222
2021-03-20 07:28:26 +00:00
Leandro Doctors
993fb3b518
refactor: rename 'assets' package to 'skin'
2021-03-19 14:27:10 -03:00
Anthony Calosa
41b9bd3e06
Support loading Custom Cards & Editions from User Folder
2021-03-20 00:01:15 +08:00
Anthony Calosa
f71e31c3a8
Merge remote-tracking branch 'core/master' into rollback_Phase_dev
...
# Conflicts:
# forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
# forge-gui-mobile/src/forge/screens/match/MatchController.java
# forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
# forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
2021-03-18 17:19:08 +08:00
Leandro Doctors
539d4c5939
fixup! fixup! add forge.quest.data.QuestData to fix old quests
2021-03-17 14:04:44 -03:00
Leandro Doctors
0978162bf5
Organize imports
2021-03-17 11:52:50 -03:00
Leandro Doctors
fe76d8b934
refactor: group gui-related packages
...
This is just a first step...
Probably there are many other classes that should be either completely
added here, or decomposed and partially added here.
2021-03-17 11:18:16 -03:00
Leandro Doctors
92110c1931
refactor: group game modes-related packages
2021-03-17 11:10:41 -03:00
Leandro Doctors
df64f5574d
refactor: group local instance-related packages
...
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
2021-03-17 11:10:41 -03:00
Michael Kamensky
1cd7e4e234
- An option to exclude promos from quest reward pool
2021-03-14 09:53:10 +03:00
Anthony Calosa
68ecf41511
[Mobile] add Experimental Rollback Phase
2021-03-14 11:57:20 +08:00
Michael Kamensky
1fb4e4af9c
Merge branch 'cleanlayout' into 'master'
...
Deskop layout: remove obsolete elements
See merge request core-developers/forge!4167
2021-03-12 04:17:50 +00:00
Churrufli
b2634686e6
Net Deck Archive Block (Desktop & Android)
2021-03-11 13:06:46 +01:00
tool4EvEr
e08e214fc1
Deskop layout: remove obsolete elements
2021-03-10 19:30:47 +01:00
