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
66,835 Commits 33 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

2461 Commits

Author SHA1 Message Date
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
Jamin W. Collins
434573a5f8 reflow the PhaseIndicator switch statement 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-30 08:11:50 -06:00
Michael Kamensky
70eec78416 Merge branch 'BrawlFormat' into 'master' 
Brawl format

See merge request core-developers/forge!324
 2018-03-30 06:35:07 +00:00
Jamin W. Collins
e9773e57b7 make dual list dialog sizing dynamic, like single 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-29 09:26:53 -06:00
austinio7116
ed564b904f Random brawl deck generator working on Desktop 2018-03-28 23:41:57 +01:00
maustin
b9aef9b317 Merge branch 'master' into BrawlFormat 2018-03-28 06:44:42 +01:00
austinio7116
ba41a27981 Corrected name of brawl deck builder button 2018-03-27 23:53:27 +01:00
KrazyTheFox
2d23ce0084 Use double quotes to prevent users with apostrophes from causing issues. 
Pesky users.
 2018-03-26 21:40:31 -04:00
austinio7116
5b8342188c Fixed adding planeswalker commanders from pool in android brawl deck editor 2018-03-26 22:59:16 +01:00
austinio7116
756c272821 Fixed brawl deck editor and deckformat rules for brawl 2018-03-26 20:39:34 +01:00
austinio7116
364bf3724f Added UI elements required for Brawl variant 2018-03-26 06:57:15 +01:00
Alexei Svitkine
f436fa895b Support playing against Net Decks through the Test Deck function 
on mobile Forge.
 2018-03-21 00:04:14 -04:00
Blacksmith
9e786bbdff [maven-release-plugin] prepare for next development iteration 2018-03-20 01:14:26 +00:00
Blacksmith
6e6af1c6c4 [maven-release-plugin] prepare release forge-1.6.8 2018-03-20 01:14:23 +00:00
Jamin W. Collins
a564f49381 allow human players to make mass select, sometimes 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-14 20:32:25 -06:00
Hanmac
e9c02edfae DamageMap: use DamageMap for RepeatEach cards and similar 2018-03-14 07:15:02 +01:00
austinio7116
b0d5834396 Improved human/AI deck switching to remember and reload selected deck if still available 2018-03-11 20:22:36 +00:00
austinio7116
9ca0d7244e Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:25:43 +00:00
austinio7116
4dd52e6f82 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:20:03 +00:00
austinio7116
13ad244be1 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-10 20:23:34 +00:00
Jamin W. Collins
7615f333e1 disclose and enforce DEV_MODE state in network play 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-07 17:25:15 -07:00