external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,880 Commits 32 Branches 187 Tags
64131f15e56cc7c470764a34e7d3258e987f1dcc
Commit Graph

45880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
klaxnek
d83d57ed7b Fix translated string and translate some of them 2020-10-12 18:31:41 +02:00
klaxnek
6ac6a6510d Merge remote-tracking branch 'core-developers/master' into translationsfixes 2020-10-12 17:16:25 +02:00
Michael Kamensky
e2c8990539 Merge branch 'newBranch' into 'master' 
[Mobile] Refactor Deckbox ImageView

See merge request core-developers/forge!3257
 2020-10-12 05:33:59 +00:00
Michael Kamensky
d4442df4cb Merge branch 'master' into 'master' 
Nahiri's Lithoforming: RemAIDeck until the AI can be figured out for it.

See merge request core-developers/forge!3259
 2020-10-12 05:30:08 +00:00
Michael Kamensky
8dc6b3d9cf Merge branch 'master' into 'master' 
translate new setting

See merge request core-developers/forge!3258
 2020-10-12 05:29:45 +00:00
Michael Kamensky
ddee1ff556 - Nahiri's Lithoforming: RemAIDeck until the AI can be figured out for it. 2020-10-12 08:28:57 +03:00
Anthony Calosa
4126b651a4 add dispose to shaderOutline 2020-10-12 12:59:42 +08:00
Anthony Calosa
3caa1b2ea1 use shader for deck selector 2020-10-12 12:54:00 +08:00
CCTV-1
d50d64e1a3 translate new setting 2020-10-12 12:34:56 +08:00
Anthony Calosa
ad3809f57a update filter 2020-10-12 10:55:47 +08:00
Anthony Calosa
df7a8ca0d0 [Mobile] Refactor Deckbox ImageView 
-fix Mana Icons and Deck Name on Portrait and Landscape Mode
 2020-10-12 10:36:03 +08:00
Michael Kamensky
936d07bd86 Merge branch 'newBranch' into 'master' 
[Mobile] Update some GUI Elements

See merge request core-developers/forge!3255
 2020-10-11 13:26:28 +00:00
Michael Kamensky
d1e97cc186 Merge branch 'questMode_wildOpponents' into 'master' 
Implementation to make available (for Wild opponents in quest mode) also the decks stored in subfolders

See merge request core-developers/forge!3256
 2020-10-11 13:25:00 +00:00
Alessandro Coli
77938a8b90 Implementation to make available (for Wild opponents) also the decks 
stored in subfolders of the main "constructed" folder
 2020-10-11 14:22:51 +02:00
Anthony Calosa
6fd5c35b1c add todo scaling for portrait mode on deck image view for deck colors 2020-10-11 19:28:12 +08:00
klaxnek
ef75fad04d Fix some translations 2020-10-11 10:34:45 +02:00
klaxnek
a878841963 Merge remote-tracking branch 'core-developers/master' 2020-10-11 10:20:21 +02:00
Anthony Calosa
688fad9023 [Mobile] Added Deckbox and Commander Background for ImageView 
- updated Assets required!
 2020-10-11 14:18:21 +08:00
Anthony Calosa
35a4316261 [Mobile] Replace ManaCost Strings to show ManaCost Symbols 2020-10-11 14:13:53 +08:00
Michael Kamensky
56ad59da18 Merge branch 'oracle-updates' into 'master' 
Oracle updates

See merge request core-developers/forge!3254
 2020-10-11 05:05:57 +00:00
Michael Kamensky
a345ae5438 Merge branch 'znrtranslations' into 'master' 
Zendikar Rising (ZNR) Card Translations

See merge request core-developers/forge!3253
 2020-10-11 04:33:45 +00:00
Rob Schnautz
cdb2e41e83 damage instead 2020-10-11 04:09:57 +00:00
Rob Schnautz
c42c771306 eat your veggies 2020-10-11 03:04:30 +00:00
Rob Schnautz
bc2c7a1669 this-spelling the myths 2020-10-11 02:57:47 +00:00
Rob Schnautz
4a8d062c24 modular reminder 2020-10-11 02:34:23 +00:00
Rob Schnautz
cfca5f3d34 dichotomancing the stone 2020-10-11 02:13:31 +00:00
Rob Schnautz
a54d5d73a6 die, brutal expulsion, die 2020-10-11 02:10:38 +00:00
Rob Schnautz
b6a8b14c3f cryptoplasm conformity 2020-10-11 02:08:22 +00:00
Rob Schnautz
2319ebb909 what's in a name? 2020-10-11 02:06:15 +00:00
Rob Schnautz
c722a11491 many a treasured thing 2020-10-11 01:55:58 +00:00
Rob Schnautz
f2c76d4979 It continues to deal 2020-10-11 01:19:10 +00:00
Rob Schnautz
23d09d1776 your CARDNAME is showing 2020-10-11 00:09:41 +00:00
Rob Schnautz
a94de2b8d2 tamping down trample 2020-10-10 23:50:35 +00:00
Rob Schnautz
1f8f2240f4 M19 oracle changes 2020-10-10 23:25:19 +00:00
klaxnek
78d59b6a11 All Cards Scryfall database downloaded by API 2020-10-10 09:16:04 +02:00
klaxnek
148eccc20a ZNR Card Translations 
Updated from Scryfall database
 2020-10-09 20:03:25 +02:00
Michael Kamensky
dd023cdb08 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3252
 2020-10-09 17:56:07 +00:00
klaxnek
2174a68d77 Fix typo 2020-10-09 19:48:13 +02:00
klaxnek
7f477ed5c8 Add missing spanish card translations 2020-10-09 19:46:45 +02:00
klaxnek
d533c6a97b Merge branch 'master' into core-developers/master 2020-10-09 19:45:08 +02:00
klaxnek
70568b3095 Merge remote-tracking branch 'core-developers/master' 2020-10-09 19:41:36 +02:00
Andreas Bendel
87f541b91f Update de-DE.properties 
Corrected typo
 2020-10-09 16:47:46 +00:00
Michael Kamensky
34d27d628b Merge branch 'sim-draw-npe' into 'master' 
fix sw.stop bug, added draw condition for timeouts and both players life 0

See merge request core-developers/forge!3251
 2020-10-08 14:16:20 +00:00
MisterVito
715aec7e54 fix sw.stop bug, added draw condition for timeouts and both players life 0 2020-10-08 03:12:52 -07:00
MisterVito
e7d1ee98d2 remove sw.stop as the stopwatch is not running by this point 2020-10-07 23:39:17 -07:00
Michael Kamensky
6d62159e3e Merge branch 'thisspell' into 'master' 
Enforcing an Oracle template change

See merge request core-developers/forge!3243
 2020-10-08 05:32:20 +00:00
Michael Kamensky
007718f658 Merge branch 'sim-draw-npe' into 'master' 
add a draw condition for sim if players life total both equal 0

See merge request core-developers/forge!3248
 2020-10-08 05:29:11 +00:00
Michael Kamensky
63788018b4 Merge branch 'preconimg' into 'master' 
updating precon-images.txt

See merge request core-developers/forge!3246
 2020-10-08 04:51:48 +00:00
MisterVito
e4df5fe4ff add a draw condition for sim if players life total both equal 0 2020-10-07 17:34:58 -07:00
Northmoc
145669bb38 more "this spell" 2020-10-07 16:04:28 -04:00