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
39,300 Commits 33 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

39300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
f7b88a6f8f Merge branch 'puzzle-engine' into 'master' 
Adding puzzle PS_GRN3 (Possibility Storm - Guilds of Ravnica 03)

See merge request core-developers/forge!1039
 2018-10-23 05:12:29 +00:00
Agetian
4d8b6eb785 Merge remote-tracking branch 'origin/puzzle-engine' into puzzle-engine 2018-10-23 08:11:30 +03:00
Agetian
6055f9ddc4 - Added puzzle PS_GRN3. 2018-10-23 08:11:13 +03:00
Agetian
7b10e3a9fc Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-23 08:04:21 +03:00
Michael Kamensky
2cce3ab252 Merge branch 'sorting' into 'master' 
Update item manager groupings

See merge request core-developers/forge!1035
 2018-10-23 05:03:50 +00:00
Michael Kamensky
67bcb9e75a Merge branch 'patch-14' into 'master' 
Update trench_gorger.txt

See merge request core-developers/forge!1038
 2018-10-23 04:57:36 +00:00
Michael Kamensky
7b3b3068e6 Merge branch 'patch-13' into 'master' 
Fix non-bug typo

See merge request core-developers/forge!1037
 2018-10-23 04:57:21 +00:00
Meerkov
2b4435de2e Update trench_gorger.txt 2018-10-23 01:19:18 +00:00
Meerkov
2d7d15193e Update ranging_raptors.txt 2018-10-23 01:18:10 +00:00
swordshine
0712f7a074 Merge branch 'skalla_wolf_patch' into 'master' 
Add missing trigger to Skalla Wolf

See merge request core-developers/forge!1036
 2018-10-22 04:28:03 +00:00
Rob Schnautz
7e62fd42fb Add missing trigger to Skalla Wolf 2018-10-22 00:53:47 +00:00
Rob Schnautz
b1d62d32ca Tribal instant gets its own section 2018-10-21 22:54:29 +00:00
Rob Schnautz
df52202f65 Update Type, Default, and add a PW Deck style sort 2018-10-21 18:21:23 +00:00
Agetian
aff1ce8dae Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-21 07:24:58 +03:00
Michael Kamensky
c50edc2139 Merge branch 'fix-npes' into 'master' 
Fix NPEs reported by Sentry

See merge request core-developers/forge!1034
 2018-10-21 03:54:26 +00:00
Chris H
ff4622954f Fix NPEs reported by Sentry 2018-10-20 22:07:57 -04:00
Michael Kamensky
7e8899acb6 Merge branch 'historicformats' into 'master' 
historic DCI sanctioned formats M19-GRN.

See merge request core-developers/forge!1032
 2018-10-20 04:19:19 +00:00
Michael Kamensky
b22461ebc6 Merge branch 'clear-new-cards-on-quest-create' into 'master' 
Clear the new column after a quest starts.

See merge request core-developers/forge!1033
 2018-10-20 04:18:43 +00:00
Chris H
e403c9d764 Clear the new column after a quest starts. 2018-10-19 21:48:16 -04:00
Rob Schnautz
4c2c1ec86a historic DCI sanctioned formats M19-GRN. 2018-10-19 22:25:51 +00:00
Agetian
02329cf25e Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-19 22:39:11 +03:00
Michael Kamensky
ae4978abe6 Merge branch 'ai-parsing-variables' into 'master' 
Ai parsing variables

See merge request core-developers/forge!1027
 2018-10-19 19:38:34 +00:00
Sol
79f580d55a Update PowerExchangeAi.java 2018-10-19 13:37:29 +00:00
Sol
67889b4979 Merge branch 'ai-svar-update' into 'ai-parsing-variables' 
Update direct references to RemAIDeck/RemRandomDeck to use the new format

See merge request friarsol/forge!1
 2018-10-19 12:13:31 +00:00
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