external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,683 Commits 32 Branches 187 Tags
2d86d240a795f6829c3e299d2f22d1a6b51f995f
Commit Graph

11825 Commits

Author SHA1 Message Date
Michael Kamensky
2d86d240a7 Merge branch 'master' into 'master' 
Add ELD achievements by Marek14.

See merge request core-developers/forge!2189
 2019-09-28 08:26:11 +00:00
Agetian
a59b911c56 - Add ELD achievements by Marek14. 2019-09-28 10:14:41 +03:00
Sol
406c82c5a2 Merge branch 'throne-edition-updates' into 'master' 
ELD updates

See merge request core-developers/forge!2187
 2019-09-28 02:32:00 +00:00
Chris H
fc676f25d7 ELD updates 2019-09-27 22:23:35 -04:00
Chris H
fc8d235529 Migrate throne 2019-09-27 21:54:10 -04:00
swordshine
7e7951d567 Merge branch 'abilitytranslation' into 'master' 
Translated new settings option 'Ability Icons'

See merge request core-developers/forge!2184
 2019-09-28 00:45:06 +00:00
Computica
b2f5b55c0e Update volatile_claws.txt - All Creature Types didn't happen... 2019-09-27 23:39:07 +00:00
Peter
7bb4e8f6d2 Translated new settings option 'Ability Icons' 2019-09-27 19:46:38 +02:00
Anthony Calosa
6551ebcce5 Add feature request 
Can duplicate tokens with summoning sickness not be in same pile as
tokens without it OR the ones without it be on the top? It's really
annoying on Android to equip/enchant a token that can attack this turn
(need to zoom in, then out).
(https://www.slightlymagic.net/forum/viewtopic.php?f=26&t=1516&start=2190#p230560)
 2019-09-27 12:16:07 +00:00
swordshine
ec96e1f0c1 Fix Garenbrig Carver 2019-09-26 23:57:20 +08:00
swordshine
cba9366b14 Fix Fae of Wishes 2019-09-26 23:10:23 +08:00
swordshine
c83f81be4a Fix Midnight Clock 2019-09-26 22:39:06 +08:00
Michael Kamensky
00c51488da Merge branch 'newBranch' into 'master' 
"Hexproof from" Ability Icons

See merge request core-developers/forge!2172
 2019-09-25 19:00:35 +00:00
CCTV-1
b37f21f751 update simplified chinese translation 2019-09-25 17:11:22 +08:00
Dagin Svezek
7d61198d81 german translation update 2019-09-25 07:14:41 +00:00
Anthony Calosa
b6ed045c21 Add Show Ability Icons Preference 
(Overlay Menu on PC, Settings Page on Mobile)
 2019-09-25 14:49:41 +08:00
Anthony Calosa
c24f4b59ec Update Icons 2019-09-25 12:28:40 +08:00
Anthony Calosa
9888faa271 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-25 12:26:10 +08:00
Agetian
1ff41ec7c3 - Update the cube name 2019-09-24 20:13:33 +03:00
Agetian
4d1572a76a - Added MTGO Grixis Cube submitted by dolphi5. 2019-09-24 20:03:42 +03:00
Anthony Calosa
6556f78c28 Add Hexproof From Icons (TODO: PC code, better Hexproof from Icons) 2019-09-24 22:49:52 +08:00
Dagin Svezek
dbb34e06e6 german translation update 2019-09-24 14:11:06 +00:00
Hans Mackowiak
0c88765fce Update belle_of_the_brawl.txt 2019-09-24 13:45:36 +00:00
Peter
ee2aa50e07 Translate InputBase and PlayerControllerHuman. 
PlayerControllerHuman translation pending (only translated safe ones by now)
 2019-09-24 13:45:12 +02:00
Peter
e763a1d662 Updated Darkred font skin. 
Used Darkforge font. Now supports ¿ and ¡ characters. Agreed with Churrufli, darkred skin author.
 2019-09-24 11:27:58 +02:00
swordshine
d7d706d862 Merge branch 'newBranch' into 'master' 
Display Ability Icons

See merge request core-developers/forge!2163
 2019-09-24 06:42:20 +00:00
swordshine
a1059f7304 Merge branch 'master' into 'master' 
Added puzzle PS_MGOB - Possibility Storm - Special Guest Puzzle - Modern Goblins

See merge request core-developers/forge!2165
 2019-09-24 06:40:54 +00:00
austinio7116
8997b71c33 Fixed Malakir Familiar Oracle text 2019-09-24 06:44:11 +01:00
Agetian
41d5af8369 - Added puzzle PS_MGOB. 2019-09-24 08:09:00 +03:00
CCTV-1
516510c98f update simplified chinese translation 2019-09-24 13:05:35 +08:00
Anthony Calosa
b2f80b47a9 Display Ability Icons (Mobile & PC) 2019-09-24 12:30:51 +08:00
swordshine
1cf37aa460 Merge branch 'patch' into 'master' 
Fix Escape to the Wilds

See merge request core-developers/forge!2162
 2019-09-24 03:23:09 +00:00
swordshine
6571a56a3c Fix Escape to the Wilds 2019-09-24 11:03:01 +08:00
swordshine
c2be7cc7e6 Merge branch 'run-away-together-ai-remove' into 'master' 
Set 'Run Away Together' to AI:RemoveDeck:All

See merge request core-developers/forge!2161
 2019-09-24 02:13:51 +00:00
swordshine
425ecb9a6b Merge branch 'fabled-passage-typo' into 'master' 
Fix typo on Fabled Passage

See merge request core-developers/forge!2160
 2019-09-24 02:03:23 +00:00
Brock Fanning
daa89338aa Set 'Run Away Together' to AI:RemoveDeck:All 2019-09-23 22:01:00 -04:00
swordshine
be3286cd8b Merge branch 'unique-cards-only-option-deck-editor' into 'master' 
Unique cards only option deck editor

See merge request core-developers/forge!2063
 2019-09-24 01:56:49 +00:00
Brock Fanning
bf5ab53678 Fix typo on Fabled Passage 2019-09-23 21:55:05 -04:00
Peter
68a8a08709 Mobile: Fix new bug Add Basic Lands Dialog (sorry) 2019-09-23 20:22:08 +02:00
Valerio Maggio
e9de55ebc8 Merge Upstream and conflict resolved on ImageView with missing localiser 2019-09-23 16:06:40 +01:00
swordshine
7f8b55fe0f Update the edition file because Adventure cards are not split cards. 2019-09-23 22:36:18 +08:00
Hans Mackowiak
14c9a8ccc3 ReplacementEffect: add Mode for ReplacementType 2019-09-23 11:53:48 +00:00
Peter
f4bf120125 Updated chinese (another try...) 2019-09-23 12:46:34 +02:00
Peter
f15e051cc4 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobiletranslation06 
 Conflicts:
	forge-gui/res/languages/zh-CN.properties
 2019-09-23 12:45:49 +02:00
Peter
0a57342524 Updated chinese translation 2019-09-23 12:39:13 +02:00
swordshine
76a0fc6fa2 Merge branch 'ELD_Draft' into 'master' 
Preparation for ELD draft format

See merge request core-developers/forge!2155
 2019-09-23 10:17:18 +00:00
Peter
8d3b00c3f2 Mobile: More Translations 
Added ¡ and ¿ needed to Spanish
 2019-09-23 11:53:03 +02:00
CCTV-1
9e778d9a69 update simplified chinese translation 2019-09-23 17:21:47 +08:00
austinio7116
08129db336 Preparation for ELD draft format 2019-09-23 06:18:32 +01:00
swordshine
b12db3b9a8 Merge branch 'mobiletranslation05' into 'master' 
Mobile: Translated more strings and Views

See merge request core-developers/forge!2154
 2019-09-23 01:10:57 +00:00