external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,300 Commits 32 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

1281 Commits

Author SHA1 Message Date
Sol
bbd8c0c752 Merge branch 'historicformats' into 'master' 
Formatting and preparation of historicformats

See merge request core-developers/forge!342
 2018-05-16 01:40:34 +00:00
austinio7116
e51fdd8c56 Bandaid temporary performance preference to disable additional static abilities checks when checking mayplay to support better performance on Mobile and for multiplayer 
(cherry picked from commit 3e6a2e9)
 2018-05-15 20:51:09 +01:00
austinio7116
8c695fd4d9 Added configurable option to enable/disable historic formats 2018-05-15 19:46:28 +01:00
austinio7116
c003ddeeac Code cleanup before merge 2018-05-12 22:45:49 +01:00
austinio7116
e8c6f29577 Refactored GA runners into GA classes, configured tournaments for GA, working Ixalan plane 
(cherry picked from commit d7d3ea3)
 2018-05-12 06:56:12 +01:00
austinio7116
465c450b6b Working GA code for planes or standard 
(cherry picked from commit cfd2f66)
 2018-05-12 06:54:14 +01:00
austinio7116
0d4088ff7a Added abstract GA code 
(cherry picked from commit c534c14)
 2018-05-12 06:36:56 +01:00
austinio7116
7e3b9ccc2d Second simple attempt at planar conquest generation code and example 
(cherry picked from commit 234db8d)
 2018-05-12 06:36:08 +01:00
austinio7116
d96d1f2ee9 First simple attempt at planar conquest generation code and example 
(cherry picked from commit b11aa9b)
 2018-05-12 06:34:55 +01:00
austinio7116
43e4d8a914 Moved Archetype LDA loading from generic collections to separate classes to prepare for Android compatibility. Added modern genetic algorithm class. 
(cherry picked from commit d8a4ad7)
 2018-05-12 06:31:21 +01:00
austinio7116
3f8651f586 Fully working LDA based deck generation for Standard and Modern 
(cherry picked from commit 892ae23)
 2018-05-12 06:30:37 +01:00
austinio7116
a25592ebfd Fixed some LDA zero indexed array issues so now it completes. 
(cherry picked from commit 5ab7704)
 2018-05-12 06:29:55 +01:00
austinio7116
4a131b63d8 Initial running LDA implementation 
(cherry picked from commit 03c1b3e)
 2018-05-12 06:29:38 +01:00
Hans Mackowiak
fb1c545a98 Merge branch 'hasKeywordEnum' into 'master' 
Card: add Keyword methods that work with Keyword Enum

See merge request core-developers/forge!535
 2018-05-11 11:34:15 +00:00
Hanmac
058aabb666 KeywordEnum: replace more String Keywords checks with Enums 2018-05-10 11:53:41 +02:00
Agetian
816660f80d - To avoid possibly unexpected behavior, check to ensure that the infinite pool already contains all the items requested. 2018-05-09 18:27:00 +03:00
Agetian
1e1a16a4f4 - Do not go through the process of adding items to a card pool if it's already infinite (fixes slowdown when removing a card from the deck in the Constructed deck editor) 2018-05-09 18:23:25 +03:00
Blacksmith
f0ce6277ac [maven-release-plugin] prepare for next development iteration 2018-05-08 00:48:11 +00:00
Blacksmith
95bd867cee [maven-release-plugin] prepare release forge-1.6.10 2018-05-08 00:48:08 +00:00
Sol
1a3308017a Revert "Merge branch 'temp_dev6' into 'master'" 
This reverts merge request !499
 2018-05-01 01:11:29 +00:00
Sol
64e8dd35c2 Merge branch 'temp_dev6' into 'master' 
Allow for Seeded RNG in simulation games!

See merge request core-developers/forge!499
 2018-05-01 01:01:30 +00:00
Sol
1acb0e9e95 Merge branch 'dev-mode' into 'master' 
Dev Mode: added a way to remove counters from permanent.

See merge request core-developers/forge!501
 2018-04-30 00:17:43 +00:00
Michael Kamensky
f72c5aa59c Merge branch 'temp_dev4' into 'master' 
Android updates

See merge request core-developers/forge!491
 2018-04-29 20:16:28 +00:00
Agetian
01017efab6 - Dev Mode: added a way to remove counters from permanent. 2018-04-29 18:51:46 +03:00
Meerkov
792fdad4be Tiny Update: Removes dead code. 
Just removes some code that does nothing.


(cherry picked from commit b462c41dff99f0173b7e228f826ca0bf0d8103cb)
 2018-04-28 17:01:42 +00:00
Meerkov
bd097888a3 Allows running tests using a seeded RNG. 
Running the same game twice now works! There may be issues I haven't found with certain AI behaviors around mechanics I didn't use in my tests.


(cherry picked from commit 194b47c1ad61c8f1efb6bce8af2bb10d1fa8f6c3)
 2018-04-28 17:00:54 +00:00
Agetian
8c50ddef2f - Fixing a test with the new mana ability text in mind. 2018-04-28 13:21:42 +03:00
Meerkov
8f68266585 Update Guava to 24.1 
This updates Guava 16 to 24.1. Currently 16 is a 4 year old version, so there are a lot of bug fixes. The Android .pom has 24.1-android instead of 24.1-jre, for compatability reasons.

I did not test the android build, however the desktop build works.

Also resovles two warnings and drops a "TODO" on a comment that was highlighting a possible bug but wasn't easily marked to discover later.


(cherry picked from commit be578af80467c1850d9dcec0af6fe18840fff7e9)
 2018-04-28 08:42:22 +00:00
Agetian
bc701fecb3 - Making transform cards work as plane/region art in Planar Conquest (mobile Forge). 
- Currently will show the cards untransformed on the plane selection screen and transformed on the multiverse/region screen.
 2018-04-27 10:46:48 +03:00
austinio7116
acef14aadc Merge branch 'fix_outcome_memory_leak' into 'master' 
Memory leak within a match

See merge request core-developers/forge!458
 2018-04-25 22:35:02 +00:00
Agetian
75d6ea6537 - Unifying the list for card exceptions in DeckFormat, as suggested and coded by Austinio. 2018-04-23 09:21:55 +03:00
Agetian
1522baa97d - Adding Rat Colony to card limit exceptions in several places. 2018-04-23 07:31:39 +03:00
Chris H
ade17c5eaf Fix Memory leak within a match 2018-04-22 15:18:22 -04:00
Blacksmith
0d375ecd93 [maven-release-plugin] prepare for next development iteration 2018-04-21 01:18:35 +00:00
Blacksmith
970f684345 [maven-release-plugin] prepare release forge-1.6.9 2018-04-21 01:18:32 +00:00
maustin
53a03b94d4 Merge branch 'master' into historicformats 
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
 2018-04-18 23:00:56 +01:00
Meerkov
6efd631fd8 Declares a serialVersionUID. 
Lots of classes here are serializable, but warn due to missing UID. Serializables are supposed to have a UID for version compatability. Fixes a bunch of compiler warnings.

Also adds in "default:" branch to a few switches which were warning due to missing cases.
 2018-04-17 16:48:18 -07:00
Meerkov
db3e4d9e83 Fixes ~50 compiler warnings for unused libraries. 2018-04-17 16:06:00 -07:00
maustin
f2ae137947 Merge branch 'master' into historicformats 
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
 2018-04-17 21:29:03 +01:00
Michael Kamensky
f51b80739a Merge branch 'master' into 'master' 
Re-merge request for RNG Changes etc

See merge request core-developers/forge!422
 2018-04-17 15:35:05 +00:00
Hanmac
79c9c914e2 LandAbility: do extra ability class, so it can use mayPlay 2018-04-17 08:07:11 +02:00
Meerkov
130fc4ee18 Complete update to Java 8. 2018-04-16 20:38:20 -07:00
austinio7116
68ad165fb1 Updated tooltip on filter to show additional cards in format 
Updated restricted and banned lists from new historic formats to use semicolons instead of commas as required
 2018-04-10 09:26:40 +01:00
austinio7116
a5d964a334 Updated formats to include subtype enum and made a first batch attempt to set the value 
Now sorting formats by type, subtype then name
Added new "additional" property to gameformats to allow additional non printed but legal cards to be included e.g. dual lands in extended 1999
 2018-04-10 07:28:31 +01:00
austinio7116
00a2a1ef4d Enabled historic/casual formats as starting pools for quest mode on desktop 2018-04-09 23:35:08 +01:00
austinio7116
49dd3c0659 Modified format filter selection options to support large numbers of historic formats in the menu - uses a similar UI to the set selector 2018-04-09 23:35:08 +01:00
austinio7116
def7ba5faf Updates to UI to separate out format filters 2018-04-09 23:35:08 +01:00
austinio7116
0636695052 Just use sanctioned formats where relevant, exclude historic formats where needed - may add these back later via new UI elements 2018-04-09 23:35:08 +01:00
austinio7116
a73667610b Added MoJhoSto variant 2018-04-02 07:19:09 +01:00
Jamin W. Collins
35d0e73901 handle null response from getPhase() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-30 08:20:34 -06:00