Commit Graph

56126 Commits

Author SHA1 Message Date
Anthony Calosa
1c750146cc added match transition 2022-02-16 20:17:20 +08:00
Hans Mackowiak
fab0fc08da Merge branch 'arlinnLayerFix' into 'master'
CardFactoryUtil: use new Transform layer for Daybound

Closes #2087

See merge request core-developers/forge!6224
2022-02-16 12:10:18 +00:00
Hans Mackowiak
21e403e2e4 Merge branch 'TRT-master-patch-97239' into 'master'
Update forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt

See merge request core-developers/forge!6241
2022-02-16 12:06:11 +00:00
Hans Mackowiak
44984951d1 Merge branch 'DFCcopy' into 'master'
Fix DFC copy having both faces

See merge request core-developers/forge!6236
2022-02-16 12:04:50 +00:00
Bug Hunter
cbf1bdd3a5 Fix DFC copy having both faces 2022-02-16 12:04:44 +00:00
Bug Hunter
7237f07b34 Update forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt 2022-02-16 07:21:42 +00:00
Anthony Calosa
d5a57dc38c fix encoding 2022-02-16 07:23:57 +08:00
Anthony Calosa
039ae3be79 [Mobile] Hide overlay on closing screen animation 2022-02-16 06:56:28 +08:00
Anthony Calosa
3a693515e3 Merge remote-tracking branch 'core/master' 2022-02-16 06:45:16 +08:00
Anthony Calosa
d562562547 [Mobile] restore revealAISkipCards for mobile port 2022-02-16 06:42:40 +08:00
tool4EvEr
443b55f4a9 Fix Vivien, Monsters' Advocate counters for all tokens 2022-02-15 21:19:47 +01:00
Northmoc
6b273a0d74 BoosterGenerator support sheetReplaceCardFromSheet 2022-02-15 19:55:25 +00:00
Northmoc
a718d0039f CardEdition implement sheetReplaceCardFromSheet 2022-02-15 19:55:25 +00:00
Northmoc
1940b484af DBL edition tweak syntax for dfc replacements 2022-02-15 19:55:25 +00:00
paul_snoops
1c2335883b Implement DBL and NEO drafts 2022-02-15 19:55:25 +00:00
Michael Kamensky
39c49b2315 Merge branch 'ninjutsu_sd' into 'master'
ChangeZoneEffect - improve changeHiddenOriginStackDescription (focus on Ninjutsu)

See merge request core-developers/forge!6237
2022-02-15 18:54:55 +00:00
Northmoc
1bca6d158e ChangeZoneEffect - improve changeHiddenOriginStackDescription (focus on Ninjutsu) 2022-02-15 13:24:02 -05:00
Michael Kamensky
123c111914 Merge branch 'johnwilliams7-master-patch-78046' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6235
2022-02-15 16:20:46 +00:00
Anthony Calosa
b833cacd09 update input for magnify 2022-02-15 20:33:24 +08:00
John Williams
4c59819dff Update Secret Lair Drop Series.txt 2022-02-15 12:28:49 +00:00
Anthony Calosa
c4384b3fb1 revert2 2022-02-15 19:19:01 +08:00
Anthony Calosa
355d194962 revert 2022-02-15 19:09:52 +08:00
Anthony Calosa
cb4adbde64 update CardRenderer.java 2022-02-15 15:52:31 +08:00
Anthony Calosa
ea6aaa1efb [Mobile] Card Magnifier
- Add option to display larger version of the hovered card.
2022-02-15 15:31:44 +08:00
Michael Kamensky
1b5de6c2b3 Merge branch 'freshmaster' into 'master'
Tested card scripts for NEO (2022-02-13)

See merge request core-developers/forge!6227
2022-02-15 04:17:37 +00:00
Michael Kamensky
d690e3d28b Merge branch 'neo_kotose' into 'master'
NEO: Kotose, the Silent Spider and support

See merge request core-developers/forge!6232
2022-02-15 04:17:27 +00:00
Tim Mocny
618efd594b NEO: Kotose, the Silent Spider and support 2022-02-15 04:17:27 +00:00
Michael Kamensky
1c6a860194 Merge branch 'master' into 'master'
[Mobile] Add CloseScreen

See merge request core-developers/forge!6233
2022-02-15 04:16:24 +00:00
Anthony Calosa
d9ce7949ca Merge remote-tracking branch 'core/master'
# Conflicts:
#	forge-gui-mobile/src/forge/Forge.java
2022-02-15 11:45:41 +08:00
Anthony Calosa
4b5584dca9 #CloseScreen 2022-02-15 11:30:36 +08:00
Renato Santos
2def56c963 Requested corrections 2022-02-15 01:29:57 +00:00
Bug Hunter
912a77fece Merge branch 'netplay' into 'master'
Fix netplay

See merge request core-developers/forge!6230
2022-02-14 11:08:01 +00:00
tool4EvEr
9b515abe8d Fix netplay 2022-02-14 12:00:41 +01:00
Bug Hunter
7b8c078343 Merge branch 'cardclean' into 'master'
Card cleanup

See merge request core-developers/forge!6229
2022-02-14 10:35:14 +00:00
TRT
b258eee9d2 Card cleanup 2022-02-14 11:34:19 +01:00
Michael Kamensky
a973790ee1 Merge branch 'neo_nec_13_feb' into 'master'
13 Feb - NEO & NEC card scripts from medusa

See merge request core-developers/forge!6225
2022-02-14 09:43:28 +00:00
Michael Kamensky
90bcadd048 Merge branch 'NPEfix' into 'master'
Fix NPE with Realmwalker

See merge request core-developers/forge!6228
2022-02-14 09:42:02 +00:00
tool4EvEr
313755fc2f Fix NPE with Realmwalker 2022-02-14 09:57:02 +01:00
paul_snoops
fb1a874839 card updates 2022-02-13 23:59:31 +00:00
Renato Santos
c36e7d0862 Tested card scripts for NEO (2022-02-10) 2022-02-13 23:31:52 +00:00
Renato Santos
731d369d98 Update forge-gui/res/tokenscripts/g_1_1_human_monk_g.txt 2022-02-13 23:28:22 +00:00
Paul Hammerton
866037f5cb Merge branch 'neo_nec_formats' into 'master'
Add NEO & NEC to formats

See merge request core-developers/forge!6226
2022-02-13 22:57:36 +00:00
paul_snoops
2b4bfddb5b Add NEO & NEC to formats 2022-02-13 22:56:32 +00:00
paul_snoops
12851a9dcd 13 Feb - NEO & NEC card scripts from medusa 2022-02-13 22:00:47 +00:00
Hans Mackowiak
30615035cb CardFactoryUtil: use new Transform layer for Daybound 2022-02-13 22:03:01 +01:00
Michael Kamensky
21dbc8d684 Merge branch 'twosat-master-patch-00930' into 'master'
Update de-DE.properties

See merge request core-developers/forge!6223
2022-02-13 18:27:13 +00:00
Michael Kamensky
5577d0a9cd Merge branch 'donate' into 'master'
Donate refactor

See merge request core-developers/forge!6177
2022-02-13 18:27:02 +00:00
Tim Mocny
f5d55f4b97 Donate refactor 2022-02-13 18:27:00 +00:00
Andreas Bendel
64b92a10e0 Update de-DE.properties
transladted ShowDraftRankingOverlay and lblAgainstAllOdds etc.
2022-02-13 16:54:25 +00:00
Paul Hammerton
2ea34fbb46 Merge branch 'htr_update' into 'master'
HTR edition updates

See merge request core-developers/forge!6221
2022-02-13 12:09:48 +00:00