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

12335 Commits

Author SHA1 Message Date
Michael Kamensky
6a76cc8bc6 Merge branch 'newBranch' into 'master' 
Update Network and Dependency files

See merge request core-developers/forge!2259
 2019-11-04 16:44:48 +00:00
Hans Mackowiak
2bf477102d Update memory_theft: add nonLand part 2019-11-04 09:42:30 +00:00
Anthony Calosa
42a15b40b3 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-04 07:47:27 +08:00
Churrufli
7ec7025ed4 Update net-decks.txt adding Current Pioneer Decks 2019-11-03 07:40:41 +00:00
Anthony Calosa
001a1981cf update log4j 1.2.17 -> log4j 2.11.2 
(log4j 2.12.x latest needs higher Android API)
 2019-11-02 10:07:13 +08:00
Anthony Calosa
3b58d6df42 refactor rename 2019-11-01 17:46:14 +08:00
Anthony Calosa
a80c683901 support android 6 (slow networkplay) tested with two Android 6 device 2019-11-01 17:34:42 +08:00
Anthony Calosa
a5b65eaaed add old de/serialization for android 7.1 and below 2019-11-01 15:03:30 +08:00
Anthony Calosa
31182289b7 Update dependency and use custom de/encoder for netty 2019-11-01 12:41:30 +08:00
Agetian
7ed84c4c3f - Added puzzle PS_ELD3. 2019-10-29 09:34:39 +03:00
Anthony Calosa
5790e29daa Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-25 14:22:07 +08:00
Anthony Calosa
88a4a2c6cf Update 2019-10-25 14:21:25 +08:00
Hans Mackowiak
00391df1f0 Fix Resolute Rider 2019-10-24 07:46:00 +00:00
swordshine
15de0c0bba Merge branch 'master' into 'master' 
Added puzzle PS_ELD2 - Possibility Storm - Throne of Eldraine 02

See merge request core-developers/forge!2254
 2019-10-24 01:00:06 +00:00
Agetian
a2fdce9be9 - Added puzzle PS_ELD2. 2019-10-23 22:42:52 +03:00
klaxnek
fa6fce9589 Moved CardTranslation to forge-core. We need it to translate card info in forge-game. 2019-10-23 11:47:21 +02:00
Anthony Calosa
b37937421c Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-23 11:52:52 +08:00
klaxnek
df7be19487 Translate Permanent Creature 2019-10-23 00:56:36 +02:00
klaxnek
f17d2bf7fc Translate Trigger Abilities. Finished. 2019-10-23 00:24:15 +02:00
klaxnek
3369db8150 Translated Trigger Abilities (1) 2019-10-22 22:45:03 +02:00
klaxnek
cfc8b7fb28 Mobile: Translate Minor things 2019-10-22 21:18:30 +02:00
klaxnek
1497345a79 Translate GameLogFormatter. Mulligan and didn't attack 2019-10-22 20:29:50 +02:00
klaxnek
bbd2940b63 Translated scry log 2019-10-22 14:40:03 +02:00
klaxnek
4c3e4f2170 Translate PlayerControllerHuman.java. Discard, order of cards, delve, exile. 2019-10-22 13:23:57 +02:00
klaxnek
dc12c50c1a Forgot lblCleanupPhase 2019-10-22 12:56:53 +02:00
klaxnek
2b986f5bac Translate PlayerControllerHuman.java. Discard cards 2019-10-22 12:50:15 +02:00
klaxnek
2accf7543e Translated Input Pay Mana. Expanded sentences in order to translate them. 2019-10-22 12:08:28 +02:00
klaxnek
ba37189410 Translate InputPassPriority.java 2019-10-22 11:36:36 +02:00
Hans Mackowiak
d578eee402 Add Pioneer Format 2019-10-22 08:47:00 +00:00
Anthony Calosa
402885391f Card Sleeves 2019-10-22 16:12:03 +08:00
klaxnek
1a0cb62ac8 Translate Preload Extended Art 2019-10-22 09:42:16 +02:00
klaxnek
c0baf70c59 Translate new Settings menú 2019-10-22 09:37:05 +02:00
CCTV-1
8567b69073 update 'Draft, Gauntlet and Puzzle Screens' Simplified Chinese translation 2019-10-22 13:01:37 +08:00
swordshine
3a4271e66d Merge branch 'updatetranslation' into 'master' 
update new settings translation

See merge request core-developers/forge!2246
 2019-10-22 03:05:25 +00:00
swordshine
eb59d6c86b Merge branch 'translation09' into 'master' 
Mobile: Translate Draft, Gauntlet and Puzzle Screens.

See merge request core-developers/forge!2228
 2019-10-22 03:05:04 +00:00
Hans Mackowiak
f1a76e1e76 Questing Beast: fix Damage Trigger 2019-10-22 00:41:25 +00:00
Hans Mackowiak
299de54ba5 BanList 2019-10-21 2019-10-22 00:40:49 +00:00
CCTV-1
d780aa43d4 update new settings translation 2019-10-18 18:30:59 +08:00
austinio7116
ed48bc2e0e ELD Deckgen Data 2019-10-15 19:06:47 +01:00
Hans Mackowiak
06b9dffa55 Player keyword rework 2019-10-15 11:12:20 +00:00
Agetian
ad63987d01 - Added puzzle PS_ELD1. 2019-10-15 07:37:23 +03:00
Anthony Calosa
d3bad23c99 additional Check 2019-10-13 12:14:42 +08:00
Michael Kamensky
3ea93ac9b4 Merge branch 'newBranch' into 'master' 
Add Support Extended Art

See merge request core-developers/forge!2231
 2019-10-11 04:44:21 +00:00
Anthony Calosa
8a18e5ed26 Add Option for Preload 2019-10-10 17:02:05 +08:00
swordshine
08a3a0baa0 Fix Seedguide Ash 2019-10-10 15:22:40 +08:00
Anthony Calosa
d071c291ad Added Sprite Border 2019-10-10 15:02:37 +08:00
Anthony Calosa
98e86f17bd Add FPS Display, Add Preload Extended Art, Add Border Images 2019-10-10 14:31:22 +08:00
Anthony Calosa
147b20e5f4 Add FPS Display 2019-10-10 09:41:12 +08:00
Peter
53c88f0302 Added to contributors XD 2019-10-07 22:40:45 +02:00
Peter
ad1cc78578 Mobile: Translate Draft, Gauntlet and Puzzle Screens. 
Fixed crash in LoadGameMenu (wrong translated enum...)
 2019-10-07 22:39:00 +02:00