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
39,585 Commits 32 Branches 187 Tags
e10f90cf4966174c4a6ab4123c9ee9169abd6cdc
Commit Graph

39585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
4b52ff05d5 Update direct references to RemAIDeck/RemRandomDeck to use the new format 2018-10-19 12:13:31 +00:00
Agetian
dc1cb92eb6 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-19 07:19:07 +03:00
Michael Kamensky
02beb9fd3d Merge branch 'bug-fixes' into 'master' 
bug fixes

See merge request core-developers/forge!1030
 2018-10-19 04:12:50 +00:00
Jamin W. Collins
2e81a939b9 fix deck import exception message 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-18 18:11:45 -06:00
Jamin W. Collins
fda3e81d9a ignore deck lines that start with // 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-18 17:56:21 -06:00
Agetian
c2290d5002 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-18 07:59:12 +03:00
swordshine
50c827495a Merge branch 'patch' into 'master' 
- Fixed Blood Operative

See merge request core-developers/forge!1029
 2018-10-18 04:16:20 +00:00
swordshine
8e018f9c51 - Fixed Blood Operative 2018-10-18 12:15:44 +08:00
swordshine
2828e5717c Merge branch 'patch' into 'master' 
Fixed Sentinel Tower

See merge request core-developers/forge!1028
 2018-10-18 02:58:01 +00:00
swordshine
42c3fd09db Fixed Sentinel Tower 2018-10-18 10:57:00 +08:00
Sol
0f118da920 Merge branch 'master' into 'ai-parsing-variables' 
# Conflicts:
#   forge-gui/res/cardsfolder/d/detection_tower.txt
#   forge-gui/res/cardsfolder/m/myr_superion.txt
 2018-10-18 02:42:53 +00:00
Chris H
92b0355a41 AI:RemoveDeck (B-Z) 2018-10-17 21:19:37 -04:00
swordshine
6202ae294b Merge branch 'necraFix' into 'master' 
Necravolver fix

See merge request core-developers/forge!1026
 2018-10-18 01:07:44 +00:00
Hanmac
25f7231e49 Necravolver fix 2018-10-17 21:47:09 +02:00
Agetian
209cbfe120 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-17 11:08:17 +03:00
Michael Kamensky
05ba511748 Merge branch 'master' into 'master' 
Update some scripts

See merge request core-developers/forge!1024
 2018-10-17 04:22:16 +00:00
swordshine
f4261cf5a9 Merge branch 'guildofravnica' into 'master' 
Updated GRN standard deck generation data

See merge request core-developers/forge!1025
 2018-10-17 03:51:48 +00:00
Chris H
789f61e27b AI:RemoveDeck (A) 2018-10-16 23:07:21 -04:00
Chris H
6b6f85c289 Move RemoveDeck parsing to new form 2018-10-16 23:04:21 -04:00
austinio7116
a55b94b796 Removed old duplicate 2018-10-16 21:43:34 +01:00
austinio7116
05c326607c Updated deck generation data 
(cherry picked from commit 3be0655)
 2018-10-16 21:39:08 +01:00
maustin
f65f282974 Merge branch 'coremaster' into guildofravnica 2018-10-16 21:38:20 +01:00
Michael Kamensky
5aff78e5c4 Merge branch 'GRN-add-guildgates-to-draft-ranking' into 'master' 
Add guildgates back to GRN draft ranking

See merge request core-developers/forge!1023
 2018-10-16 18:31:52 +00:00
swordshine
9c4d234b7a - Karador cannot play Dryad Arbor 2018-10-16 22:44:35 +08:00
pfirpfel
460ccd78e0 Add guildgates back to GRN draft ranking 2018-10-16 14:51:32 +02:00
swordshine
1ea4810a89 - Update description 2018-10-16 19:37:22 +08:00
Michael Kamensky
51ce712623 Merge branch 'update-legacy-bannings' into 'master' 
Update legacy bannings

See merge request core-developers/forge!1022
 2018-10-16 09:28:53 +00:00
pfirpfel
17cb065079 Update legacy bannings 2018-10-16 10:39:11 +02:00
Agetian
6c611cf448 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-16 08:22:03 +03:00
Michael Kamensky
eb528fd4d7 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_GRN2, improved puzzle PS_GRN1.

See merge request core-developers/forge!1021
 2018-10-16 05:21:02 +00:00
Michael Kamensky
fb7ac6ea21 Added puzzle PS_GRN2, improved puzzle PS_GRN1. 2018-10-16 05:21:02 +00:00
Agetian
256bf8e438 - Added puzzle PS_GRN2. 
- Improved the implementation of puzzle PS_GRN1.
 2018-10-16 08:19:10 +03:00
Agetian
fc60bb9c01 Merge branch 'master' of https://git.cardforge.org/agetian/forge into agetian-master 2018-10-16 07:20:41 +03:00
Chris H
cd74d2a7bf Convert FullCost to PermanentCreature 2018-10-16 07:20:10 +03:00
Sol
1b284e8f3f Update kraul_harpooner.txt not up to targeting 2018-10-16 07:20:10 +03:00
Hanmac
ef24c5058c Epic rework 2018-10-16 07:20:10 +03:00
Agetian
54832cf79f - Preparing Forge for Android publish 1.6.17.001 [incremental]. 2018-10-16 07:20:10 +03:00
Blacksmith
0d8721b651 Clear out release files in preparation for next release 2018-10-16 07:20:10 +03:00
Blacksmith
16e7d39870 [maven-release-plugin] prepare for next development iteration 2018-10-16 07:20:10 +03:00
Blacksmith
41287d30c9 [maven-release-plugin] prepare release forge-1.6.17 2018-10-16 07:20:10 +03:00
Blacksmith
1078960545 Update README.txt for release 2018-10-16 07:20:10 +03:00
pfirpfel
2604d339d1 Update standard ban list: remove cards that rotated 2018-10-16 07:20:10 +03:00
pfirpfel
c856607959 Brawl GRN format update 2018-10-16 07:20:10 +03:00
Sol
0f2ebb9262 Update forge-gui/res/cardsfolder/t/teferi_hero_of_dominaria.txt 2018-10-16 07:20:10 +03:00
Sol
2e23d1035d Update teferi_hero_of_dominaria.txt 2018-10-16 07:20:10 +03:00
Agetian
92645d19d5 - Underrealm Lich should not reveal a card going to hand. 2018-10-16 07:20:10 +03:00
Chris H
f7a6c7080d Improve flashback zone display 2018-10-16 07:20:10 +03:00
Sol
40893683b4 Update sworn_companions.txt 2018-10-16 07:20:10 +03:00
Agetian
59e2e776c4 - Temporarily revert a change in CostPartMana to avoid breaking Convoke, Improvise, and Delve. 2018-10-16 07:20:10 +03:00
Agetian
129fc85a51 - Fixed Sumala Woodshaper not revealing cards to the controller (the "look at" part of DB Dig). 2018-10-16 07:20:10 +03:00