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
53,641 Commits 32 Branches 187 Tags
c1a56f95d21a0cf014d6d8facce8b45e45a729ca
Commit Graph

2874 Commits

Author SHA1 Message Date
Anthony Calosa
6179c991a0 fix NPE 2021-10-21 12:18:24 +08:00
Anthony Calosa
8c438261dc [Mobile] Prevent Card Animations when FScrollPane is moving 
- cleaner looks when the user is scrolling through the cards
 2021-10-21 10:10:38 +08:00
Grimm
49f7128240 Restore the adventure merge 
This reverts commit e69cf66ec8.
 2021-10-20 04:54:01 +00:00
Michael Kamensky
87521416b2 Merge branch 'deck-importer-decks-file-format' into 'master' 
NEW Deck Importer

See merge request core-developers/forge!5296
 2021-10-16 16:47:29 +00:00
Michael Kamensky
2129a1dcf2 - Prepare Forge for Android publish 1.6.45.001 [incremental]. 2021-10-16 19:01:47 +03:00
Michael Kamensky
5520cd2a67 [maven-release-plugin] prepare for next development iteration 2021-10-16 18:52:21 +03:00
Michael Kamensky
340a6b2af5 [maven-release-plugin] prepare release forge-1.6.45 2021-10-16 18:52:12 +03:00
Anthony Calosa
025c195a70 [Mobile] Auto Adjust Zoom Multiplayer Local 
When playing local multiplayer game on landscape mode, adjust zoom display automatically when 3rd/4th player has lost.
 2021-10-16 21:28:55 +08:00
Anthony Calosa
f5b0e3d068 [Mobile] fix facedown splitcard showing different cardbacks when zoomed 2021-10-16 21:04:46 +08:00
leriomaggio
2858abd551 reworded method name 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 09:25:28 +01:00
leriomaggio
700e4f1d8e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-16 08:58:49 +01:00
leriomaggio
842e292537 Restored mobile options for DeckImporter + setup controller game type/format too 
This commit reinstate mobile old options to select card art.
The two components setup options in controller, and their initial state depends on current Card Art Preference Settings.

Moreover, now the dialog support (small) customisation based on current Game type to allow for some automation in DeckImporter to be triggered based on "editorType".

Changes in FDeckEditor reflects this change by passing the extra parameter to the constructor, and to allow checking that current editorType is not Limited (achieved via new public static method)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:56:56 +01:00
Anthony Calosa
7a25f0b5b8 [Mobile] prevent crash empty deck 2021-10-16 15:19:33 +08:00
Anthony Calosa
b7e6d51f97 [Mobile] prevent NPE on deck import 2021-10-16 14:45:13 +08:00
leriomaggio
80268e95fd Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-15 19:15:38 +01:00
Hans Mackowiak
997e566af0 Resolve "Daybound & Nightbound" 2021-10-15 13:20:36 +00:00
leriomaggio
e91277f271 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-15 13:39:00 +01:00
Anthony Calosa
18eddce33a unused imports 2021-10-14 16:28:15 +08:00
Anthony Calosa
40ea769ac5 [Mobile] fix NPE 2021-10-14 16:19:53 +08:00
leriomaggio
affc37ed0c Updates from getNumber to getQuantity from parsed tokens. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-08 13:55:00 +01:00
Anthony Calosa
9061f36a34 [Mobile] Add Replace Card option for Deck Editor 2021-10-08 11:35:58 +08:00
Anthony Calosa
3c2f618faf adjust avatar targeting origin 2021-10-07 16:44:55 +08:00
Anthony Calosa
ad939ea3bd [Mobile] Refactor Targeting Arrows 
- Added option to use new arrow overlay
 2021-10-07 16:22:56 +08:00
Anthony Calosa
050ecb51bd [Mobile] refactor netplay phase indicator 2021-10-06 21:28:39 +08:00
Anthony Calosa
eb01aa8e58 phase indicator 2021-10-06 17:46:00 +08:00
Anthony Calosa
0c2b0b3d9a fix disable card images 2021-10-06 17:33:02 +08:00
Anthony Calosa
df100b5b77 move back the targeting arrows so they wouldn't drawn on top of the game menu overlay 2021-10-05 22:15:54 +08:00
Anthony Calosa
7edab67dd1 unused import 2021-10-05 16:17:09 +08:00
Anthony Calosa
3c78e6b1b2 move indicators and arrows out of drawoverlay 2021-10-05 16:07:49 +08:00
Anthony Calosa
a1ff670df2 minor adjustments 2021-10-05 14:33:51 +08:00
Anthony Calosa
30c5ef6aeb remove unused vars 2021-10-05 14:08:32 +08:00
Anthony Calosa
7c24c529fa [Mobile] Fix targeting arrows on Netplay. 2021-10-05 14:03:08 +08:00
Anthony Calosa
eafd04c6e6 # fix Cleanup Phase Highlight 
- todo: find out why this is needed, something is affecting the getplayerturn on every eot..
 2021-10-05 13:05:10 +08:00
Anthony Calosa
58403fde5b [Mobile] fix accuracy for mouse hover 2021-10-05 04:25:50 +08:00
Anthony Calosa
64c7e5b5cb update empty stack not hidden on local multiplayer 2021-10-03 11:32:48 +08:00
Anthony Calosa
3bf4c33044 Fix local Multiplayer Phase Indicator 2021-10-02 13:56:40 +08:00
Michael Kamensky
bb421ea2e6 Merge branch 'gray_text' into 'master' 
Gray text preference

See merge request core-developers/forge!5485
 2021-10-01 17:09:36 +00:00
leriomaggio
65b7df63f7 Extended support to log both unknown and unsupported cards. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-01 17:00:47 +01:00
Northmoc
0d13edd84e clean up a few things 2021-09-30 22:13:19 -04:00
Northmoc
0c7b0621cd note for mobile version pref handling 2021-09-30 12:53:59 -04:00
Northmoc
36a8c93bc8 setting up the pref 2021-09-30 12:21:52 -04:00
Anthony Calosa
ca3e19c289 Add Foretold Event 
When a player foretolds a card, the exile is shown
 2021-09-30 21:45:40 +08:00
Anthony Calosa
e06a97a6db [Mobile] Disable mouse events for Android 
- should have a mouse hotplug detection
 2021-09-30 13:47:19 +08:00
Michael Kamensky
52c78eca90 Merge branch 'master' into 'master' 
[Mobile] Only respond to abilities on stack with Y/N keyboard shortcuts

See merge request core-developers/forge!5478
 2021-09-30 05:12:23 +00:00
Michael Kamensky
4d95708065 - [Mobile] Only respond to abilities on stack with Y/N keyboard shortcuts 2021-09-30 08:11:51 +03:00
Michael Kamensky
1319c90c8b Merge branch 'master' into 'master' 
Basic support for auto-yield keyboard shortcuts on mobile Forge (Y / N)

See merge request core-developers/forge!5477
 2021-09-30 04:51:14 +00:00
Michael Kamensky
d1af3ccd4d - Minor clarification for Y/N shortcuts. 2021-09-30 07:50:59 +03:00
Michael Kamensky
a3e5ae1999 - Basic support for auto-yield keyboard shortcuts on mobile Forge (Y / N) 2021-09-30 07:48:04 +03:00
Anthony Calosa
4f8fb837e6 Merge remote-tracking branch 'remotes/core/master' 2021-09-30 12:20:02 +08:00
Anthony Calosa
100eb19bd1 [Mobile] Update LobbyScreen 
-switch places of variants and players combo boxes for landscape layout
 2021-09-30 12:15:31 +08:00