external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,609 Commits 31 Branches 187 Tags
e4a0ce916519e44b58ad97d7bf17f06b0d23017c
Commit Graph

48609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
e4a0ce9165 [Mobile] Preferred Art Options 2021-03-22 21:46:39 +08: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
Adam Pantel
6715c53b73 Prevent crash in custom card loading 2021-03-20 15:37:07 -04:00
Adam Pantel
05547bfda6 Two Topsy Turvies cancel out 2021-03-20 15:30:17 -04:00
Leandro Doctors
8643503082 Merge branch 'twosat-master-patch-15103' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4234
 2021-03-20 18:24:46 +00:00
Andreas Bendel
20d95e7b55 Update de-DE.properties 
lblRollbackPhase translated
 2021-03-20 18:05:28 +00:00
Leandro Doctors
5d8bbf8687 Merge branch 'rename-assets-to-skin' into 'master' 
refactor: rename 'assets' package to 'skin'

See merge request core-developers/forge!4223
 2021-03-20 17:58:15 +00:00
Anthony Calosa
aa8ed1ed8d Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 16:25:53 +00:00
Anthony Calosa
76cfe3da35 Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 16:03:22 +00:00
Anthony Calosa
5f8a3a9c36 Fix modal card backside playing ability transforming to original state 
close #1777
 2021-03-20 13:32:01 +00:00
Anthony Calosa
1dc21055f7 Merge branch 'master' into 'master' 
[Mobile] refactor loading overlay on deck editor/chooser

See merge request core-developers/forge!4231
 2021-03-20 11:13:12 +00:00
Anthony Calosa
e75ec5e8a4 Merge remote-tracking branch 'core/master' 2021-03-20 19:12:29 +08:00
Hans Mackowiak
730bf1befa Merge branch 'fixtargets2' into 'master' 
Fix Spell targets

See merge request core-developers/forge!4226
 2021-03-20 11:10:45 +00:00
Anthony Calosa
39b356bcac [Mobile] refactor loading overlay on deck editor/chooser 
- only show the overlay if it needs initializing/refreshing on the catalog/collection page
 2021-03-20 19:07:35 +08:00
Bug Hunter
5ea5b59d94 Merge branch 'fixtypo' into 'master' 
Fix script typo

See merge request core-developers/forge!4230
 2021-03-20 10:19:26 +00:00
tool4EvEr
384f4892d5 Fix typo 2021-03-20 11:17:40 +01:00
Hans Mackowiak
2785388e76 Merge branch 'fix_piracy' into 'master' 
Fix Piracy mana restriction

See merge request core-developers/forge!4227
 2021-03-20 08:37:59 +00:00
Alumi
9c11c90f48 Fix Piracy mana restriction 2021-03-20 08:37:59 +00:00
Anthony Calosa
cd3a4da41d Merge branch 'kevlahnota-master-patch-55889' into 'master' 
Update CMatchUI.java

See merge request core-developers/forge!4229
 2021-03-20 07:55:55 +00:00
Anthony Calosa
d00530700b Update CMatchUI.java 
removed unused imports
 2021-03-20 07:55:08 +00:00
Anthony Calosa
f6a87b813b Merge branch 'master' into 'master' 
[Mobile] minor improvements

See merge request core-developers/forge!4228
 2021-03-20 07:33:26 +00:00
Anthony Calosa
5cc2aaa07a Merge branch 'customCards_Folder' into 'master' 
Support loading Custom Cards & Editions from User Folder

See merge request core-developers/forge!4222
 2021-03-20 07:28:26 +00:00
Anthony Calosa
1e766b8662 [Mobile] minor improvements 2021-03-20 15:21:15 +08:00
Michael Kamensky
29bf2970f3 Merge branch 'rollback_Phase_dev' into 'master' 
[Mobile] add Experimental Rollback Phase

See merge request core-developers/forge!4195
 2021-03-20 04:31:57 +00:00
Michael Kamensky
dfd5b984e3 Merge branch 'hallow' into 'master' 
Fix cards

See merge request core-developers/forge!4225
 2021-03-20 03:43:13 +00:00
Bug Hunter
be9de2cc09 Fix cards 2021-03-20 03:43:12 +00:00
tool4EvEr
0c1ca71f93 Fix Spell targets 2021-03-19 23:13:11 +01:00
Anthony Calosa
3995a20a81 limit usage 2021-03-20 04:26:16 +08:00
Anthony Calosa
9ce1ce14d3 Merge remote-tracking branch 'core/master' into rollback_Phase_dev 2021-03-20 02:42:14 +08:00
Anthony Calosa
59c2b36df7 Merge remote-tracking branch 'core/master' into customCards_Folder 2021-03-20 02:20:00 +08:00
Anthony Calosa
7fde89dcd7 allow devmode to find custom cards 2021-03-20 02:18:16 +08:00
Michael Kamensky
b94f40c7c4 Merge branch 'master' into 'master' 
NPE prevention in getAllNonPromoCards.

See merge request core-developers/forge!4224
 2021-03-19 17:53:20 +00:00
Michael Kamensky
00b5d40de7 - NPE prevention in getAllNonPromoCards. 2021-03-19 20:52:44 +03:00
Hans Mackowiak
b59f92e5dd Merge branch 'imoti' into 'master' 
Imoti: Cascade by looking at spell cmc

See merge request core-developers/forge!4221
 2021-03-19 17:39:46 +00:00
Bug Hunter
1dfbc7638a Imoti: Cascade by looking at spell cmc 2021-03-19 17:39:46 +00:00
Leandro Doctors
993fb3b518 refactor: rename 'assets' package to 'skin' 2021-03-19 14:27:10 -03:00
Anthony Calosa
a9135b6df4 Merge remote-tracking branch 'core/master' into customCards_Folder 2021-03-20 00:40:39 +08:00
Michael Kamensky
46718ff96a Merge branch 'ertais_meddling' into 'master' 
Add Ertai's Meddling

See merge request core-developers/forge!4218
 2021-03-19 16:11:46 +00:00
Alumi
903b0130c7 Add Ertai's Meddling 2021-03-19 16:11:46 +00:00