external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,013 Commits 31 Branches 187 Tags
e60d5173f4335afb7d0809b9aa79d63c9fbd9a4d
Commit Graph

2514 Commits

Author SHA1 Message Date
Agetian
8c7edaaca4 - Added support for "Destroy Permanents"/"Kill Creatures" goal in puzzle mode. 
- Added puzzle PC_042815 implemented by Xitax.
 2017-08-05 09:54:27 +00:00
Hanmac
205323200a PlaneswalkerArchivements and AltWinArchivements are not make in res/lists 2017-08-05 09:45:33 +00:00
Krazy
b04ac67860 Make booster quest pool generation respect starting pool set selections 2017-08-02 01:42:01 +00:00
Agetian
020b31cb6f - Added goal type "Survive" to puzzle mode. 
- Added two new puzzles from Rooger that are now scriptable.
 2017-08-01 06:37:05 +00:00
Agetian
c9330d0b7f - Added Portal Second Age quest world by Xyx. 2017-07-31 04:01:59 +00:00
Agetian
0a7f579bd8 - Fixed split cards having transform arrows in deck editor. 2017-07-27 19:23:50 +00:00
Agetian
26f50d109a - Show the puzzle description in a pop-up dialog window when the puzzle starts. 2017-07-27 04:29:28 +00:00
Agetian
acfdf23c22 - Fixed the player's max hand size in Puzzle Mode being equal to 0 by default (now set to 7 per the default MTG rules). 
- Fixed the "Turns:X" parameter not working correctly in Puzzle Mode.
 2017-07-26 12:58:04 +00:00
Agetian
a15588120b - Attempting to fix IndexOutOfBounds exception in GauntletWinLose 2017-07-26 04:18:13 +00:00
Agetian
63be38a3c3 - Added an ability to show puzzle descriptions on the puzzle goal card. 2017-07-25 03:14:40 +00:00
Agetian
f9e987e933 - Reverted several Java 8 functions to their Java 7 counterparts for Android compatibility. 2017-07-25 03:12:04 +00:00
Agetian
ea4f8b67f2 - Unfortunately, have to revert r34731 - breaks mobile Forge (at least when running on desktop, e.g. for debugging purposes, but quite possibly on Android itself as well) and does not allow to cast anything from hand at all, making the single click on a card function as a selection (but not allowing to actually cast the spell). 2017-07-13 20:08:47 +00:00
Hanmac
07d130dbff HumanPlay: fixed cost canPay 2017-07-13 05:36:29 +00:00
Myrd
1d3f91fb9c Switch game thread executor to be a single-thread 
executor instead, of a thread pool. This is needed
because when things need to execute on the game
thread, it's not thread safe so only one such thing
should be executing at a time.

This should fix ConcurrentModificationException
from CardAreaPanel.selectCard() on mobile.

This is a reland of r34680 with a fix for being able
to run tasks on the game thread while waiting for input
from the user. Specifically, tested paying costs and
using the dev panel, but should work with anything that
schedules tasks via GameAction.invoke().
 2017-07-13 05:03:34 +00:00
Agetian
6fdea6572c - Only add existing booster templates to the template map to avoid situations where the game would try to generate a non-existing booster pack and crash (e.g. unlocking a Starter 2000 set in quest mode). 
- Only show the "You receive the following bonus cards" window if there are bonus cards available from the booster template.
 2017-07-13 04:12:53 +00:00
Agetian
0d4a97d0d0 - Display the name, difficulty and objective (goal/turn limit) of puzzles on the Puzzle Goal effect card. 2017-07-12 04:50:11 +00:00
Agetian
3d7db9c721 - A little bit more specific display name for custom drafts indicating that they are custom cubes. 2017-07-11 17:41:57 +00:00
Agetian
1a076a648a - Only sort custom drafts if there is something to sort. 2017-07-11 17:08:29 +00:00
Agetian
df56df5ede - Sort custom drafts / cubes alphabetically in the list. 2017-07-11 17:03:35 +00:00
Agetian
b69b6f1097 - Reverting r34697 for now, it breaks Developer Mode (functionality like Add Card To Hand, Add Card To Play, Setup Game State, etc.) and thus hinders proper debugging of the game in specific situations. 
- Please feel free to revert this commit to continue working on the single thread executor project and then recommit once it no longer breaks dev mode.
 2017-07-11 06:41:21 +00:00
Myrd
5c29e8db6b Switch game thread executor to be a single-thread 
executor instead, of a thread pool. This is needed
because when things need to execute on the game
thread, it's not thread safe so only one such thing
should be executing at a time.

This should fix ConcurrentModificationException
from CardAreaPanel.selectCard() on mobile.

This is a reland of r34680 with a fix for InputMayMana
which previously relied on there being multiple game
threads.
 2017-07-11 02:33:27 +00:00
Agetian
fe0f6f879a - Minor formatting fix. 2017-07-09 17:56:58 +00:00
Agetian
256483b304 - Sorting AltWinAchievements by name. 2017-07-02 12:37:44 +00:00
Agetian
35d282dacb - Somewhat shorter achievement name for Approach of the Second Sun (still a bit long, but better). 2017-07-02 12:35:33 +00:00
Agetian
6d3daf2499 - Adding HOU Planeswalker achievements by Marek. 
- Updated Approach of the Second Sun achievement for post-HOU.
 2017-07-02 12:29:18 +00:00
Agetian
07d65014ed - Support using art from standard (non-variant) Magic cards in PConq mode when there is no plane art available (e.g. for the newer sets like Kaladesh). 2017-07-02 09:23:41 +00:00
Agetian
0c30a989c1 - Avoid code duplication. 2017-07-01 11:26:45 +00:00
Agetian
66419f622b - A couple code style changes. 2017-07-01 11:07:55 +00:00
Agetian
36c34e3005 - Integrating the Far Unlocks in Quest Mode patch by Seravy. Documenting changes in CHANGES.txt 2017-07-01 11:06:29 +00:00
Agetian
59fdb3920c - Added a missing 4-color filter to ConquestUtil, fixed 4-color filter naming scheme. 2017-07-01 10:46:10 +00:00
Agetian
57e3d71ac4 - Imports fix. 2017-07-01 04:42:30 +00:00
Agetian
96327f5d3d - Sort puzzles alphabetically in the puzzle selection list box. 2017-07-01 04:40:19 +00:00
Agetian
986f95b46b - Attempting to fix Suspend by making it exempt from the canPlay() check in HumanPlay. 
- Better place for IsCastFromPlayEffect SVar assignment + cleanup
- Adding some previously missed card fixes from Marek.
 2017-06-30 07:11:56 +00:00
Agetian
70d56a080b - Temporarily reverting the Java 8 stream commit (does not compile for Android, pending investigation). 2017-06-29 18:33:36 +00:00
Agetian
b63587834b - Imports fix. 2017-06-29 18:03:08 +00:00
Agetian
f9c23f493b - Java 8 implementation of filtering in ConquestData#getAccessiblePlaneCount. 2017-06-29 18:02:43 +00:00
Agetian
e665f5df1d - Integrating the QuestEventDraft "wins to rotate draft" fix by Seravy. 2017-06-29 15:56:46 +00:00
Agetian
eafb9b6c22 - Minor formatting fix. 2017-06-29 15:50:25 +00:00
Agetian
2fda40836d - Refactoring QuestEventDuelManager#generateDuels to avoid code duplication/complication. 2017-06-29 15:49:33 +00:00
Agetian
9aa4e3d9cf - Integrating More Duel Choices patch by Seravy. 2017-06-29 14:03:56 +00:00
Agetian
63024322ee - Formatting SFilterUtil. 2017-06-29 13:15:31 +00:00
Agetian
c297cd599c - Integrating foil card filter by Seravy. 2017-06-29 13:14:23 +00:00
Agetian
557603a465 - Fixing formatting. 2017-06-29 07:55:34 +00:00
Agetian
d3d2ae6313 - Formatting QuestEventDuelManager. 2017-06-29 07:54:20 +00:00
Agetian
d3089c2955 - Fixed Add Random Duel crashing if a difficulty tier is not available in the quest world. 2017-06-29 07:51:45 +00:00
austinio7116
ba71e6a7e3 Avoid errors due to loading cards for card-based deck generation when lazy loading is enabled (for now just disables card-based deck generation completely) - does not handle cases where card-based decks are currently selected in constructed, then the lazy loading is switched on, then forge restarted. 2017-06-29 07:46:13 +00:00
Krazy
5a2d45ba28 Add counters to mobile Forge and adjust desktop counters 2017-06-24 21:49:36 +00:00
Krazy
2e7c39877e Add Java update notification when Forge is started 2017-06-24 06:59:07 +00:00
Krazy
26d1895faa Make counter tabs 10% smaller and update preferences for more options 2017-06-23 18:05:00 +00:00
Agetian
e96d28e811 - Ligature AE -> Ae update. 2017-06-22 16:11:44 +00:00