external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,934 Commits 32 Branches 187 Tags
677ee26e91b1ce3d9dfaee0edb88c64db04dad3c
Commit Graph

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
9815161bb0 Nesting Dragon (thanks inb63) 2018-08-04 10:39:46 +01:00
austinio7116
3d422076ad Tuvasa, the Sunlit 2018-08-04 10:34:22 +01:00
Michael Kamensky
ddb99c4cb5 Merge branch 'morec18newcards' into 'master' 
Loyal Apprentice, Sower of Discord and updated Lieutenant filters

See merge request core-developers/forge!826
 2018-08-04 05:51:49 +00:00
austinio7116
9127dc5d1e Fix for loyal unicorn's damage prevention 2018-08-04 06:36:12 +01:00
austinio7116
0876633990 Sower of Discord 2018-08-04 06:33:56 +01:00
Michael Kamensky
943e9836cd Merge branch 'quest_load_resilience' into 'master' 
Improve resilience for Quest Loading

See merge request core-developers/forge!827
 2018-08-04 04:50:30 +00:00
Michael Kamensky
b543f1b4d2 Merge branch 'master' into 'master' 
Fixed a missing comment symbol in forge.profile.properties.example.

See merge request core-developers/forge!829
 2018-08-04 04:47:53 +00:00
Agetian
600e8629f4 - Fixed a missing comment symbol in forge.profile.properties.example. 2018-08-04 07:47:26 +03:00
Michael Kamensky
308ecd0be8 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.13.001 [incremental].

See merge request core-developers/forge!828
 2018-08-04 03:29:38 +00:00
Agetian
becd02c8e2 - Preparing Forge for Android publish 1.6.13.001 [incremental]. 2018-08-04 06:29:17 +03:00
tehdiplomat
be18d49de7 Fix Mobile project not catching new thrown error 2018-08-03 22:44:37 -04:00
tehdiplomat
ab77d97e59 Improve resilience for Quest Loading 2018-08-03 21:19:14 -04:00
Blacksmith
c05464585e Clear out release files in preparation for next release 2018-08-03 22:14:41 +00:00
Blacksmith
87c0ab7b7d [maven-release-plugin] prepare for next development iteration 2018-08-03 22:08:24 +00:00
Blacksmith
aea32aee62 [maven-release-plugin] prepare release forge-1.6.14 forge-1.6.14 2018-08-03 22:08:21 +00:00
Blacksmith
6e8e28a615 Update README.txt for release 2018-08-03 22:06:33 +00:00
Blacksmith
9ca15ae635 Clear out release files in preparation for next release 2018-08-03 21:20:17 +00:00
Blacksmith
bb5102e311 [maven-release-plugin] prepare for next development iteration 2018-08-03 21:13:58 +00:00
Blacksmith
4d9b98bc94 [maven-release-plugin] prepare release forge-1.6.13 forge-1.6.13 2018-08-03 21:13:55 +00:00
Blacksmith
1e1640b292 Update README.txt for release 2018-08-03 21:11:47 +00:00
austinio7116
1b47dce3e0 Consistent filter for Lieutenant cards to include Card.IsCommander+YouOwn+YouCtrl 2018-08-03 18:55:45 +01:00
austinio7116
6a340b9004 Loyal Apprentice 2018-08-03 07:25:47 +01:00
Michael Kamensky
e250077839 Merge branch 'fix_unzipped_path' into 'master' 
Fix incorrect file path when extracting downloaded .zip

See merge request core-developers/forge!809
 2018-08-03 04:05:27 +00:00
Michael Kamensky
5e4c7bce82 Merge branch 'master' into 'master' 
- Fixed trigger description on Octopus Umbra.

See merge request core-developers/forge!825
 2018-08-03 04:04:26 +00:00
Agetian
604010fbce - Fixed trigger description on Octopus Umbra. 2018-08-03 07:03:57 +03:00
Michael Kamensky
4b4bab6086 Merge branch 'morec18newcards' into 'master' 
Nylea's Collossus, Octopus Umbra and Varina

See merge request core-developers/forge!823
 2018-08-03 04:02:41 +00:00
Michael Kamensky
7c38b97540 Merge branch 'brudiclad3' into 'master' 
Brudiclad, Telchor Engineer

See merge request core-developers/forge!822
 2018-08-03 03:57:20 +00:00
austinio7116
1fa768bb81 Nylea's Colossus 2018-08-03 00:01:16 +01:00
austinio7116
eda2ba4adf A couple of scripts uploaded by Cryptix and inb63 2018-08-02 23:19:08 +01:00
Michael Kamensky
001a51a070 Merge branch 'master' into 'master' 
Fix for Quest Reward Multiplier Issue

See merge request core-developers/forge!820
 2018-08-02 03:50:49 +00:00
austinio7116
ac4d476ab3 Merge branch 'c18editions2' into 'master' 
C18 scripts created by the ForgeScribe neural network that look correct on…

See merge request core-developers/forge!806
 2018-08-01 22:12:09 +00:00
austinio7116
c41c3bd161 Brudiclad, Telchor Engineer 
(cherry picked from commit 9b83f7b)
 2018-08-01 22:03:01 +01:00
Wario
e2e0123d2b Update QuestWinLoseController.java 2018-08-01 20:37:58 +00:00
Michael Kamensky
7e0ebef57b Merge branch 'commanderNinjutsu' into 'master' 
CardFactoryUtil: add Commander Ninjutsu variant

See merge request core-developers/forge!819
 2018-08-01 16:47:50 +00:00
Michael Kamensky
4f53188b94 Merge branch 'master' into 'master' 
Added a missing reference to Gyrus, Waker of Corpses.

See merge request core-developers/forge!821
 2018-08-01 16:44:10 +00:00
Agetian
653cbd7345 - Added a missing reference to Gyrus, Waker of Corpses. 2018-08-01 19:43:21 +03:00
Michael Kamensky
3e980f30aa Merge branch 'c18fixedcards' into 'master' 
Gyrus, Waker of Corpses and Retrofitter Foundry

See merge request core-developers/forge!817
 2018-08-01 16:42:36 +00:00
Michael Kamensky
9acc59232b Merge branch 'fixlordwindgrace' into 'master' 
Added cleanup to Lord Windgrace to fix first ability.

See merge request core-developers/forge!818
 2018-08-01 16:24:27 +00:00
Wario
33d7596cac Update QuestWinLoseController.java 2018-08-01 12:25:11 +00:00
Wario
bded1d604a Fix for Quest Reward Multiplier Issue 2018-08-01 11:21:07 +00:00
Hanmac
fd1fe2b0e4 CardFactoryUtil: add Commander Ninjutsu variant 2018-08-01 07:58:59 +02:00
austinio7116
b5ccfb11e7 Added cleanup to Lord Windgrace to fix first ability. 
(cherry picked from commit b286088)
 2018-08-01 06:39:39 +01:00
austinio7116
d35af0a89d Merge branch 'c18planeswalkers' into 'master' 
Lord Windgrace

See merge request core-developers/forge!813
 2018-07-31 09:31:41 +00:00
austinio7116
2462ce58ab Gyrus, Waker of Corpses 
(cherry picked from commit 8dcfe38)
 2018-07-31 10:30:38 +01:00
austinio7116
1d57c1a444 Retrofitter Foundry 
(cherry picked from commit 6c7161b)
 2018-07-31 10:30:19 +01:00
austinio7116
3d55461332 Lord Windgrace - fixed oracle text brackets 2018-07-31 07:07:25 +01:00
austinio7116
cdb2474fa1 Merge branch 'etbCounterArixmethes' into 'master' 
GameAction: fixed putEtbCounters with Arixmethes

See merge request core-developers/forge!814
 2018-07-31 05:59:22 +00:00
Michael Kamensky
49e5cf7be0 Merge branch 'master' into 'master' 
Forge for Android publish 1.6.12.001

See merge request core-developers/forge!816
 2018-07-31 04:03:22 +00:00
Agetian
3b6ab7e8c1 - Preparing Forge for Android publish 1.6.12.001 [incremental]. 2018-07-31 07:02:02 +03:00
Blacksmith
0d15166137 [maven-release-plugin] prepare for next development iteration 2018-07-31 01:38:47 +00:00