external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,404 Commits 31 Branches 187 Tags
f1f96557c2a08d30a84a68f9bd731c94b0fc715c
Commit Graph

38404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
5c0e70aa36 - C18 planeswalker achievements (initial commit). 2018-08-06 15:45:17 +03:00
Agetian
d5248e2d26 - M19 planeswalker achievements: initial commit. 2018-08-06 15:43:29 +03:00
Michael Kamensky
def2c3ed48 Merge branch 'tokenAttach' into 'master' 
TokenEffect: Add AttachTo effect for Estrid

See merge request core-developers/forge!839
 2018-08-06 12:20:07 +00:00
Hanmac
a98fdff570 Estrid the Masked: fixed Untap Effect 2018-08-06 13:25:09 +02:00
Hanmac
197880dda4 TokenEffect: refactor attachTo 2018-08-06 07:20:30 +02:00
Hanmac
08d984a699 TokenEffect: Add AttachTo effect for Estrid 2018-08-05 22:08:15 +02:00
Michael Kamensky
a56476645f Merge branch 'master' into 'master' 
Update prismatic_lace.txt

See merge request core-developers/forge!838
 2018-08-05 13:15:40 +00:00
Anthony Calosa
bb34d29a44 Update prismatic_lace.txt 2018-08-05 12:33:23 +00:00
Michael Kamensky
1dc2abb7a6 Merge branch 'updatedCommanderDeckgenData' into 'master' 
Updated Commander card-based deck generation data to include recent sets and…

See merge request core-developers/forge!837
 2018-08-05 06:39:44 +00:00
austinio7116
e59cd59ea2 Updated Commander card-based deck generation data to include recent sets and data from other sources. 2018-08-05 05:55:54 +01:00
Michael Kamensky
1d02087128 Merge branch 'morec18newcards' into 'master' 
Nesting Dragon update to trigger names to avoid text changing effects with "dragon"

See merge request core-developers/forge!835
 2018-08-05 03:27:15 +00:00
austinio7116
c106d856c0 Nesting Dragon update to trigger names to avoid text changing effects with "dragon" 2018-08-04 22:17:57 +01:00
Michael Kamensky
8d2668257c Merge branch 'morec18newcards' into 'master' 
Tuvasa, the Sunlit and Nesting Dragon

See merge request core-developers/forge!830
 2018-08-04 12:05:27 +00:00
Michael Kamensky
b0ce5a2a28 Merge branch 'fix_unzipped_path' into 'master' 
Fix incorrect file path when extracting downloaded .zip

See merge request core-developers/forge!833
 2018-08-04 11:57:03 +00:00
NikolayHD
7c32151d1f Fix incorrect file path when extracting downloaded .zip 2018-08-04 14:50:41 +03:00
Michael Kamensky
6a7584b3f2 Merge branch 'master' into 'master' 
Fix compile after the previous revert.

See merge request core-developers/forge!832
 2018-08-04 10:09:06 +00:00
Michael Kamensky
bef375650f - Fix compile after the previous revert. 2018-08-04 13:08:32 +03:00
Michael Kamensky
30fadb5912 Merge branch 'master' into 'master' 
Reverted Paths.get in Zip downloader (breaks Android). Forge for Android 1.6.13.002.

See merge request core-developers/forge!831
 2018-08-04 10:03:25 +00:00
Michael Kamensky
91ebc8549c - Preparing Forge for Android publish 1.6.13.002 [hotfix]. 2018-08-04 13:02:10 +03:00
Michael Kamensky
0a2dd16d83 - As much as I like Paths.get, it breaks Android. Reverting. 2018-08-04 13:01:37 +03:00
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