Michael Kamensky
23fb368bd1
Merge branch 'zonefixes' into 'master'
...
Fix missing zones
See merge request core-developers/forge!6489
2022-04-05 17:59:36 +00:00
TRT
edac3edd73
Fix missing zones
2022-04-05 18:26:03 +02:00
TRT
5d25939070
Update merge logic
2022-04-05 16:14:26 +02:00
TRT
c26bf7a60e
Fix cumulative upkeep counters
2022-04-05 15:31:40 +02:00
TRT
500789e42c
Update check
2022-04-05 14:51:09 +02:00
TRT
21043e50d5
Fix Charm NPE
2022-04-05 13:41:17 +02:00
TRT
806922dafa
Cleanup todo (actually fixes corner case with Chandra's Incinerator)
2022-04-05 11:48:52 +02:00
TRT
ce1cacbaee
Don't clear attackedThisTurn too early
2022-04-05 11:36:32 +02:00
Michael Kamensky
c761981c0e
Merge branch 'rebalanced_07_apr_2022' into 'master'
...
07 April 2022 Arena Rebalanced Cards
See merge request core-developers/forge!6464
2022-04-05 09:23:42 +00:00
paul_snoops
b8af5e8820
second round of cards
2022-04-05 09:53:25 +01:00
Magpie
e3f14d5bdc
Use rendered cards for Adventure when no image file has been found.
...
This allows seeing cards that are yet to download as well as custom cards.
Also, a card rendering is forced before showing the mode selection screen, a temporary fix with an issue with CardImageRenderer, where it fails the very first time.
2022-04-05 02:06:07 +02:00
Michael Kamensky
311002069a
Merge branch 'kevlahnota-master-patch-16223' into 'master'
...
[Mobile] Fix Mobile GUI Illegal cast
Closes #2127
See merge request core-developers/forge!6470
2022-04-04 14:42:48 +00:00
Michael Kamensky
4f3c16a8de
Merge branch 'NewMaster' into 'master'
...
update adventure saveload dialog & screen image capture
See merge request core-developers/forge!6483
2022-04-04 14:41:46 +00:00
Anthony Calosa
13e909e44b
update adventure saveload dialog & screen image capture
2022-04-04 22:15:05 +08:00
Anthony Calosa
9248d06141
only show eligible players on mayplay ability text
2022-04-04 13:53:40 +00:00
Michael Kamensky
2c6e5575a8
Merge branch 'cardfixes' into 'master'
...
Card fixes
See merge request core-developers/forge!6480
2022-04-04 13:52:16 +00:00
Paul Hammerton
0f7de70295
Merge branch 'migrate_yneo' into 'master'
...
Migrate YNEO, SLD and STX scripts
See merge request core-developers/forge!6482
2022-04-04 11:37:41 +00:00
paul_snoops
54de87e77f
Migrate YNEO, SLD and STX scripts
2022-04-04 12:34:15 +01:00
paul_snoops
9a8f698b0d
first round of cards
2022-04-04 09:25:57 +01:00
paul_snoops
3fbb8582a0
07 April 2022 Arena Rebalanced Cards
2022-04-04 08:38:33 +01:00
Paul Hammerton
419c20e721
Merge branch 'snc_update' into 'master'
...
SNC update and MIR token fix
See merge request core-developers/forge!6481
2022-04-04 07:36:56 +00:00
paul_snoops
98f6179dbb
SNC update and MIR token fix
2022-04-04 08:35:46 +01:00
tool4EvEr
a01b461631
Card fixes
2022-04-04 09:25:31 +02:00
Michael Kamensky
616bbb07f7
Merge branch 'johnwilliams7-master-patch-42808' into 'master'
...
Update Secret Lair Drop Series.txt
See merge request core-developers/forge!6478
2022-04-04 04:02:35 +00:00
Anthony Calosa
493f3f25f8
fix as foretold + revelation illegal cast
2022-04-04 00:48:49 +00:00
John Williams
2719759e19
Update Secret Lair Drop Series.txt
2022-04-03 12:12:47 +00:00
Michael Kamensky
5aa35a43d9
Merge branch 'NewMaster' into 'master'
...
[Mobile] update Adventure inventory
See merge request core-developers/forge!6477
2022-04-03 04:06:44 +00:00
Anthony Calosa
a7d3d83287
[Mobile] update Adventure inventory
2022-04-03 10:27:09 +08:00
Anthony Calosa
e4487de90f
Merge branch 'master' into 'master'
...
Prevent loading sprites that are out of bonds in Adventure.
See merge request core-developers/forge!6476
2022-04-03 00:28:51 +00:00
Magpie
16bd09d6eb
Prevent loading sprites that are out of bonds in Adventure.
...
Could happen from older savefiles.
2022-04-03 01:48:39 +02:00
Michael Kamensky
d9f9a86ed4
Merge branch 'tgtcap' into 'master'
...
AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType
See merge request core-developers/forge!6472
2022-04-02 04:55:06 +00:00
Tim Mocny
2e047ee410
AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType
2022-04-02 04:55:06 +00:00
Michael Kamensky
b80b559a74
Merge branch 'snc_1' into 'master'
...
SNC - 1 Apr
See merge request core-developers/forge!6471
2022-04-02 04:54:53 +00:00
Tim Mocny
e2c73ab178
SNC - 1 Apr
2022-04-02 04:54:52 +00:00
Michael Kamensky
15157e9cbf
Merge branch 'adventure' into 'master'
...
New Adventure features
See merge request core-developers/forge!6474
2022-04-02 04:52:24 +00:00
Grimm
882aa434c4
-added items/equipment
...
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
2022-04-01 21:25:40 +02:00
Grimm
e55f859d19
-added items/equipment
...
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
2022-04-01 21:14:51 +02:00
Grimm
55fd56e7d2
-added items/equipment
...
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
2022-04-01 21:14:22 +02:00
Grimm
6349dcbad8
-added items/equipment
...
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
2022-04-01 20:30:54 +02:00
Sol
fdffb80813
Merge branch 'unused-import' into 'master'
...
Fix unused import
See merge request core-developers/forge!6473
2022-04-01 18:24:30 +00:00
Sol
93f4701592
Fix unused import
2022-04-01 18:21:51 +00:00
Anthony Calosa
c411476ca1
revert check since unselectable doesn't work before selection is made
2022-04-01 15:27:38 +00:00
Anthony Calosa
1f89136475
check if not selectable
2022-04-01 15:22:24 +00:00
Anthony Calosa
9c5a487341
update
2022-04-01 15:18:22 +00:00
Anthony Calosa
36aff0cf6c
limit check to hand
2022-04-01 15:00:41 +00:00
Anthony Calosa
467c51cadd
update mayplay
2022-04-01 14:33:54 +00:00
Anthony Calosa
041fbfe523
Update check to viewable cards
2022-04-01 13:26:23 +00:00
Anthony Calosa
a4d0f9cdd7
[Mobile] Fix Mobile GUI Illegal cast
...
closes #2127
2022-04-01 12:46:56 +00:00
Anthony Calosa
0f8286ec8f
Merge branch 'NewMaster' into 'master'
...
[Mobile] update PlayEffect
See merge request core-developers/forge!6467
2022-04-01 11:27:44 +00:00
Anthony Calosa
68102b8ac3
unused import
2022-04-01 19:10:06 +08:00
