Anthony Calosa
bd9d2e5f20
unused import
2022-03-03 08:15:24 +00:00
Anthony Calosa
0fc5ae2192
Merge branch 'master' into 'master'
...
[Mobile] Update Deck AI Indicator
See merge request core-developers/forge!6332
2022-03-03 07:51:18 +00:00
Anthony Calosa
d88edc4e31
[Mobile] Update Deck AI Indicator
...
- AI Indicator (green) means all cards on the main deck are AI playable
2022-03-03 15:31:28 +08:00
Michael Kamensky
fa1561f9d4
Merge branch 'freshmaster' into 'master'
...
Incidental Editing Vol. 3: \tokenscripts
See merge request core-developers/forge!6312
2022-03-03 04:32:47 +00:00
Renato Santos
94ba1a14ae
Incidental Editing Vol. 3: \tokenscripts
2022-03-03 04:32:36 +00:00
Anthony Calosa
83d3266ee3
Merge branch 'master' into 'master'
...
[Adventure] prevent NPE when the user tries to save without selecting saveslot
See merge request core-developers/forge!6330
2022-03-02 22:35:05 +00:00
Anthony Calosa
f223dc25e7
Merge branch 'controllspellfix' into 'master'
...
ControlSpell: fix for suspend
See merge request core-developers/forge!6329
2022-03-02 22:34:37 +00:00
Anthony Calosa
a7c8885a41
Merge branch 'npe' into 'master'
...
Fix NPE with Numa
See merge request core-developers/forge!6331
2022-03-02 22:33:23 +00:00
tool4EvEr
f815a61775
Fix NPE with Numa
2022-03-02 23:27:38 +01:00
Anthony Calosa
c5c1e97d11
prevent NPE when tthe user tries to save without selecting saveslot
2022-03-03 06:24:06 +08:00
tool4EvEr
544ca0780a
ControlSpell: fix for suspend
2022-03-02 22:24:33 +01:00
Anthony Calosa
88d80c64fc
Merge branch 'master' into 'master'
...
[Adventure] Adjust Map & Avatar Size for Portrait Mode
See merge request core-developers/forge!6327
2022-03-02 11:39:26 +00:00
Anthony Calosa
70d7426c1a
adjust avatar and map height
2022-03-02 19:29:02 +08:00
Anthony Calosa
087ebd9f7a
crop title bg in portrait mode
2022-03-02 16:27:20 +08:00
Anthony Calosa
107ef7492e
Merge branch 'kevlahnota-master-patch-40281' into 'master'
...
fix regex compleated
See merge request core-developers/forge!6326
2022-03-02 06:37:33 +00:00
Anthony Calosa
5b97f26618
regex compleated
2022-03-02 06:31:52 +00:00
Anthony Calosa
78b6a409cd
Merge branch 'master' into 'master'
...
Adventure portrait mode
See merge request core-developers/forge!6325
2022-03-02 02:56:02 +00:00
Anthony Calosa
8524229676
initialize once to prevent bug switch game modes
2022-03-02 10:23:53 +08:00
Anthony Calosa
d94dcd3256
update
2022-03-02 09:56:36 +08:00
Anthony Calosa
48ad0db558
Merge remote-tracking branch 'core/master'
2022-03-02 05:49:49 +08:00
Anthony Calosa
0317adfd31
Adventure portrait mode
2022-03-02 05:43:30 +08:00
Bug Hunter
76a88305ad
Merge branch 'import' into 'master'
...
Fix import
See merge request core-developers/forge!6324
2022-03-01 10:51:54 +00:00
TRT
af2ace701c
Fix import
2022-03-01 11:50:41 +01:00
Michael Kamensky
134bdaeb3d
Merge branch 'cardfix' into 'master'
...
Fix card KW on player
See merge request core-developers/forge!6323
2022-03-01 03:53:36 +00:00
tool4EvEr
e09aa4af95
Fix card KW on player
2022-02-28 22:41:28 +01:00
Hans Mackowiak
6387929b7b
Merge branch '2079-kamigawa-compleated' into 'master'
...
Resolve "Kamigawa: Compleated"
Closes #2079
See merge request core-developers/forge!6319
2022-02-28 13:38:10 +00:00
Hans Mackowiak
b065db77ed
Resolve "Kamigawa: Compleated"
2022-02-28 13:38:06 +00:00
Anthony Calosa
972d854d1f
Merge branch 'master' into 'master'
...
fix bug while switching game modes and forcing an exit
See merge request core-developers/forge!6322
2022-02-28 12:31:54 +00:00
Anthony Calosa
164e3bc62c
Merge remote-tracking branch 'core/master'
2022-02-28 20:28:23 +08:00
Anthony Calosa
472bb635ed
fix bug while switching game modes and forcing an exit
...
- aldo update new_game_mobile.json
2022-02-28 20:26:33 +08:00
Michael Kamensky
d5c3f79f35
Merge branch 'hasABasicLandType' into 'master'
...
CardType: add hasABasicLandType as Property
Closes #2073
See merge request core-developers/forge!6320
2022-02-28 10:40:54 +00:00
Anthony Calosa
5f6851ff34
Merge branch 'master' into 'master'
...
[Mobile] Add Adventure/Classic Switch button
See merge request core-developers/forge!6321
2022-02-28 07:39:25 +00:00
Anthony Calosa
13d800ca0a
Merge remote-tracking branch 'core/master'
2022-02-28 15:19:15 +08:00
Anthony Calosa
ecbfb5bdd1
[Mobile] Add Adventure/Classic Switch button
...
- on Classic Mode, on Exit, you can switch to Adventure Mode
- on Adventure Mode, added switch button to Classic Mode
2022-02-28 15:14:25 +08:00
Hans Mackowiak
273e821592
CardType: add hasABasicLandType as Property
2022-02-28 07:24:49 +01:00
Michael Kamensky
97b848b49c
Merge branch 'paco_cardformatcolumn' into 'master'
...
Add card column: FORMAT
See merge request core-developers/forge!6318
2022-02-27 19:19:32 +00:00
Paco Ito
ff657f1412
Add card column: FORMAT
2022-02-27 19:19:32 +00:00
Anthony Calosa
7c1ea008ca
Merge branch 'master' into 'master'
...
update viewport
See merge request core-developers/forge!6317
2022-02-27 12:53:22 +00:00
Anthony Calosa
8129d1004a
Merge remote-tracking branch 'core/master'
2022-02-27 20:52:46 +08:00
Anthony Calosa
cd79764395
update viewport
...
- Scaling to fillX, some MapStage are larger than the intended width.
2022-02-27 20:51:27 +08:00
Michael Kamensky
b0c5af8d37
Merge branch 'twosat-master-patch-14482' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!6316
2022-02-27 12:40:15 +00:00
Andreas Bendel
32f4f1f3e5
Update de-DE.properties
...
translated lblWouldYouLikePutRemoveCounters
2022-02-27 12:27:19 +00:00
Anthony Calosa
10ef223854
Merge branch 'master' into 'master'
...
unused import
See merge request core-developers/forge!6315
2022-02-27 11:52:56 +00:00
Anthony Calosa
0c77e8b270
unused import
2022-02-27 19:52:20 +08:00
Anthony Calosa
45e4c1ab8f
Merge branch 'master' into 'master'
...
[Adventure] Fix World Background & Loading Transition
See merge request core-developers/forge!6314
2022-02-27 11:33:31 +00:00
Anthony Calosa
9e4ce0756e
[Adventure] fix Map Stage Visibility
...
- add Life, Money on Statistics
- use ExtendViewport for MapStage
- auto show/hide Map and GameHud controls for MapStage visibility
- decrease Reward/Match delay for faster loading of scenes
2022-02-27 19:08:03 +08:00
Anthony Calosa
360522475c
remove unnecessary pixmap
2022-02-27 13:19:33 +08:00
Anthony Calosa
ac8365e13a
Fix World Background
2022-02-27 13:12:55 +08:00
Anthony Calosa
3f252af15e
fix black transition screen when loading save
...
- run transition screen first then switchscene
2022-02-27 12:34:35 +08:00
Anthony Calosa
b283ff5c7f
Merge branch 'master' into 'master'
...
use DecompressibleInputStream
See merge request core-developers/forge!6313
2022-02-27 03:56:55 +00:00
