Commit Graph

3490 Commits

Author SHA1 Message Date
Michael Kamensky
b61ca9732e Merge branch 'modalDev' into 'master'
Dev Menu improvement for alternate card states

See merge request core-developers/forge!3665
2021-01-31 05:09:19 +00:00
Anthony Calosa
337ab0f3e5 [Mobile] fix optional discard GUI 2021-01-31 11:55:24 +08:00
tool4EvEr
8fef34f8dd Dev Mode improvement for alternate states 2021-01-28 17:40:11 +01:00
Bug Hunter
4db82a074b Cleanup CostRemoveCounter 2021-01-28 07:20:34 +00:00
Bug Hunter
0f28cbda4f Revert "Fix token created when removed before trigger resolves"
This reverts commit e33644ecf3.
2021-01-27 21:36:23 +00:00
Hans Mackowiak
1ba01c38be May spend Mana only work on Stack 2021-01-26 17:02:39 +01:00
tool4EvEr
38f70266d7 Skip unneeded Battlefield check 2021-01-26 12:24:20 +01:00
tool4EvEr
cf67e0afd8 Improve logic 2021-01-26 11:56:41 +01:00
Alumi
fb317ff9e7 Update Oubliette and fix Time and Tide 2021-01-26 04:18:32 +00:00
Anthony Calosa
6a49c26b58 [Mobile] use order GUI for discarding 2021-01-26 09:32:48 +08:00
tool4EvEr
fcf2e4dce0 Fix human being able to play opponents spells by default 2021-01-25 22:21:30 +01:00
Michael Kamensky
0441a2bc5d Merge branch 'illusionary_terrain' into 'master'
Illusionary Terrain

See merge request core-developers/forge!3636
2021-01-25 04:47:57 +00:00
Lyu Zong-Hong
104387c15a Implement Illusionary Terrain 2021-01-24 18:46:44 +09:00
tool4EvEr
0eaa83c689 Fix cube draft crash on saving 2021-01-23 14:16:15 +01:00
Sol
7646c99aca Merge branch 'fixConcedeFreeze' into 'master'
Fix desktop multiplayer conceding

Closes #1685

See merge request core-developers/forge!3576
2021-01-17 01:59:06 +00:00
tool4EvEr
62e0c60228 Fix old avatars for human players 2021-01-16 17:55:09 +01:00
Anthony Calosa
916a7d139f [Android] Update deviceinfo 2021-01-16 11:41:02 +08:00
Anthony Calosa
da54db1fca LibGDX Update
-Update to 1.9.13
-Add additional info on Forge.log
2021-01-16 10:00:27 +08:00
tool4EvEr
d68c0691f4 Clean up 2021-01-13 21:55:12 +01:00
tool4EvEr
afce0b1af4 Partial Rollback 2021-01-13 19:38:05 +01:00
tool4EvEr
e69abf0982 Code cleanup 2021-01-13 19:28:58 +01:00
Lyu Zong-Hong
5044b67469 Fix AI draft decks land set for sets without basic lands 2021-01-12 12:20:17 +09:00
Bug Hunter
58a18686da Fix multiplayer spells on lost players 2021-01-11 17:26:31 +00:00
tool4EvEr
fcc0cb9d0c Fix multiplayer conceding 2021-01-09 21:24:28 +01:00
Hans Mackowiak
3243133831 CardUtil getThisTurnEntered return LKI list 2021-01-09 15:53:00 +01:00
Anthony Calosa
46d4bfd7c8 Remove Unused Import 2021-01-09 16:22:46 +08:00
Sol
a6257c6faf Merge branch 'fullborderfixes' into 'master'
Fullborderfixes

See merge request core-developers/forge!3533
2021-01-09 02:38:27 +00:00
Sol
9b35f86818 Merge branch 'newMatchfix' into 'master'
Fix match restarting after first time

See merge request core-developers/forge!3538
2021-01-09 02:29:07 +00:00
Hans Mackowiak
8a2db82e1f HumanPlaySpellAbility: fixes setXManaCostPaid when cost doesn't has X 2021-01-06 14:20:45 +01:00
Hans Mackowiak
7c9ac66e8a AI: logic for X in Sac cost 2021-01-02 05:15:08 +00:00
Sol
76d9fbdb97 Merge branch 'fixException' into 'master'
Fix Exception by closing Dialog

See merge request core-developers/forge!3539
2020-12-30 02:39:32 +00:00
Tim Mocny
f700b9d43b Butcher Orgg!!! 2020-12-30 02:35:25 +00:00
tool4EvEr
97b8c2463e Fix Exception by closing Dialog 2020-12-26 22:21:53 +01:00
tool4EvEr
5bb713f7d8 Fix missing event register for restarted matches 2020-12-26 20:26:27 +01:00
tool4EvEr
bb85f9ecd5 Check for setless fullborder while calculating downloads 2020-12-24 10:27:17 +01:00
Michael Kamensky
e02b6b7264 Merge branch '1659-npe-at-forge-game-ability-abilityutils-getdefinedplayers-abilityutils-java-1084' into 'master'
CostRemoveCounter + CostRemoveAnyCounter: refactor remove X counters from something you control

Closes #1385 and #1660

See merge request core-developers/forge!3506
2020-12-23 08:05:26 +00:00
Hans Mackowiak
bbf788594f CostRemoveCounter + CostRemoveAnyCounter: refactor remove X counters from something you control 2020-12-23 08:05:26 +00:00
Northmoc
ecc6a65b1d Show card owner if being controlled by a different player 2020-12-22 16:17:04 -05:00
Anthony Calosa
c1cdcdcdfb -[Android] Option for Auto Cache size 2020-12-22 00:00:17 +08:00
Hans Mackowiak
56b5d53208 Cheat: fix cast cheat 2020-12-10 11:55:32 +01:00
Northmoc
f6ddda9b38 add chosen number to card detail pane 2020-12-08 08:30:12 -05:00
Hans Mackowiak
8076682d1b AbstractGuiGame: only create Timer when needed, and destroy again after game end 2020-12-06 09:49:57 +01:00
Anthony Calosa
3ba79ea606 [Mobile] Add Landwalk and Commander Icons 2020-12-06 16:39:51 +08:00
Hans Mackowiak
db77e2861c CardDb: dont keep allCards list just use values collection 2020-12-05 10:08:41 +01:00
Hans Mackowiak
7734cec951 Achievement: use Match instead of Game info to get the GameRules 2020-12-01 11:10:23 +01:00
Sol
6c9f9a4d6c Merge branch 'playerControllerGameMemory' into 'master'
GameView: do not store Game anymore, get it from Match

Closes #1650

See merge request core-developers/forge!3457
2020-12-01 01:40:04 +00:00
Hans Mackowiak
a3ec4817a2 Fixed mindSlaveMaster == controller causing StackoverflowError 2020-11-30 11:59:19 +01:00
Hans Mackowiak
49e7f20a41 WithFlash: refactor into Static 2020-11-30 10:50:15 +00:00
Northmoc
6eb6d5d758 support "notDrawnThisTurn" 2020-11-29 16:13:39 -05:00
Hans Mackowiak
81bfaf2a15 Match: add extra Event Loop to Match for Events when the Game is closed 2020-11-29 11:19:00 +01:00