paul_snoops
b5817c5c51
WIP: Rebalanced Blood Artist and other changes
2022-04-06 18:41:28 +01:00
Paul Hammerton
890429524c
Merge branch 'sld_blood_artist' into 'master'
...
SLD April 2022 Superdrop
See merge request core-developers/forge!6493
2022-04-06 17:38:28 +00:00
paul_snoops
dd275dc93f
SNC edition update
2022-04-06 18:37:24 +01:00
paul_snoops
ef160bb97b
SLD April 2022 Superdrop
2022-04-06 18:08:35 +01:00
Michael Kamensky
b807dc9e8c
Merge branch 'foretell' into 'master'
...
Fix foretell + additional costs
See merge request core-developers/forge!6479
2022-04-06 13:47:11 +00:00
Michael Kamensky
1f14c56e29
Merge branch 'costs' into 'master'
...
CostDraw merging
See merge request core-developers/forge!6492
2022-04-06 13:46:46 +00:00
tool4EvEr
cb097e642c
CostDraw merging
2022-04-06 11:40:05 +02:00
Michael Kamensky
e5eb263f2f
Merge branch 'countersfix' into 'master'
...
Fix cumulative upkeep counters
See merge request core-developers/forge!6488
2022-04-06 04:39:40 +00:00
Michael Kamensky
22ce529d12
Merge branch 'rivet' into 'master'
...
SNC: Riveteers Charm and support
See merge request core-developers/forge!6484
2022-04-06 04:37:48 +00:00
Tim Mocny
c3b5e2e270
SNC: Riveteers Charm and support
2022-04-06 04:37:45 +00:00
Michael Kamensky
b18be765e2
Merge branch 'millsdfix' into 'master'
...
MillEffect remove unneeded StackDesc line
See merge request core-developers/forge!6491
2022-04-06 04:36:12 +00:00
Northmoc
eaf5a993d1
MillEffect remove unneeded StackDesc line
2022-04-05 23:33:07 -04:00
Anthony Calosa
8d8a13236b
Merge branch 'master' into 'master'
...
Use rendered cards for Adventure when no image file has been found.
See merge request core-developers/forge!6490
2022-04-06 00:52:05 +00:00
Magpie
20b562fa07
Generate previews for card Rewards in Adventure.
...
This uses a framebuffer object to draw the card preview and output a texture.
The first MR gave issues when bilinear texture filtering was enabled.
2022-04-06 00:32:38 +02:00
Magpie
fdf305d966
Merge remote-tracking branch 'upstream/master'
2022-04-06 00:28:55 +02:00
Magpie
d5a5965c01
Revert "Use rendered cards for Adventure when no image file has been found."
...
This reverts commit e3f14d5bdc
2022-04-05 22:21:51 +00:00
tool4EvEr
56e9a1259c
Copy ReduceCost
2022-04-05 20:22:19 +02:00
tool4EvEr
758825a4f6
Fix foretell + additional costs
2022-04-05 20:22:18 +02:00
Michael Kamensky
896490bf25
Merge branch 'resetAttack' into 'master'
...
Don't clear attackedThisTurn too early
See merge request core-developers/forge!6486
2022-04-05 18:01:11 +00:00
Michael Kamensky
ad4a621385
Merge branch 'npefix' into 'master'
...
Fix Charm NPE
See merge request core-developers/forge!6487
2022-04-05 18:00:16 +00:00
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
