Anthony Calosa
|
5a0f1714e9
|
use DecompressibleInputStream
|
2022-02-27 11:55:14 +08:00 |
|
Anthony Calosa
|
6aec834317
|
Merge branch 'master' into 'master'
[Adventure] Try to load old save file
See merge request core-developers/forge!6311
|
2022-02-27 03:09:17 +00:00 |
|
Anthony Calosa
|
e125c43304
|
Merge branch 'edition_type_fixes' into 'master'
Small edition type changes
See merge request core-developers/forge!6310
|
2022-02-27 03:05:54 +00:00 |
|
Anthony Calosa
|
ac440d5d07
|
update
|
2022-02-27 11:05:08 +08:00 |
|
Anthony Calosa
|
26f27bdd76
|
[Adventure] Try to load old save file
- override mismatch
|
2022-02-27 11:00:28 +08:00 |
|
paul_snoops
|
814a0d02da
|
Small edition type changes
|
2022-02-26 20:27:06 +00:00 |
|
Anthony Calosa
|
e278a4c63e
|
Merge branch 'master' into 'master'
[Android] fix reward actor
See merge request core-developers/forge!6309
|
2022-02-26 14:38:10 +00:00 |
|
Anthony Calosa
|
b72a991d5c
|
[Android] fix reward actor
|
2022-02-26 22:35:29 +08:00 |
|
Anthony Calosa
|
ee972cc576
|
Merge branch 'kevlahnota-master-patch-94209' into 'master'
fix compile
See merge request core-developers/forge!6308
|
2022-02-26 10:15:38 +00:00 |
|
Anthony Calosa
|
c5c484fd41
|
fix compile
|
2022-02-26 10:15:16 +00:00 |
|
Anthony Calosa
|
10c358cd3e
|
Merge branch 'master' into 'master'
update StartScene and NewGameScene
See merge request core-developers/forge!6307
|
2022-02-26 06:39:24 +00:00 |
|
Anthony Calosa
|
31824f2180
|
update resume
- if the player was inside the tilemap, reload the tiledmap scene
|
2022-02-26 14:38:28 +08:00 |
|
Anthony Calosa
|
6ec2078509
|
Merge remote-tracking branch 'core/master'
|
2022-02-26 12:39:08 +08:00 |
|
Anthony Calosa
|
b5631eb95c
|
update StartScene and NewGameScene
|
2022-02-26 12:37:30 +08:00 |
|
Michael Kamensky
|
fdd96eefe7
|
Merge branch 'freshmaster' into 'master'
Incidental Editing Vol. 2
See merge request core-developers/forge!6301
|
2022-02-26 04:21:19 +00:00 |
|
Renato Santos
|
cda2626816
|
Incidental Editing Vol. 2
|
2022-02-26 04:21:10 +00:00 |
|
Anthony Calosa
|
816ecd645f
|
Merge branch 'master' into 'master'
update touch controls
See merge request core-developers/forge!6306
|
2022-02-26 04:14:00 +00:00 |
|
Anthony Calosa
|
373be68a76
|
Merge remote-tracking branch 'core/master'
# Conflicts:
# forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
|
2022-02-26 12:05:33 +08:00 |
|
Anthony Calosa
|
9c72cd2279
|
update touch controls
|
2022-02-26 11:58:51 +08:00 |
|
Anthony Calosa
|
14d71ad278
|
pull from master
|
2022-02-26 11:56:25 +08:00 |
|
Bug Hunter
|
e03811c803
|
Merge branch 'TRT-master-patch-47800' into 'master'
Update forge-gui/res/cardsfolder/t/tomb_tyrant.txt
See merge request core-developers/forge!6305
|
2022-02-25 20:39:20 +00:00 |
|
Bug Hunter
|
652bcbd415
|
Update forge-gui/res/cardsfolder/t/tomb_tyrant.txt
|
2022-02-25 20:38:44 +00:00 |
|
Michael Kamensky
|
358a02fb12
|
Merge branch 'johnwilliams7-master-patch-57238' into 'master'
Update Secret Lair Drop Series.txt
See merge request core-developers/forge!6304
|
2022-02-25 17:30:28 +00:00 |
|
Michael Kamensky
|
eff74c7d92
|
Merge branch '2053-ltb-trigger-might-be-stopped-by-own-die-replacementeffect' into 'master'
Resolve "LTB Trigger might be stopped by own Die ReplacementEffect"
Closes #2053
See merge request core-developers/forge!6298
|
2022-02-25 17:30:13 +00:00 |
|
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 |
|