Northmoc
|
ff220113af
|
storm_kiln_artist.txt (script by ?)
|
2021-03-26 15:28:00 -04:00 |
|
Adam Pantel
|
81c2c482cd
|
Treasure Keeper, Kianne, Plargg
|
2021-03-26 15:25:10 -04:00 |
|
tool4EvEr
|
afb06baa56
|
Don't count draws before game started
|
2021-03-26 20:20:24 +01:00 |
|
Northmoc
|
d25ff61f22
|
dragonsguard_elite.txt (script by ?)
|
2021-03-26 15:12:08 -04:00 |
|
Northmoc
|
067f0b3a66
|
bandaid for CharmEffect.java description builder
|
2021-03-26 14:44:32 -04:00 |
|
Northmoc
|
0f71efd1e9
|
willowdusk_essence_seer.txt
|
2021-03-26 14:39:01 -04:00 |
|
Hythonia
|
351f9c1976
|
STX: Ward's TriggerDescription
|
2021-03-26 18:14:27 +01:00 |
|
Northmoc
|
a11eff4d9a
|
add Optional param and prompt to CharmEffect.java
|
2021-03-26 12:44:11 -04:00 |
|
Northmoc
|
fe6a5a700a
|
add optional Charm prompt
|
2021-03-26 12:43:34 -04:00 |
|
Northmoc
|
87a994b8ce
|
shadrix_silverquill.txt v2
|
2021-03-26 12:42:52 -04:00 |
|
Hythonia
|
3f06553604
|
Merge remote-tracking branch 'origin/master'
|
2021-03-26 16:34:34 +01:00 |
|
Northmoc
|
e9f765a216
|
wb_2_1_inkling_flying.txt
|
2021-03-26 11:29:28 -04:00 |
|
Northmoc
|
532e65f3a0
|
shadrix_silverquill.txt
|
2021-03-26 11:29:08 -04:00 |
|
Hythonia
|
b038044347
|
STX: One Ward, two card
|
2021-03-26 15:01:59 +01:00 |
|
Michael Kamensky
|
0664d11f55
|
Merge branch 'master' into 'master'
Basic logic for Professor Onyx
See merge request core-developers/forge!4270
|
2021-03-26 11:48:04 +00:00 |
|
Michael Kamensky
|
6d00a26530
|
- Basic logic for Professor Onyx.
|
2021-03-26 14:38:10 +03:00 |
|
Michael Kamensky
|
a4d28b13ef
|
Merge branch 'AIopponent' into 'master'
AI Multiplayer improvements
See merge request core-developers/forge!4239
|
2021-03-26 10:58:22 +00:00 |
|
Bug Hunter
|
fd01dc1bb1
|
AI Multiplayer improvements
|
2021-03-26 10:58:22 +00:00 |
|
Michael Kamensky
|
fa72d3d0de
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!4269
|
2021-03-26 10:57:20 +00:00 |
|
Michael Kamensky
|
f935f57d23
|
Merge branch 'add_camouflage' into 'master'
Add Camouflage
See merge request core-developers/forge!4268
|
2021-03-26 10:57:03 +00:00 |
|
Michael Kamensky
|
fbf1e855ad
|
Merge branch 'snarls' into 'master'
STX rare land cycle
See merge request core-developers/forge!4263
|
2021-03-26 10:56:25 +00:00 |
|
Michael Kamensky
|
50a6037a6d
|
Merge branch 'onyx' into 'master'
professor_onyx.txt
See merge request core-developers/forge!4262
|
2021-03-26 10:56:10 +00:00 |
|
CCTV-1
|
d15d27defb
|
update simplified chinese translation
|
2021-03-26 18:40:04 +08:00 |
|
Hythonia
|
7952bdcb48
|
Revert "ManaEffect rework"
This reverts commit 9db11ce6
|
2021-03-26 11:37:57 +01:00 |
|
Hythonia
|
dfdf3160d3
|
Merge remote-tracking branch 'origin/master'
|
2021-03-26 11:20:36 +01:00 |
|
Lyu Zong-Hong
|
ce4f12179c
|
Add Camouflage
|
2021-03-26 13:05:04 +09:00 |
|
Leandro Doctors
|
491da787b4
|
Merge branch 'update-building-docs' into 'master'
doc: update Android building instructions
See merge request core-developers/forge!4265
|
2021-03-26 02:01:43 +00:00 |
|
Leandro Doctors
|
6dbc7e2704
|
doc: update Android building instructions
|
2021-03-25 22:58:15 -03:00 |
|
Leandro Doctors
|
2a39c917ee
|
Merge branch 'mention-hardcoded-value' into 'master'
add FIXME for hardcoded value
See merge request core-developers/forge!4264
|
2021-03-26 01:51:37 +00:00 |
|
Leandro Doctors
|
3733ba45e2
|
add FIXME for hardcoded value
|
2021-03-25 22:50:13 -03:00 |
|
Northmoc
|
2a410b9099
|
snarls
|
2021-03-25 20:14:22 -04:00 |
|
Northmoc
|
3ccc7c41e7
|
professor_onyx.txt v2
|
2021-03-25 18:13:33 -04:00 |
|
Northmoc
|
d03bc797fc
|
DiscardEffect.java add "RememberDiscardingPlayers" param
|
2021-03-25 18:13:10 -04:00 |
|
Leandro Doctors
|
5c4f8eb526
|
Merge branch 'clean-up-pom' into 'master'
Delete obsolete 'developers' tags (pom.xml)
See merge request core-developers/forge!4219
|
2021-03-25 17:41:42 +00:00 |
|
Northmoc
|
973464f1c4
|
professor_onyx.txt
|
2021-03-25 10:56:40 -04:00 |
|
Hans Mackowiak
|
e090ab2825
|
Merge branch '1779-lingering-hostage-taker-untilhostleavesplay-issue' into 'master'
Resolve "Lingering Hostage Taker (UntilHostLeavesPlay) issue"
Closes #1779
See merge request core-developers/forge!4261
|
2021-03-25 13:51:07 +00:00 |
|
Hans Mackowiak
|
0413e5ded8
|
Fix ExiledWith being cleared when successfully added to MagicStack
|
2021-03-25 14:50:25 +01:00 |
|
Michael Kamensky
|
51c24f6fdf
|
Merge branch 'fix_invasion_plans' into 'master'
Fix Invasion Plans
See merge request core-developers/forge!4260
|
2021-03-25 13:40:21 +00:00 |
|
Lyu Zong-Hong
|
d1de248894
|
Fix Invasion Plans
|
2021-03-25 21:19:28 +09:00 |
|
Hans Mackowiak
|
fdf3e618c2
|
Merge branch '1778-untilhostleavesplay-missing-a-check-on-hostage-taker' into 'master'
Resolve "UntilHostLeavesPlay missing a check on Hostage Taker"
Closes #1778
See merge request core-developers/forge!4259
|
2021-03-25 07:52:04 +00:00 |
|
Hans Mackowiak
|
5b0a228f4f
|
SpellAbilityEffect: fix untilHostLeavesPlayCommand to check the until CardCollection
|
2021-03-25 08:51:35 +01:00 |
|
Anthony Calosa
|
1745ee3e3b
|
Merge branch 'master' into 'master'
Fix TrackableProperty for cardbackup
See merge request core-developers/forge!4258
|
2021-03-25 04:49:44 +00:00 |
|
Anthony Calosa
|
65f96ed9d0
|
Fix TrackableProperty for cardbackup
- add IPaperCardType trackable
|
2021-03-25 12:48:45 +08:00 |
|
Michael Kamensky
|
1ade85ad5d
|
Merge branch 'silence' into 'master'
Fix Suspend & CantBeCast
See merge request core-developers/forge!4255
|
2021-03-25 04:07:59 +00:00 |
|
Anthony Calosa
|
b4a5851d61
|
Merge branch 'master' into 'master'
Fix networkplay issue on cardbackup view
See merge request core-developers/forge!4257
|
2021-03-25 02:54:59 +00:00 |
|
Anthony Calosa
|
b50d546279
|
Fix networkplay issue on cardbackup
|
2021-03-25 10:41:17 +08:00 |
|
tool4EvEr
|
fedc92977a
|
Fix Suspend & CantBeCast
|
2021-03-24 21:16:33 +01:00 |
|
Hythonia
|
9db11ce690
|
ManaEffect rework
|
2021-03-24 20:14:41 +01:00 |
|
Anthony Calosa
|
3a5f85009c
|
Merge branch 'master' into 'master'
Fix ProtocolMethod
See merge request core-developers/forge!4254
|
2021-03-24 06:36:16 +00:00 |
|
Anthony Calosa
|
93d8fd43f3
|
Merge remote-tracking branch 'core/master'
|
2021-03-24 14:34:38 +08:00 |
|