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
36,509 Commits 33 Branches 187 Tags
057f5face3ee3f858e546b0e45aabce8f62cec7c
Commit Graph

36509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sol
b0a786970f Merge branch 'commanderDeckGenerator' into 'master' 
Commander deck generator

See merge request core-developers/forge!249
 2018-02-28 02:55:11 +00:00
maustin
92e548462d Merge remote-tracking branch 'origin/master' 2018-02-27 22:14:54 +00:00
austinio7116
d05e1e59dc Merge branch 'token_scripts' into 'master' 
Allow scripts to be written for Tokens

See merge request core-developers/forge!236
 2018-02-27 22:14:13 +00:00
austinio7116
9638153581 Attempting to revert accidental README change 2018-02-27 14:58:47 +00:00
maustin
0e06251424 Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator 2018-02-27 14:52:56 +00:00
austinio7116
c5c04e762f Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review 2018-02-27 14:52:41 +00:00
austinio7116
e361f09691 Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review 2018-02-27 08:17:48 +00:00
austinio7116
1b1eb6636d Fixed mobile bug where card-gen decks disabled but still tries to load standard card-based decks 2018-02-27 06:40:59 +00:00
austinio7116
80a2d902c0 Updated card-based deck generation matrix with latest decks 2018-02-27 00:22:35 +00:00
austinio7116
6940eec453 Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator 2018-02-26 23:58:22 +00:00
austinio7116
aaf27f2d60 Added options to disable card based deck generation and to ensure it fails gracefully if .dat data and/or decks folder is missing 2018-02-26 23:54:27 +00:00
austinio7116
9cb1f2787c Assigning lstDecks.getGameType().getDeckFormat() to a variable so we don't have to write it out each conditional 2018-02-26 23:49:47 +00:00
austinio7116
c047ec8588 Update to card view of decks so long-press opens deck viewer to be consistent with list view 2018-02-26 23:49:47 +00:00
austinio7116
2b54468923 Increased basic land count in random commander decks. 
Fixed lobby update on variant change
 2018-02-26 23:49:47 +00:00
austinio7116
e8f257d2cf Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-26 23:49:47 +00:00
austinio7116
66763e537d Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-26 23:49:47 +00:00
austinio7116
0eee296664 Added model file for new commander deck generation and updated modern and standard models too 2018-02-26 23:49:47 +00:00
austinio7116
2891133c5c Update to card view of decks so long-press opens deck viewer to be consistent with list view 2018-02-26 23:49:47 +00:00
austinio7116
6231775997 Increased basic land count in random commander decks. 
Fixed lobby update on variant change
 2018-02-26 23:49:47 +00:00
austinio7116
61ff4d50fd Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-26 23:49:47 +00:00
austinio7116
13560e3b53 Error handling and thread timeout added to simulated matches to allow large AI tournaments without infinite length games due to loops. AI tournaments should now always finish - if the matches take too long they are scored as a draw. 2018-02-26 23:49:47 +00:00
austinio7116
52ae852953 Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-26 23:49:47 +00:00
austinio7116
7761706fb5 Added model file for new commander deck generation and updated modern and standard models too 2018-02-26 23:49:47 +00:00
maustin
d25437c8e0 Merge remote-tracking branch 'origin/master' 2018-02-26 23:45:17 +00:00
Hans Mackowiak
6883ef1e9f Merge branch 'cardstatefix' into 'master' 
CardState: fixed copy with keywordcache

See merge request core-developers/forge!259
 2018-02-26 06:22:35 +00:00
Hanmac
6bb9dd1028 CardState: fixed copy with keywordcache 2018-02-26 07:20:51 +01:00
Blacksmith
d6278541dd Clear out release files in preparation for next release 2018-02-25 22:55:10 +00:00
Blacksmith
5977598c71 [maven-release-plugin] prepare for next development iteration 2018-02-25 22:49:44 +00:00
Blacksmith
35706d71f7 [maven-release-plugin] prepare release forge-1.6.7 forge-1.6.7 2018-02-25 22:49:41 +00:00
Blacksmith
c38f0900d1 Update README.txt for release 2018-02-25 22:48:23 +00:00
Blacksmith
23ed82c0ba Update README.txt for release 2018-02-25 21:56:40 +00:00
Blacksmith
ea4b82f11e Fix SCM URLs again 2018-02-25 21:56:15 +00:00
Blacksmith
8cfff4299a Fix SCM URLs 2018-02-25 21:35:49 +00:00
tehdiplomat
56250bea63 Added token scripts to be used with Wurmcoil Engine and Tolsimir Wolfblood 
The actual changes to use them currently not committed.
 2018-02-25 15:36:16 -05:00
Sol
d4d376c8c6 Merge branch 'PlaneshiftPromos' into 'master' 
Fixing Planeshift set alter foils in boosters

See merge request core-developers/forge!202
 2018-02-25 20:19:19 +00:00
Blacksmith
0146357eed Remove test file 2018-02-25 18:13:04 +00:00
Blacksmith
9759264aec Test direct commit access for Blacksmith 2018-02-25 18:06:22 +00:00
Sol
c17465a2a7 Merge branch 'git-pom-update' into 'master' 
Update pom file to support git releases

See merge request core-developers/forge!258
 2018-02-25 17:52:34 +00:00
KrazyTheFox
dc3795d1cd Update pom file to support git releases 2018-02-25 12:45:02 -05:00
Sol
fdf2b26fdf Merge branch 'multiplayer' into 'master' 
Multiplayer

See merge request core-developers/forge!257
 2018-02-25 04:45:31 +00:00
Jamin W. Collins
eff0012ea1 add warning to server connect dialog 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-24 15:32:30 -07:00
Jamin W. Collins
d74186e93c update release notes 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-24 14:12:29 -07:00
Jamin Collins
fe108bb354 Merge branch 'multiplayerandroidfixes' into 'master' 
Fix to get multiplayer working on android - added more classes to the "keep"…

See merge request core-developers/forge!255
 2018-02-24 21:03:49 +00:00
Jamin W. Collins
9fb556f180 add Serialization to Cost objects 
Resolves forge/#160

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-24 14:02:09 -07:00
Michael Kamensky
f1db204e0d Merge branch 'challengerdecks3' into 'master' 
URGENT - Added metadata to new challenger decks to fix NPE

See merge request core-developers/forge!256
 2018-02-24 18:39:54 +00:00
Jamin W. Collins
fd35c8d862 add option to be alerted on receipt of priority 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-24 10:51:43 -07:00
maustin
4d134e5087 Merge remote-tracking branch 'origin/challengerdecks3' into challengerdecks3 
# Conflicts:
#	forge-gui/res/quest/precons/Hazoret Aggro.dck
#	forge-gui/res/quest/precons/Second Sun Control.dck
#	forge-gui/res/quest/precons/Vehicle Rush.dck
 2018-02-24 17:25:19 +00:00
austinio7116
1e3b4e34e5 Added metadata to new challenger decks to fix NPE 2018-02-24 17:24:53 +00:00
austinio7116
95a02bece7 Added metadata to new challenger decks to fix NPE 2018-02-24 17:22:32 +00:00
austinio7116
62ffb786b2 Fix to get multiplayer working on android - added more classes to the "keep" list in proguard.cfg. Lots more testing to do, but can start a game Android vs pc 2018-02-24 15:58:31 +00:00