external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,661 Commits 33 Branches 187 Tags
fe2c3c90d62aab8f44478e9968182c97a13fbd77
Commit Graph

43661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
f0fb6539ef - Added puzzle PS_ELD5. 2019-11-19 11:59:59 +03:00
swordshine
a85a761bee Merge branch 'spanishcards01' into 'master' 
Spanish cards translation: from Abandon Hope to Altar of Bone.

See merge request core-developers/forge!2290
 2019-11-19 01:11:05 +00:00
swordshine
2c61dc9a75 Merge branch 'patch-4' into 'master' 
Update Deckmasters Garfield vs. Finkel.txt

See merge request core-developers/forge!2289
 2019-11-19 01:10:55 +00:00
klaxnek
9516929495 Restore newline at end of file 2019-11-19 01:57:08 +01:00
klaxnek
5350a4c476 Spanish cards translation: from Abandon Hope to Altar of Bone. 
Updated spanish card translations from Scryfall.
 2019-11-19 01:54:10 +01:00
Alessandro Coli
26dc246c52 Merge remote-tracking branch 'upstream/master' 2019-11-18 13:44:34 +01:00
Anthony Calosa
ad6716f00e Update Deckmasters Garfield vs. Finkel.txt 2019-11-18 07:17:34 +00:00
Hans Mackowiak
dffb63d95f Merge branch 'newBranch' into 'master' 
Fix declare attackers

Closes #1205

See merge request core-developers/forge!2288
 2019-11-18 04:19:10 +00:00
Anthony Calosa
5069c71dd8 Fix declare attackers 2019-11-18 04:19:10 +00:00
Anthony Calosa
287abb9f37 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-18 12:09:22 +08:00
Anthony Calosa
7f8325fb6c Fix declare attackers 2019-11-18 12:06:59 +08:00
swordshine
6c38674716 Merge branch 'german-translation' into 'master' 
german translation update

See merge request core-developers/forge!2287
 2019-11-18 00:51:47 +00:00
swordshine
54fdb69e88 Merge branch 'patch-2' into 'master' 
Update proteus_staff.txt Remember Target Controller not Owner.

See merge request core-developers/forge!2283
 2019-11-18 00:51:30 +00:00
Computica
068cee2326 Update proteus_staff.txt Remember Target Controller not Owner. 2019-11-18 00:51:29 +00:00
Alessandro Coli
e9c2e1034c Merge remote-tracking branch 'upstream/master' 2019-11-17 17:48:03 +01:00
Alessandro Coli
f453c2af78 Labels for the preferences of the new stack addition modal popup 2019-11-17 17:42:51 +01:00
Alessandro Coli
cc3c631cad Introduction of modal popup to notify when something is added to the 
stack, including images for cards, complete with sources and targets.
 2019-11-17 17:26:31 +01:00
Dagin Svezek
7cfd060ed8 Update de-DE.properties from forum 2019-11-17 09:18:03 +00:00
swordshine
c77f5e9b61 Merge branch 'newBranch' into 'master' 
Fix images not loading when missing suffix

See merge request core-developers/forge!2285
 2019-11-17 06:46:03 +00:00
swordshine
f18bd75257 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2286
 2019-11-17 06:45:58 +00:00
CCTV-1
555a1f8411 update simplified chinese translation 2019-11-17 11:11:41 +08:00
Anthony Calosa
c600dc3b4f Update 2019-11-17 08:10:29 +08:00
Anthony Calosa
0f138a1bf5 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-17 08:06:43 +08:00
Anthony Calosa
1c19f36637 Fix cards like planes/phenomenon not loading an existing images that have .full/.fullborder 2019-11-17 08:02:11 +08:00
Michael Kamensky
d19973208c Merge branch 'newBranch' into 'master' 
Add support for "fullborder" cards

See merge request core-developers/forge!2284
 2019-11-16 15:20:12 +00:00
Anthony Calosa
0a9078a2ec Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-16 17:51:04 +08:00
Anthony Calosa
bf2368ee44 Update 2019-11-16 17:44:56 +08:00
Anthony Calosa
d0a23fbf14 Add support for ".fullborder" cards 
(to differentiate full image cards and full image cards with full borders,
so it will only crop full image cards with full borders)
 2019-11-16 17:36:30 +08:00
Michael Kamensky
015f561740 Merge branch 'translation11' into 'master' 
Translation: All Abilities Triggers in Stack & Initial GameLogFormatter.

See merge request core-developers/forge!2252
 2019-11-16 09:06:27 +00:00
klaxnek
cff4a29f1c Merge branch 'master' of https://git.cardforge.org/core-developers/forge into translation11 
 Conflicts:
	forge-gui/res/languages/de-DE.properties
	forge-gui/res/languages/en-US.properties
	forge-gui/res/languages/es-ES.properties
	forge-gui/res/languages/zh-CN.properties
 2019-11-16 09:59:06 +01:00
Michael Kamensky
f50ee0ba36 Merge branch 'newBranch' into 'master' 
Fix permanents not updating/moving to its row when animated to creature.

See merge request core-developers/forge!2282
 2019-11-15 06:04:31 +00:00
Anthony Calosa
fe5d8e537c Fix game pause 2019-11-15 11:14:54 +08:00
Anthony Calosa
d943891e4f additional check (prevent npe on mojhosto) 2019-11-15 10:11:57 +08:00
Anthony Calosa
da3d1d7099 Update 2019-11-15 08:56:35 +08:00
Anthony Calosa
86dd21ae7b Fix permanents not updating when animated to creature. 2019-11-15 06:57:43 +08:00
Hans Mackowiak
2d30184f76 Merge branch 'combatPhaseHandlerFix' into 'master' 
Combat: initConstraints before Declare Attackers

See merge request core-developers/forge!2281
 2019-11-14 11:12:31 +00:00
Hans Mackowiak
271063934a Combat: initConstraints before Declare Attackers 2019-11-14 11:12:31 +00:00
Alessandro Coli
3fb601adfb Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-11-13 19:23:30 +01:00
swordshine
757e11af42 Merge branch 'patch-8' into 'master' 
November 11, 2019 Pioneer Banned Announcement

See merge request core-developers/forge!2280
 2019-11-13 00:54:19 +00:00
Hans Mackowiak
7ec12fb58d November 11, 2019 Pioneer Banned Announcement 2019-11-13 00:54:18 +00:00
Hans Mackowiak
6c9cf02884 Merge branch 'newBranch' into 'master' 
Fix Amass ability (Woodland Champion and Dreadhorde Invasion)

See merge request core-developers/forge!2279
 2019-11-12 12:13:36 +00:00
Anthony Calosa
0c904e208a Add AmassTrigger Test 
(If Woodland Champion will trigger from Eternal Skylord Amass Ability)
 2019-11-12 19:49:01 +08:00
swordshine
d12a898333 Merge branch 'seven-dwarves' into 'master' 
Add 7 Dwarves

See merge request core-developers/forge!2278
 2019-11-12 07:52:57 +00:00
Anthony Calosa
0e665dc673 Fix Amass ability (Woodland Champion and Dreadhorde Invasion) 2019-11-12 13:31:16 +08:00
tehdiplomat
02299a0400 Add 7 Dwarves 2019-11-11 14:12:49 -05:00
Michael Kamensky
86d7069626 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.30.001 [incremental].

See merge request core-developers/forge!2277
 2019-11-11 05:17:32 +00:00
Agetian
776b865761 - Preparing Forge for Android publish 1.6.30.001 [incremental]. 2019-11-11 08:10:57 +03:00
Blacksmith
a3a4ef22df Clear out release files in preparation for next release 2019-11-11 02:50:48 +00:00
Blacksmith
c2db78baf7 [maven-release-plugin] prepare for next development iteration 2019-11-11 02:45:55 +00:00
Blacksmith
9a30d78f54 [maven-release-plugin] prepare release forge-1.6.30 forge-1.6.30 2019-11-11 02:45:50 +00:00