Commit Graph

56126 Commits

Author SHA1 Message Date
John Williams
e9f697da1b Update Secret Lair Drop Series.txt 2022-02-25 10:53:05 +00:00
Anthony Calosa
c382140138 Merge branch 'master' into 'master'
update RewardScene

See merge request core-developers/forge!6303
2022-02-25 10:17:06 +00:00
Anthony Calosa
c2dbf1075c update RewardScene 2022-02-25 10:17:05 +00:00
Anthony Calosa
0ec1e7a25a update RewardScene 2022-02-25 18:14:12 +08:00
Anthony Calosa
2a00684208 Merge remote-tracking branch 'core/master' 2022-02-25 15:42:13 +08:00
Michael Kamensky
984f91ec0d Merge branch 'rebalanced_24_feb_2022' into 'master'
24 February 2022 Arena Rebalanced Cards

See merge request core-developers/forge!6299
2022-02-25 03:52:49 +00:00
Michael Kamensky
d6f3b85f22 Merge branch 'counters_put_rem' into 'master'
Tweak CountersPutRemoveEffect and add it to some cards

See merge request core-developers/forge!6300
2022-02-25 03:39:50 +00:00
Tim Mocny
b7e902826a Tweak CountersPutRemoveEffect and add it to some cards 2022-02-25 03:39:43 +00:00
Michael Kamensky
a7011458f9 Merge branch 'lavinia' into 'master'
fix for Lavinia

See merge request core-developers/forge!6295
2022-02-25 03:38:03 +00:00
Tim Mocny
e45df68f69 fix for Lavinia 2022-02-25 03:38:01 +00:00
Michael Kamensky
0b9e36df2d Merge branch 'sld_sf' into 'master'
SLD x Street Fighter

See merge request core-developers/forge!6293
2022-02-25 03:37:37 +00:00
Tim Mocny
fbe9a7daec SLD x Street Fighter 2022-02-25 03:37:33 +00:00
paul_snoops
4a35c28576 Town-Razer Tyrant changed from razer to Razer 2022-02-24 22:37:54 +00:00
Anthony Calosa
f2092f3c68 Merge remote-tracking branch 'core/master' 2022-02-24 21:34:27 +08:00
Michael Kamensky
8edf933392 Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!6297
2022-02-24 13:03:23 +00:00
paul_snoops
f0c3b0ebf5 24 February 2022 Arena Rebalanced Cards 2022-02-24 10:57:27 +00:00
Hans Mackowiak
c5b5845da3 Merge branch 'freshmaster' into 'master'
Incidental Editing

See merge request core-developers/forge!6290
2022-02-24 08:21:16 +00:00
Bug Hunter
c2e90da40a Merge branch 'spacing' into 'master'
spacing for $ChangeZone

See merge request core-developers/forge!6294
2022-02-24 08:11:58 +00:00
Hans Mackowiak
8283720e4a GameAction: register LTB for all cards on LastStateBattlefield 2022-02-24 07:39:14 +01:00
Churrufli
f1b2c1158f Net Decks Archive Updates 2022-02-24 07:32:57 +01:00
Northmoc
d136b6b3dd spacing for $ChangeZone 2022-02-23 21:59:12 -05:00
Anthony Calosa
e53966f361 Merge branch 'master' into 'master'
[Mobile] Update Adventure Layout and Fix Player name

See merge request core-developers/forge!6286
2022-02-24 00:31:25 +00:00
Anthony Calosa
ee482059f9 [Mobile] Update Adventure Layout and Fix Player name 2022-02-24 00:31:24 +00:00
Anthony Calosa
5a9322c0ee fix resume 2022-02-24 08:26:18 +08:00
Anthony Calosa
e042c57dca Merge remote-tracking branch 'core/master' 2022-02-24 08:17:14 +08:00
Anthony Calosa
2bee81d49c update stage and cleanup 2022-02-24 08:16:59 +08:00
Anthony Calosa
86906004f2 Merge branch 'TRT-master-patch-61600' into 'master'
Update forge-gui/res/cardsfolder/i/inferno_hellion.txt

See merge request core-developers/forge!6292
2022-02-24 00:12:49 +00:00
Anthony Calosa
023d8e9543 Merge remote-tracking branch 'core/master' 2022-02-24 05:13:33 +08:00
Bug Hunter
18b3dd5160 Update forge-gui/res/cardsfolder/i/inferno_hellion.txt 2022-02-23 20:55:39 +00:00
Anthony Calosa
ede766fc56 update inn and deck select scene 2022-02-24 04:17:00 +08:00
Michael Kamensky
d013e50a3f Merge branch 'paco_propericonscaling' into 'master'
feat: make icons scale using SCALE_SMOOTH

See merge request core-developers/forge!6287
2022-02-23 19:52:42 +00:00
Paco Ito
6b24d956f6 feat: make icons scale using SCALE_SMOOTH 2022-02-23 19:52:41 +00:00
Anthony Calosa
44a363d075 update stats 2022-02-24 03:18:51 +08:00
Anthony Calosa
1e73ac0e4a update deck selector 2022-02-24 02:29:13 +08:00
Renato Santos
5413422245 Update forge-gui/res/cardsfolder/rebalanced/a-ellywick_tumblestrum.txt, forge-gui/res/cardsfolder/rebalanced/a-teferi_time_raveler.txt 2022-02-23 18:13:47 +00:00
Anthony Calosa
1624617207 Merge remote-tracking branch 'core/master' 2022-02-24 02:09:23 +08:00
Anthony Calosa
94594673e0 update 2022-02-24 02:07:35 +08:00
Renato Santos
2d9774acea Update forge-gui/res/cardsfolder/upcoming/armguard_familiar.txt 2022-02-23 17:58:16 +00:00
Renato Santos
82ca945230 Update forge-gui/res/cardsfolder/s/stuffed_bear.txt 2022-02-23 17:52:23 +00:00
Renato Santos
c2f2ab9550 Update forge-gui/res/cardsfolder/t/teferis_veil.txt, forge-gui/res/cardsfolder/e/eerie_ultimatum.txt 2022-02-23 17:36:52 +00:00
Bug Hunter
ad99ed236a Merge branch 'TRT-master-patch-98000' into 'master'
Update forge-gui/res/cardsfolder/upcoming/the_wandering_emperor.txt

See merge request core-developers/forge!6291
2022-02-23 17:33:30 +00:00
Bug Hunter
fdbb1ad98c Update forge-gui/res/cardsfolder/upcoming/the_wandering_emperor.txt 2022-02-23 17:32:55 +00:00
Renato Santos
59b7a56078 Update forge-gui/res/cardsfolder/upcoming/tanuki_transplanter.txt 2022-02-23 17:30:15 +00:00
Renato Santos
c3da514145 Update forge-gui/res/cardsfolder/upcoming/jukai_preserver.txt 2022-02-23 17:17:47 +00:00
Renato Santos
f3f9a7d99a Update forge-gui/res/cardsfolder/w/wildest_dreams.txt 2022-02-23 16:36:05 +00:00
Renato Santos
f64331ddc3 Update forge-gui/res/cardsfolder/l/leinore_autumn_sovereign.txt 2022-02-23 16:08:00 +00:00
Renato Santos
8227582b16 Merge branch 'master' into 'freshmaster'
# Conflicts:
#   forge-gui/res/cardsfolder/upcoming/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt
#   forge-gui/res/cardsfolder/upcoming/rampant_rejuvenator.txt
2022-02-23 15:41:22 +00:00
Renato Santos
1251b8a02c Update forge-gui/res/cardsfolder/d/drake_stone.txt 2022-02-23 15:02:09 +00:00
Michael Kamensky
30b348a97c Merge branch 'hybrid' into 'master'
ManaEffect: fix for adding from cost with generic half

See merge request core-developers/forge!6289
2022-02-23 14:52:44 +00:00
tool4EvEr
885b32f85a ManaEffect: fix for adding from cost with generic half 2022-02-23 15:43:03 +01:00