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,761 Commits 31 Branches 187 Tags
acadff3e04ddfb9ed25c1786be3b25c81b245bcc
Commit Graph

38761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
237f64226f More GRN Spoilers from Forgescribe fixed up but untested 2018-09-15 21:58:07 +01:00
austinio7116
c5d5e08c44 Merge branch 'surveilReplace' into 'master' 
Surveil replace

See merge request core-developers/forge!924
 2018-09-15 18:32:13 +00:00
austinio7116
b7b302c4f9 More GRN Spoilers 2018-09-15 18:16:28 +01:00
Hanmac
3277377ed6 cards: add some surveil cards 2018-09-15 18:34:40 +02:00
Hanmac
ee9f79a514 Surveil: add ReplaceEffect for adding +2 2018-09-15 18:33:57 +02:00
Hans Mackowiak
c3579709ee Merge branch 'grn_tokens' into 'master' 
Convert GRN tokens to TokenScript

See merge request core-developers/forge!902
 2018-09-15 15:19:24 +00:00
Sol
ae96dadd54 Convert GRN tokens to TokenScript 2018-09-15 15:19:24 +00:00
Agetian
5503897911 - Added a basic AI logic for Najeela, the Blade Blossom. 2018-09-14 12:51:29 +03:00
Michael Kamensky
2433cf3dad Merge branch 'heavenly-blademaster' into 'master' 
Added Heavenly Blademaster (fixed script originally by Austinio).

See merge request core-developers/forge!922
 2018-09-14 09:16:02 +00:00
austinio7116
5eba12b029 Some more spoiled GRN cards forgescribed and fixed where needed 2018-09-14 07:59:38 +01:00
Sol
c1f3a49ea0 Najeela 2018-09-14 00:42:11 +00:00
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