Michael Kamensky
|
a36c00e999
|
Merge branch 'companion' into 'master'
Restrictions for companion
Closes #1767
See merge request core-developers/forge!4171
|
2021-03-12 07:31:15 +00:00 |
|
Michael Kamensky
|
b20c79acd6
|
Merge branch 'remove-svars' into 'master'
Remove Svars param from Effect
See merge request core-developers/forge!4152
|
2021-03-12 05:43:29 +00:00 |
|
Michael Kamensky
|
1fb4e4af9c
|
Merge branch 'cleanlayout' into 'master'
Deskop layout: remove obsolete elements
See merge request core-developers/forge!4167
|
2021-03-12 04:17:50 +00:00 |
|
Michael Kamensky
|
016bdf6077
|
Merge branch 'targetable' into 'master'
PlayerPredicates: full targetable check
See merge request core-developers/forge!4177
|
2021-03-12 04:17:03 +00:00 |
|
Michael Kamensky
|
a7d6ca5d33
|
Merge branch 'friendship' into 'master'
Forbidden Friendship: Add ChangeZoneTable
Closes #1771
See merge request core-developers/forge!4178
|
2021-03-11 18:17:16 +00:00 |
|
tool4EvEr
|
2d4725ec72
|
Add ChangeZoneTable
|
2021-03-11 18:34:14 +01:00 |
|
tool4EvEr
|
8151297973
|
PlayerPredicates: full targetable check
|
2021-03-11 17:56:40 +01:00 |
|
Adam Pantel
|
26eb83bab3
|
Captains Maneuver start
|
2021-03-11 11:51:19 -05:00 |
|
Adam Pantel
|
8a603a2ab2
|
getSVars improvements, snapshot svars on effect
|
2021-03-11 11:51:19 -05:00 |
|
Adam Pantel
|
0c15649116
|
Remove effect svars (code)
|
2021-03-11 10:49:44 -05:00 |
|
Adam Pantel
|
2564c0e6e3
|
Remove effect svars (scripts)
|
2021-03-11 10:49:44 -05:00 |
|
Michael Kamensky
|
40230cbb18
|
Merge branch 'season_of_the_witch' into 'master'
Add Season of the Witch
See merge request core-developers/forge!4173
|
2021-03-11 14:30:17 +00:00 |
|
Alumi
|
a305dc999e
|
Add Season of the Witch
|
2021-03-11 14:30:17 +00:00 |
|
Michael Kamensky
|
0ecbc3732e
|
Merge branch 'master' into 'master'
Net Deck Archive Block (Desktop & Android)
See merge request core-developers/forge!4175
|
2021-03-11 14:30:13 +00:00 |
|
Anthony Calosa
|
498b52228e
|
Merge branch 'master' into 'master'
[Mobile] fix copying commander netdeck to clipboard
See merge request core-developers/forge!4176
|
2021-03-11 13:44:35 +00:00 |
|
Anthony Calosa
|
61f6f6717d
|
Merge remote-tracking branch 'core/master'
|
2021-03-11 21:43:58 +08:00 |
|
Anthony Calosa
|
6594c7f009
|
[Mobile] fix copying commander netdeck to clipboard
- resolves an issue that you can't copy to clipboard commander netdecks and import it again since "Commander" is a decksection
|
2021-03-11 21:42:44 +08:00 |
|
Churrufli
|
b2634686e6
|
Net Deck Archive Block (Desktop & Android)
|
2021-03-11 13:06:46 +01:00 |
|
Anthony Calosa
|
e36d8d8db3
|
Merge branch 'master' into 'master'
[Mobile] update FDeckChooser
See merge request core-developers/forge!4174
|
2021-03-11 11:02:59 +00:00 |
|
Anthony Calosa
|
b1e6521d53
|
[Mobile] update FDeckChooser
- select the index as workaround to refresh the display for other deck category
|
2021-03-11 18:59:54 +08:00 |
|
Anthony Calosa
|
b93f68ef34
|
Merge branch 'master' into 'master'
[Mobile] fix netdecks not loading decks imageview on activation
See merge request core-developers/forge!4172
|
2021-03-11 04:32:59 +00:00 |
|
Anthony Calosa
|
5f4a1f1a49
|
[Mobile] fix netdecks not loading decks imageview on activation
- Adds a different method to select the netdeck category on imageview
|
2021-03-11 12:23:24 +08:00 |
|
Michael Kamensky
|
d71a55f84e
|
Merge branch 'animosity' into 'master'
Shared Animosity: Fix NPE
See merge request core-developers/forge!4168
|
2021-03-11 03:48:03 +00:00 |
|
tool4EvEr
|
96a449361c
|
Restrictions for companion
|
2021-03-10 23:45:12 +01:00 |
|
Bug Hunter
|
22918f7dea
|
Merge branch 'stp' into 'master'
Swords to Plowshares: Update script
See merge request core-developers/forge!4170
|
2021-03-10 21:45:26 +00:00 |
|
tool4EvEr
|
b8155d07cb
|
Update script
|
2021-03-10 22:45:11 +01:00 |
|
tool4EvEr
|
141901c4c1
|
Fix NPE
|
2021-03-10 20:00:17 +01:00 |
|
tool4EvEr
|
e08e214fc1
|
Deskop layout: remove obsolete elements
|
2021-03-10 19:30:47 +01:00 |
|
Anthony Calosa
|
e328165fbc
|
Merge branch 'revert-49c4b52f' into 'master'
Revert "Merge branch 'master' into 'master'"
See merge request core-developers/forge!4166
|
2021-03-10 15:27:19 +00:00 |
|
Anthony Calosa
|
bd02ac4c0c
|
Revert "Merge branch 'master' into 'master'"
This reverts merge request !4165
|
2021-03-10 15:20:26 +00:00 |
|
Anthony Calosa
|
49c4b52fb0
|
Merge branch 'master' into 'master'
[Mobile] refresh on activate when deckmanager is on imageview
See merge request core-developers/forge!4165
|
2021-03-10 14:46:47 +00:00 |
|
Anthony Calosa
|
33e5fa7115
|
refresh on activate when imageview
|
2021-03-10 22:44:54 +08:00 |
|
Anthony Calosa
|
df9f108e02
|
Merge branch 'master' into 'master'
[Mobile] Fix deck selection and generated commander decks with images
See merge request core-developers/forge!4164
|
2021-03-10 13:29:00 +00:00 |
|
Anthony Calosa
|
3fbc438e47
|
Merge remote-tracking branch 'core/master'
|
2021-03-10 21:28:20 +08:00 |
|
Anthony Calosa
|
7daf310959
|
[Mobile] Fix deck selection and generated commander decks with images
|
2021-03-10 21:26:48 +08:00 |
|
Anthony Calosa
|
8e33d4bd05
|
Merge branch 'master' into 'master'
Update digital sets
See merge request core-developers/forge!4163
|
2021-03-10 11:20:59 +00:00 |
|
Anthony Calosa
|
9c151d2d66
|
Merge remote-tracking branch 'core/master'
|
2021-03-10 19:18:35 +08:00 |
|
Anthony Calosa
|
2d51428123
|
Update digital sets
|
2021-03-10 19:17:50 +08:00 |
|
Michael Kamensky
|
a235c757f5
|
Merge branch 'master' into 'master'
Added an AI hint to Dredge the Mire.
See merge request core-developers/forge!4162
|
2021-03-10 06:52:36 +00:00 |
|
Michael Kamensky
|
4c9bbe1290
|
- Added an AI hint to Dredge the Mire.
|
2021-03-10 09:52:05 +03:00 |
|
Michael Kamensky
|
f68975ede2
|
Merge branch 'master' into 'master'
ConquestUtil: skip promos (again) and other reprints when choosing the starting Planeswalker
See merge request core-developers/forge!4161
|
2021-03-10 06:09:13 +00:00 |
|
Michael Kamensky
|
076e27851f
|
- ConquestUtil: skip promos (again) and other reprints when choosing the starting Planeswalker
|
2021-03-10 09:08:32 +03:00 |
|
Anthony Calosa
|
3914fde25f
|
Merge branch 'kevlahnota-master-patch-72134' into 'master'
Update Mystery Booster Playtest Cards.txt
See merge request core-developers/forge!4160
|
2021-03-10 04:36:30 +00:00 |
|
Anthony Calosa
|
334918f6d8
|
Update Mystery Booster Playtest Cards.txt
|
2021-03-10 04:36:20 +00:00 |
|
Anthony Calosa
|
5aadc7e4be
|
Merge branch 'master' into 'master'
Update Edition Types
Closes #1764
See merge request core-developers/forge!4159
|
2021-03-10 04:23:58 +00:00 |
|
Anthony Calosa
|
ecb5f4d2c3
|
Update check
|
2021-03-10 12:23:09 +08:00 |
|
Anthony Calosa
|
8f62e32f37
|
Merge remote-tracking branch 'core/master'
|
2021-03-10 12:10:32 +08:00 |
|
Anthony Calosa
|
92a2bf68f7
|
Update Edition Types
|
2021-03-10 12:06:22 +08:00 |
|
Anthony Calosa
|
000a7c679c
|
Merge branch 'master' into 'master'
Update Deck ImageView
See merge request core-developers/forge!4158
|
2021-03-10 01:36:28 +00:00 |
|
Anthony Calosa
|
e5142cba99
|
Update Deck ImageView
- [Desktop] double right click / [Mobile] multiple tap - add deck to favorites
|
2021-03-10 01:36:28 +00:00 |
|