external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,806 Commits 34 Branches 187 Tags
fc8142db8b51a38b04afa8cd66e19de340ab6fc3
Commit Graph

38806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
bb9cf0903b - Fixed a script line. 2018-09-13 15:54:48 +03:00
Agetian
9354182ba4 - Added Heavenly Blademaster (fixed script originally by Austinio). 2018-09-13 15:51:49 +03:00
Michael Kamensky
5a500b857b Merge branch 'checkstyle' into 'master' 
implement basic checkstyle configuration

See merge request core-developers/forge!911
 2018-09-13 12:45:22 +00:00
Michael Kamensky
27237070ae Merge branch 'master' into 'master' 
Fix a NPE in TokenAi when processing non-creature old style tokens.

See merge request core-developers/forge!919
 2018-09-13 11:17:13 +00:00
Michael Kamensky
8c13c526a0 Merge branch 'surveilTrigger' into 'master' 
Surveil Trigger with OnlyFirst

See merge request core-developers/forge!917
 2018-09-13 11:15:32 +00:00
Michael Kamensky
dedbfbf7b3 Merge branch 'puzzle-engine' into 'master' 
- Clarification for PS_M199.

See merge request core-developers/forge!921
 2018-09-13 11:15:04 +00:00
Agetian
88551a2107 - Clarification for PS_M199. 2018-09-13 14:13:56 +03:00
Michael Kamensky
82f1291aa6 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M199.

See merge request core-developers/forge!920
 2018-09-13 11:13:15 +00:00
Agetian
c03004adaf - Added puzzle PS_M199. 2018-09-13 14:12:35 +03:00
Agetian
a9e100cac5 - Fix a NPE in TokenAi when processing non-creature old style tokens. 2018-09-13 14:06:02 +03:00
Michael Kamensky
b48bea304d Merge branch 'master' into 'master' 
Basic SurveilAi logic

See merge request core-developers/forge!918
 2018-09-13 11:05:18 +00:00
austinio7116
6899fb373f Renamed conclave guildmage 
Price of Fame first attempt
 2018-09-13 11:21:40 +01:00
Agetian
6d599d2b8c - Basic SurveilAi logic, largely inspired with the ScryAi logic. 2018-09-13 11:27:56 +03:00
austinio7116
8b6183582a More GRN Spoilers 2018-09-13 09:19:33 +01:00
Hanmac
612165ba25 Surveil Trigger with OnlyFirst 2018-09-13 08:15:51 +02:00
austinio7116
6f8ff8200c Fixed Arclight duplicate count 2018-09-12 23:03:08 +01:00
Michael Kamensky
6b6629c01c Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.15.002 [hotfix].

See merge request core-developers/forge!916
 2018-09-12 19:47:47 +00:00
Agetian
e1d34ef9d5 - Preparing Forge for Android publish 1.6.15.002 [hotfix]. 2018-09-12 22:47:12 +03:00
Michael Kamensky
71397ec648 Merge branch 'sentry-bug-fixes' into 'master' 
Sentry Bug Fixes

Closes #705

See merge request core-developers/forge!914
 2018-09-12 19:36:05 +00:00
Michael Kamensky
27d2ba384d Merge branch 'multi-select' into 'master' 
Multi select

Closes #703

See merge request core-developers/forge!913
 2018-09-12 19:35:39 +00:00
Michael Kamensky
37cbd2fe64 Merge branch 'user-reported-bugs' into 'master' 
fix Jubilant Mascot creature type

Closes #706

See merge request core-developers/forge!915
 2018-09-12 19:28:04 +00:00
austinio7116
85c1ca232e Updated GRN editions file 2018-09-12 19:32:12 +01:00
austinio7116
efd5efb0d5 More GRN cards 2018-09-12 19:26:31 +01:00
austinio7116
aec4726aa2 More GRN spoilers 2018-09-12 18:22:37 +01:00
austinio7116
2b3d1727ea More GRN spoilers - guildmages_forum needs special testing attention 2018-09-12 17:26:06 +01:00
austinio7116
d70778b5be Vivid revival and lockets 2018-09-12 17:06:33 +01:00
austinio7116
f519a2ff6d Removed chromatic lantern as it is a reprint 2018-09-12 16:59:59 +01:00
austinio7116
bb76b63f82 Expansion Explosion 2018-09-12 16:58:37 +01:00
Jamin W. Collins
5c723d8883 log malformed card rather than throw an exception 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-12 07:40:31 -06:00
Jamin W. Collins
933280ce32 fix Jubilant Mascot creature type 
Closes: core-developers/forge#706

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-12 07:25:32 -06:00
Jamin W. Collins
841cd22ae4 default importing DeckSection to Main 
Closes: core-developers/forge#705

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 20:56:40 -06:00
Jamin Collins
d011f9948d Merge branch 'sentryKeyword' into 'master' 
Sentry keyword

See merge request core-developers/forge!910
 2018-09-12 01:13:42 +00:00
Jamin W. Collins
1da18cb9f5 fix human multi-select on mobile builds 
Closes: core-developers/forge#703

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 18:36:13 -06:00
Jamin W. Collins
a6423b82f0 correct the new default messaging format 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 18:30:19 -06:00
Jamin W. Collins
fc62a41e46 implement basic checkstyle configuration 
Remove all unused or redundant imports

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 18:16:43 -06:00
austinio7116
2a08ea7092 Secrets of the mausoleum 2018-09-11 22:56:58 +01:00
austinio7116
977f3c2808 Updated GRN editions file 2018-09-11 22:25:04 +01:00
austinio7116
2853e44d6a Rain of Notions, NightVeil Faerie 2018-09-11 22:23:24 +01:00
austinio7116
b1bae53be8 Fixes for hypothesizzle 2018-09-11 20:58:57 +01:00
austinio7116
65dad45e77 More GRN spoilers. Nullhide Ferox needs code change to support "any player may activate" 2018-09-11 20:23:06 +01:00
austinio7116
e36245b414 Fixes for Ral, Izzet Viceroy 2018-09-11 18:41:54 +01:00
austinio7116
568104bbcc GRN more spoiled cards created with forgeScribe and updated 2018-09-11 17:09:14 +01:00
austinio7116
5b02986586 GRN updated editions file 2018-09-11 12:58:29 +01:00
austinio7116
0f5b1c1349 GRN - deafening clarion 2018-09-11 12:55:30 +01:00
Hanmac
998176a7d7 Keyword: use Sentry in createTraits 2018-09-11 10:32:46 +02:00
Hanmac
1cac53b4f0 update Project files for newer eclipse 2018-09-11 10:31:33 +02:00
austinio7116
b18a99c2c5 Added Undergrowth to Izona trigger description 2018-09-11 07:42:19 +01:00
austinio7116
8adfe15b4c More GRN Spoilers from Forgescribe fixed up but untested 2018-09-11 07:40:21 +01:00
Michael Kamensky
9e0a4ded01 Merge branch 'surveil-basic-ai' into 'master' 
A simple hook that calls Scry logic for Surveil (with an additional check)

See merge request core-developers/forge!907
 2018-09-11 05:35:21 +00:00
austinio7116
c57bb0c349 More GRN Spoilers from Forgescribe fixed up but untested 2018-09-11 06:28:48 +01:00