paul_snoops
f22b7b75a8
SNC and NCC edition updates
2022-04-08 08:08:35 +01:00
Anthony Calosa
268a136c50
Merge branch 'NewMaster' into 'master'
...
fix green castle
See merge request core-developers/forge!6501
2022-04-07 17:07:46 +00:00
Anthony Calosa
9f51aeee2a
fix green castle
2022-04-08 01:06:04 +08:00
Anthony Calosa
6c041a452b
Merge branch 'NewMaster' into 'master'
...
Allow to load old saves to fail to regenerate a new correct world
See merge request core-developers/forge!6499
2022-04-07 15:50:14 +00:00
Anthony Calosa
4571edd9d1
Allow to load old saves to fail to regenerate a new correct world
2022-04-07 23:46:47 +08:00
Bug Hunter
4d132f03c5
Merge branch 'TRT-master-patch-24292' into 'master'
...
Update forge-gui/res/cardsfolder/h/horde_of_notions.txt
See merge request core-developers/forge!6498
2022-04-07 15:17:41 +00:00
Bug Hunter
a3c38b58bb
Update forge-gui/res/cardsfolder/h/horde_of_notions.txt
2022-04-07 15:17:08 +00:00
Anthony Calosa
78744ded60
Merge branch 'master' into 'master'
...
Some Adventure improvements and tweaks.
See merge request core-developers/forge!6496
2022-04-07 14:12:52 +00:00
Paul Hammerton
c0afa686cc
Update Jumpstart.txt
2022-04-07 12:14:41 +00:00
Magpie
d687088fd8
Quick fixes.
...
Made text wrap in item descriptions and reverted a test item.
2022-04-07 12:22:51 +02:00
Magpie
9fb3ff599b
Added a new equipment (Dungeon Map).
...
With Grimm's permission.
2022-04-07 11:27:31 +02:00
Magpie
3b32215ac5
Change custom formats path.
...
Was requested by Snoops, for consistency with the other custom contents.
The new path is $HOME/.forge/custom/formats. (or equivalent in Windows)
2022-04-07 10:25:41 +02:00
Magpie
473410b449
Might as well.
2022-04-07 10:10:41 +02:00
Magpie
0c5e59089e
As suggested.
2022-04-07 09:45:28 +02:00
Magpie
4480675799
Added item tooltips with names and descriptions to rewards view in Adventure.
...
Please test on mobile in case the text is too small!
Moved item description method to the ItemData class so it can be reached anywhere, and made some minor tweaks for *conveyance*.
2022-04-07 07:41:38 +02:00
Michael Kamensky
766865229a
Merge branch 'master' into 'master'
...
Allow defining AI profile for Adventure monsters.
See merge request core-developers/forge!6495
2022-04-07 03:05:46 +00:00
Magpie
3c5ad4f5d7
Sped up some animations in Adventure.
...
This way they don't feel like load times.
2022-04-07 04:37:40 +02:00
Magpie
bd5f4ee1fc
Small fix.
2022-04-07 04:08:39 +02:00
Magpie
0a08fa3deb
Enables selecting AI type for Adventure mode enemies.
...
So far only the Wurm has forced Reckless AI, we should ask players or deck experts about what AI types to use for each deck.
2022-04-07 04:01:37 +02:00
Magpie
b655d73d13
Removes unused var.
2022-04-06 22:08:33 +02:00
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
