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

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamin W. Collins
29263d2e2d Add Commmander, Brawl, and TL to Deck Editor 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
3f6a02b4b8 add Commander and Brawl to DeckManager case 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
2a48819d2b reflow DeckManager case statement 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
c4683677b3 Add commander decks to normal Deck Editor tab 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
cad9139e9d deck section dropdown 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Agetian
5c8acadb5d - Minor correction to match the expected result per description. 2018-09-09 18:58:04 +03:00
Agetian
0c38c6306f - A simple hook that calls Scry logic for Surveil (but on top of that, checks whether there are enough cards in the library not to deck yourself). 
- Can be improved further by completely differentiating the logic between the two.
 2018-09-09 18:55:58 +03:00
Michael Kamensky
1fa91ecb0f Merge branch 'master' into 'master' 
Preparing Forge for Android v1.6.15.001 [incremental/new release].

See merge request core-developers/forge!906
 2018-09-09 06:46:35 +00:00
Agetian
11d53bce48 - Preparing Forge for Android v1.6.15.001 [incremental/new release]. 2018-09-09 09:45:55 +03:00
austinio7116
27c9fbc0c9 Missing cost in Ral 2018-09-09 07:26:48 +01:00
austinio7116
7231700ede Fixed counter type on Vraska ultimate 2018-09-09 07:18:03 +01:00
Michael Kamensky
810d55931d Merge branch 'fixups' into 'master' 
Fixups

Closes #680, #676, and #673

See merge request core-developers/forge!905
 2018-09-09 05:27:21 +00:00
Jamin W. Collins
e4b146128c avoid an NPE when no cards are chosen 
Closes: core-developers/forge#680

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-08 10:56:59 -06:00
Jamin W. Collins
353dc885c1 gracefully handle port already in use 
Closes: core-developers/forge#676

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-08 10:39:28 -06:00
Jamin Collins
c54ca4c423 Merge branch 'surveil' into 'master' 
Surveil

Closes #681 and #684

See merge request core-developers/forge!904
 2018-09-08 15:22:28 +00:00
Jamin W. Collins
32df03d045 fix an error in the Human multi-select logic 
Closes: core-developers/forge#673

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-08 09:16:03 -06:00
Hanmac
d8f5b870a7 cards: update for surveil 2018-09-08 15:50:45 +02:00
Hanmac
61a627a36a Surveil Effect 2018-09-08 15:50:32 +02:00
austinio7116
31b1781178 GRN planeswalker deck edition update 2018-09-08 07:05:51 +01:00
austinio7116
d0640191e3 Fixes to GRN planeswalker deck scripts 2018-09-08 06:51:40 +01:00
austinio7116
9d04e42a3a GRN planeswalker deck scripts by forgeScribe - unedited 2018-09-08 06:31:59 +01:00
Sol
0baaef6143 Merge branch 'guildofravnica' into 'master' 
Guilds of ravnica

See merge request core-developers/forge!897
 2018-09-08 01:33:45 +00:00
Blacksmith
5e08fd7082 Clear out release files in preparation for next release 2018-09-08 00:29:57 +00:00
Blacksmith
e7d09e8918 [maven-release-plugin] prepare for next development iteration 2018-09-08 00:24:29 +00:00
Blacksmith
c2f62998fc [maven-release-plugin] prepare release forge-1.6.15 forge-1.6.15 2018-09-08 00:24:26 +00:00
Blacksmith
19feee4de5 Update README.txt for release 2018-09-08 00:22:40 +00:00
austinio7116
4c816fe4af Fixed random quest performance issue. 
Switched to 20 life for random challenge AI
Limiting random extra cards to permanents
 2018-09-07 17:56:34 +01:00
austinio7116
c136e7c946 Removed testing variable 2018-09-07 14:39:41 +01:00
austinio7116
7ebd5ef70e Added randomly generated quest challenges to the random standard quest world 2018-09-07 14:38:36 +01:00
Blacksmith
e59015357c Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-07 09:12:14 +00:00
Michael Kamensky
31e2d434cd Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M198.

See merge request core-developers/forge!901
 2018-09-07 09:04:47 +00:00
Agetian
950fd116e7 - Added puzzle PS_M198. 2018-09-07 12:04:13 +03:00
Blacksmith
8818711c0f Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-06 03:10:16 +00:00
Sol
58ee5a12eb Merge branch 'xstream' into 'master' 
XStream Security Settings

See merge request core-developers/forge!868
 2018-09-06 03:04:26 +00:00
Blacksmith
51d49735c2 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-06 01:25:17 +00:00
Jamin Collins
925ae63071 Merge branch 'token_phase_two' into 'master' 
Add more support for migrating Editions to TokenScripts

See merge request core-developers/forge!885
 2018-09-06 01:16:27 +00:00
austinio7116
d07c4d19e0 Updated GRN edition file 2018-09-05 12:21:45 +01:00
austinio7116
adf48de86b Completed Healer's Hawk 2018-09-05 12:18:32 +01:00
maustin
01c34d498a Merge remote-tracking branch 'Austin/guildofravnica' into guildofravnica 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/necrotic_wound.txt
#	forge-gui/res/cardsfolder/upcoming/quasiduplicate.txt
 2018-09-05 12:15:31 +01:00
austinio7116
4188559b1a Manual fixes to forgeScribe scripts 2018-09-05 12:14:15 +01:00
austinio7116
10a68e9613 More ravnica cards as scripted by forgeScribe4.1 - unedited 2018-09-05 12:04:19 +01:00
austinio7116
89c4042042 Corrected Jump-Start and Surveil syntax 2018-09-05 09:01:13 +01:00
austinio7116
d3fb9f3782 Cleanup of forgeScribe scripts including replacing new keywords where required. 2018-09-05 09:00:05 +01:00
austinio7116
3fc1950a19 Initial GRN ForgeScribe scripts from first spoilers 2018-09-05 08:59:56 +01:00
austinio7116
d5d1320c6e Fixed ^M bad interpeter issue in bash script 2018-09-05 08:59:38 +01:00
Blacksmith
5ffcfe52d8 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-05 06:01:09 +00:00
Michael Kamensky
8a1989ef02 Merge branch 'replaceDying' into 'master' 
Replace dying

See merge request core-developers/forge!900
 2018-09-05 05:51:49 +00:00
Hanmac
b0e3ff7b45 add necrotic wound 2018-09-05 07:28:31 +02:00
Hanmac
f0c850aa78 update flaying tendrils 2018-09-05 07:25:29 +02:00
Hanmac
af76c37cbb ReplaceDying moved to SpellAbilityEffect 2018-09-05 07:24:55 +02:00