external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,646 Commits 34 Branches 187 Tags
51c24f6fdf75dbb43fca77bb438971b8e9a9f18d
Commit Graph

48646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anthony Calosa
f67b46255a Fix ProtocolMethod 2021-03-24 14:34:23 +08:00
Michael Kamensky
9d44b11e95 Merge branch 'insubordination' into 'master' 
Insubordination: Fix trigger

See merge request core-developers/forge!4252
 2021-03-24 03:42:28 +00:00
Anthony Calosa
32b24b7884 Merge branch 'master' into 'master' 
Fix duplicate dependencies

See merge request core-developers/forge!4253
 2021-03-24 02:30:30 +00:00
Anthony Calosa
c3dd154ef5 Fix duplicate dependencies 
-xstream greater than 1.4.9 needs higher android.jar (would remove support for devices lower than Android 8 unless we use the java 7 variant), latest guava and maybe other higher libs needs desugaring for android to work.
 2021-03-24 10:22:43 +08:00
tool4EvEr
2b24539e0e Fix trigger 2021-03-23 21:53:02 +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
Michael Kamensky
bbb561314a Merge branch 'master' into 'master' 
Added 3 Kaldheim puzzles.

See merge request core-developers/forge!4250
 2021-03-23 06:37:06 +00:00
Michael Kamensky
16b56fffbe - Added 3 Kaldheim puzzles. 2021-03-23 09:36:21 +03:00
Michael Kamensky
9961604ca5 Merge branch 'master' into 'master' 
Kasmina, Enigma Sage

See merge request core-developers/forge!4246
 2021-03-23 03:59:39 +00:00
Anthony Calosa
6a0345f6d4 Merge branch 'twosat-master-patch-44168' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4247
 2021-03-23 03:46:26 +00:00
Anthony Calosa
23fd43a965 Merge branch 'kevlahnota-master-patch-98872' into 'master' 
Update M15_Prerelease_Challenge.txt

See merge request core-developers/forge!4249
 2021-03-23 03:45:49 +00:00
Anthony Calosa
9b1521ee64 Update M15_Prerelease_Challenge.txt 2021-03-23 03:45:09 +00:00
tool4EvEr
dda5af5d4d Code cleanup 2021-03-22 21:54:09 +01:00
Andreas Bendel
c90cd7f525 Update de-DE.properties 
five new strings :)
 2021-03-22 20:36:04 +00: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
Michael Kamensky
e74eab8d50 Merge branch 'DifferentCardNames' into 'master' 
Fix DifferentCardNames counting

See merge request core-developers/forge!4245
 2021-03-22 19:04:32 +00:00
Michael Kamensky
d7a3357bbf Merge branch 'fix_fantasy_block_npe' into 'master' 
Fix NPE for Fantasy Block Draft when there is only one meta-set.

See merge request core-developers/forge!4242
 2021-03-22 19:03:58 +00:00
Hythonia
e29fca980d Kasmina, Enigma Sage 2021-03-22 19:23:09 +01:00
tool4EvEr
4c57436e9f Update rulings 2021-03-22 19:01:49 +01: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
Hans Mackowiak
274093735c Merge branch 'cardtargets' into 'master' 
getCardsfromTargets: Add sanity check

See merge request core-developers/forge!4232
 2021-03-22 14:45:37 +00:00
Bug Hunter
e6c60f389f getCardsfromTargets: Add sanity check 2021-03-22 14:45:37 +00:00
Anthony Calosa
0e398f7251 Merge branch 'master' into 'master' 
[Mobile] Preferred Art Options

See merge request core-developers/forge!4243
 2021-03-22 14:08:05 +00:00
Anthony Calosa
e4a0ce9165 [Mobile] Preferred Art Options 2021-03-22 21:46:39 +08:00
Lyu Zong-Hong
76d0a9b41e Fix NPE for FantasyBlock when there is only one meta-set. 2021-03-22 18:46:05 +09:00
Michael Kamensky
17352940ab Merge branch 'Williams-master-patch-78185' into 'master' 
Fix TSR

See merge request core-developers/forge!4241
 2021-03-21 19:37:00 +00:00
Michael Kamensky
f48ca4dab2 Merge branch 'add_backdraft' into 'master' 
Add Back

See merge request core-developers/forge!4240
 2021-03-21 19:36:56 +00:00
John
c4f26be630 Update blocks.txt 2021-03-21 17:41:58 +00:00
John
f41b664600 Update blocks.txt 2021-03-21 17:38:31 +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
Michael Kamensky
fe9284ce10 Merge branch 'kevlahnota-master-patch-31290' into 'master' 
Fix  card granted ability transforming to original state

Closes #1777

See merge request core-developers/forge!4233
 2021-03-21 05:11:14 +00:00
Anthony Calosa
4bf557ca91 Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 23:43:41 +00:00
Anthony Calosa
3f37a51eeb Merge branch 'custom-crash' into 'master' 
Prevent crash in custom card loading

See merge request core-developers/forge!4236
 2021-03-20 23:20:47 +00:00
tool4EvEr
db451886ad Fix Blazing Torch ability 2021-03-20 21:16:13 +01:00