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
40,394 Commits 32 Branches 187 Tags
7da2316c0a6ebe7dfc23dcc77a87404c90ced92c
Commit Graph

40394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
7da2316c0a - Preparing Forge for Android publish 1.6.21.002 [incremental]. 2019-03-04 16:34:33 +03:00
Michael Kamensky
6807257630 Merge branch 'custom-pool-options' into 'master' 
Swanky new Choose Sets Dialog randomizer

See merge request core-developers/forge!1431
 2019-03-04 13:13:50 +00:00
Michael Kamensky
223136dd6f Merge branch 'android-max-size-image-cache' into 'master' 
Android max size image cache

See merge request core-developers/forge!1432
 2019-03-04 13:13:35 +00:00
Sol
0b997a2937 Android max size image cache 2019-03-04 13:13:35 +00:00
Michael Kamensky
66debd6806 Merge branch 'master' into 'master' 
Added puzzle PS_RNA5 (Possibility Storm - Ravnica Allegiance 05)

See merge request core-developers/forge!1441
 2019-03-04 13:13:10 +00:00
Agetian
063ebf2f70 - Added puzzle PS_RNA5. 2019-03-04 15:04:21 +03:00
Michael Kamensky
940cd71d34 Merge branch 'master' into 'master' 
ManaBurn sound working again + Edition files for Mythic Edition of Guild of Ravnica and Ravnica Allegiance

See merge request core-developers/forge!1437
 2019-03-04 03:22:56 +00:00
Michael Kamensky
fc987a81a0 Merge branch 'fix-bad-art-deck-art-corruption' into 'master' 
If a DeckList references a bogus card set/art combo ignore parts of it until it works

Closes #132

See merge request core-developers/forge!1440
 2019-03-04 03:22:44 +00:00
Chris H
888f5953b1 If a DeckList references a bogus card set/art combo ignore parts of it until it works 2019-03-03 21:47:28 -05:00
Sol
c30086390d Merge branch 'master' into 'master' 
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1413
 2019-03-03 20:44:33 +00:00
Sol
37207559e6 Merge branch 'patch-2' into 'master' 
Update Bug.md

See merge request core-developers/forge!1439
 2019-03-03 17:47:25 +00:00
Sol
93bd90f139 Update Bug.md 2019-03-03 17:47:01 +00:00
Alessandro Coli
df55bc5d34 Fixing of tabs as required 2019-03-03 10:13:22 +01:00
Sol
ce7b66652c Merge branch 'add-gitlab-templates' into 'master' 
Add gitlab templates

See merge request core-developers/forge!1438
 2019-03-03 02:23:03 +00:00
Chris H
c091eefc84 Add gitlab templates 2019-03-02 21:20:47 -05:00
Alessandro
b7508b8c3a ManaBurn sound working again 2019-03-02 16:10:13 +01:00
Alessandro
b5a0e15327 Merge remote-tracking branch 'upstream/master' 2019-03-02 13:14:33 +01:00
Alessandro
d29ed9a5fe New editions files for "Mythic editions" of Guilds of Ravnica and 
Ravnica Allegiance
 2019-03-02 12:45:15 +01:00
Michael Kamensky
62cf8533e0 Merge branch 'ai-damage-crash' into 'master' 
Ai damage crash

See merge request core-developers/forge!1434
 2019-03-01 18:59:07 +00:00
Chris H
7a96ff2d4b Verify AI divided damage always fills out divided hash with proper values 2019-02-28 22:16:44 -05:00
Sol
cafd7d9c64 Merge branch 'quest-load-npe-fix' into 'master' 
Fix NPE when no quests are available to load

See merge request core-developers/forge!1433
 2019-02-28 02:52:49 +00:00
KrazyTheFox
5377376585 Fix NPE when no quests are available to load 2019-02-27 21:49:31 -05:00
Chris H
69661cab63 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 21:36:32 -05:00
Chris H
15520fcc67 Merge branch 'master' of https://git.cardforge.org/friarsol/forge 2019-02-27 21:35:55 -05:00
KrazyTheFox
eedbdeca99 Add release notes 2019-02-27 20:55:37 -05:00
Churrufli
34380befaf Update AddBasicLandsDialog.java 2019-02-27 19:36:16 +00:00
churrufli
da5b1a18bf Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 20:13:44 +01:00
churrufli
a546339ea2 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 19:58:25 +01:00
churrufli
558442a6bb Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 17:35:06 +01:00
Michael Kamensky
16c9cc7eac Merge branch 'lq-image-download-tweak' into 'master' 
Update server download URL parsing

Closes #858

See merge request core-developers/forge!1421
 2019-02-27 12:22:14 +00:00
Michael Kamensky
71da9ca610 Merge branch 'patch-1' into 'master' 
Remove unnecessary RNA token image URLs

See merge request core-developers/forge!1427
 2019-02-27 12:21:46 +00:00
Michael Kamensky
d54ca72994 Merge branch 'deck-editor-filtering-tweaks' into 'master' 
Fix deck editor Set/Format edit problems.

Closes #863 and #855

See merge request core-developers/forge!1420
 2019-02-27 12:21:29 +00:00
Michael Kamensky
79ce24b682 Merge branch 'patch' into 'master' 
Update Lavinia, Azorius Renegade for multiplayer

See merge request core-developers/forge!1422
 2019-02-27 12:21:17 +00:00
Michael Kamensky
0662dc5964 Merge branch 'set-max-size-for-image-cache' into 'master' 
Set max size for image cache (Reduces memory footprint)

See merge request core-developers/forge!1423
 2019-02-27 12:19:52 +00:00
Sol
e7f7e62cbf Remove unnecessary RNA token image URLs 2019-02-27 02:48:05 +00:00
KrazyTheFox
17c280f052 Merge branch 'master' of git.cardforge.org:core-developers/forge into custom-pool-options 2019-02-26 21:17:10 -05:00
swordshine
8d3fe2088a Merge branch 'gk2' into 'master' 
GK2 edition

See merge request core-developers/forge!1424
 2019-02-27 01:21:20 +00:00
swordshine
a87adfaf16 Merge branch 'type-grouping-patch' into 'master' 
Sort Sorcery // Instant as an instant in Type sort.

See merge request core-developers/forge!1426
 2019-02-27 01:20:45 +00:00
swordshine
ed895a5248 Merge branch 'oracle-nonfunctional' into 'master' 
Oracle nonfunctional

See merge request core-developers/forge!1425
 2019-02-27 01:19:51 +00:00
Rob Schnautz
143a254189 Sort Sorcery // Instant as an instant in Type sort. 2019-02-27 00:31:05 +00:00
Rob Schnautz
25a3367d74 Let's do the Wurm Warp 2019-02-27 00:01:12 +00:00
Rob Schnautz
400c7d366b any time 2019-02-26 23:58:20 +00:00
Rob Schnautz
43cdbbdbee Trample reminder text. 2019-02-26 23:48:51 +00:00
Rob Schnautz
bddba4c6dc Update trample reminder text 2019-02-26 23:43:14 +00:00
Rob Schnautz
4ab79ce75d fix date 2019-02-26 22:57:38 +00:00
Rob Schnautz
42eba01a76 GK2 edition 2019-02-26 22:45:23 +00:00
tehdiplomat
f0efc2089c Ad LRU to ImageCache to get a handle on memory bloat 2019-02-26 15:40:36 -05:00
tehdiplomat
3095c25f6d Merge branch 'master' of https://git.cardforge.org/friarsol/forge 2019-02-26 15:40:16 -05:00
swordshine
f38ec8d4a0 - Update Lavinia, Azorius Renegade for multiplayer 2019-02-26 16:59:25 +08:00
churrufli
56b3f04120 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-25 11:36:50 +01:00