external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 32 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

5679 Commits

Author SHA1 Message Date
Bug Hunter
82f0c85bd0 Fix alternate state descriptions when viewed from original 2021-03-29 07:59:43 +00:00
Michael Kamensky
9802cb62d9 Merge branch 'update_word_of_command' into 'master' 
Update Word of Command mana payment check conditions

See merge request core-developers/forge!4291
 2021-03-28 12:26:30 +00:00
Michael Kamensky
97ff18c3e2 Merge branch 'uvilda' into 'master' 
Uvilda

See merge request core-developers/forge!4288
 2021-03-28 09:35:44 +00:00
Adam Pantel
6bc01c3472 Uvilda 2021-03-28 03:14:37 -04:00
tool4EvEr
3d9d6d45fe Fix NPE when targeting different players hidden zone 2021-03-28 09:05:31 +02:00
Lyu Zong-Hong
7fc85a47be Update Word of Command mana payment check conditions 2021-03-28 15:09:01 +09:00
Michael Kamensky
36e395e3a3 Merge branch 'master' into 'master' 
STX cards + Abundant Harvest

See merge request core-developers/forge!4285
 2021-03-27 15:54:25 +00:00
Lyu Zong-Hong
c990c8af56 Fix crash when mutate under an MDFC backside creature. 2021-03-27 22:00:20 +09:00
Hythonia
24f1285a43 Breena and PlayerProperty.java update 2021-03-27 12:02:13 +01:00
Hans Mackowiak
088b4fa07e Card: add turnInController to keep track under which control it entered 2021-03-27 11:35:52 +01:00
Michael Kamensky
44bb2ff0f5 Merge branch 'drawing' into 'master' 
Move all hidden zone changing after choosing

See merge request core-developers/forge!4256
 2021-03-27 04:37:27 +00:00
Bug Hunter
4effb02219 Move all hidden zone changing after choosing 2021-03-27 04:37:27 +00:00
Michael Kamensky
5d7ad6bb81 Merge branch 'master' into 'master' 
STX: One Ward, two card

See merge request core-developers/forge!4273
 2021-03-27 04:37:13 +00:00
Michael Kamensky
ddf8df9c71 Merge branch 'fixStartDraw' into 'master' 
Don't count draws before game started

Closes #1781

See merge request core-developers/forge!4275
 2021-03-27 04:34:09 +00:00
Michael Kamensky
b312f28ab6 Merge branch 'add_word_of_command' into 'master' 
Add Word of Command

See merge request core-developers/forge!4281
 2021-03-27 04:33:42 +00:00
Lyu Zong-Hong
2e768cb77b Add Word of Command 2021-03-27 12:25:20 +09:00
tool4EvEr
afb06baa56 Don't count draws before game started 2021-03-26 20:20:24 +01:00
Northmoc
067f0b3a66 bandaid for CharmEffect.java description builder 2021-03-26 14:44:32 -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
Hythonia
3f06553604 Merge remote-tracking branch 'origin/master' 2021-03-26 16:34:34 +01:00
Hythonia
b038044347 STX: One Ward, two card 2021-03-26 15:01:59 +01: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
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
50a6037a6d Merge branch 'onyx' into 'master' 
professor_onyx.txt

See merge request core-developers/forge!4262
 2021-03-26 10:56:10 +00: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
Northmoc
d03bc797fc DiscardEffect.java add "RememberDiscardingPlayers" param 2021-03-25 18:13:10 -04:00
Hans Mackowiak
0413e5ded8 Fix ExiledWith being cleared when successfully added to MagicStack 2021-03-25 14:50:25 +01:00
Lyu Zong-Hong
d1de248894 Fix Invasion Plans 2021-03-25 21:19:28 +09: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
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
Hans Mackowiak
9ca66c213d Merge branch 'cleanup' into 'master' 
Code cleanup

See merge request core-developers/forge!4248
 2021-03-23 17:17:37 +00:00
tool4EvEr
dda5af5d4d Code cleanup 2021-03-22 21:54:09 +01:00
Michael Kamensky
89dfdff05b Merge branch 'raging_river' into 'master' 
Add Raging River

See merge request core-developers/forge!4244
 2021-03-22 19:05:32 +00:00
tool4EvEr
a08dd6efc8 Fix DifferentCardNames counting 2021-03-22 18:39:23 +01:00
Lyu Zong-Hong
214a35ba5e Add Raging River 2021-03-23 02:18:01 +09:00
Bug Hunter
e6c60f389f getCardsfromTargets: Add sanity check 2021-03-22 14:45:37 +00:00
Lyu Zong-Hong
af6e091b02 Add Backdraft 2021-03-21 18:39:33 +09:00
Hans Mackowiak
1742c30450 fix bestow and ExiledWith when adding to Stack 2021-03-21 09:07:36 +01:00
Michael Kamensky
4687ad7f38 Merge branch 'torch' into 'master' 
Fix Blazing Torch ability

See merge request core-developers/forge!4237
 2021-03-21 05:16:45 +00:00
Michael Kamensky
53b2088b33 Merge branch 'card-fixes' into 'master' 
Two Topsy Turvies cancel out

See merge request core-developers/forge!4235
 2021-03-21 05:16:39 +00:00
Anthony Calosa
4bf557ca91 Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 23:43:41 +00:00