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
Sol
fee2312bc8 Merge branch 'deck-editor' into 'master' 
Deck Editor changes

Closes #554 and #696

See merge request core-developers/forge!896
 2018-09-11 01:26:27 +00:00
Jamin W. Collins
3985d538ae support other sections than just Main/Side 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-10 18:20:15 -06:00
Jamin W. Collins
58a1ad2dd0 create new model before potentially adding cards 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-10 18:19:43 -06:00
austinio7116
4413664b38 Merge branch 'guildofravnica' into 'master' 
Corrected Vraska, Regal Gorgon name error due to scryfall typo in Vraska's Stoneglare oracle text.

See merge request core-developers/forge!908
 2018-09-10 16:18:22 +00:00
austinio7116
3b6baa65ad Corrected Vraska, Regal Gorgon name error due to scryfall typo in Vraska's Stoneglare oracle text. 2018-09-10 17:16:40 +01:00
Agetian
ac3c6c3d21 - Minor typo fix in GameLogFormatter related to Surveil. 2018-09-10 18:11:59 +03:00
Michael Kamensky
6bca50b1c8 Merge branch 'guildofravnica' into 'master' 
Guilds of ravnica - planeswalker deck cards

See merge request core-developers/forge!903
 2018-09-10 15:01:42 +00:00
Agetian
bd8fea4616 - Added a scry logic hook for willPutCardOnTop. 2018-09-10 17:56:29 +03:00
austinio7116
55f1e1d41a Fixed missing brackets in oracles, missing planeswalker names in descriptions and missed damage amount 2018-09-10 06:35:05 +01:00
Jamin W. Collins
df91964573 add dated serial to layout file 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
33d7a0adcc move Brawl next to Commander 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
66fa0c5820 ensure deck name references are cleared on New Deck 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
749eea6f57 default to creating a new deck of a given gameType 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
f0830c8595 reflow a few oneline if statements 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
6a4423a476 automatically edit preferred deck on tab load 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
0577059909 ensure Brawl deck preference is saved 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
3fcb03d3ed support deleting Brawl, Commander, and TL decks 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
5ab2efdc05 reflow DeckManager deleteDeck 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
c4cf7d3c99 rename All Decks deck listing to Constructed 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
5472421765 remove additional tabs when creating special editor 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
e5281987a5 catch unlikely null sectionMode 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
78b02c08db remove old Commander, Brawl, TL deck editor route 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
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