external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,453 Commits 32 Branches 187 Tags
0637c69bfe901babf30a015d11386699407b602b
Commit Graph

2232 Commits

Author SHA1 Message Date
Hanmac
31113133fc Oracle: update base code for their effects 2018-05-26 13:38:55 +02:00
Michael Kamensky
ed034bdec7 Merge branch 'performancemode' into 'master' 
Bandaid temporary performance preference to disable additional static abilities…

See merge request core-developers/forge!558
 2018-05-16 04:43:30 +00:00
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
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
5d43733add - Preparing Forge for Android publish 1.6.10.001 [incremental]. 2018-05-08 06:51:43 +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
Agetian
773358e538 - More NPE prevention in mobile Forge. 2018-05-07 23:18:46 +03:00
Agetian
697be27d4f - NPE prevention in LobbyScreen on mobile Forge when trying to choose a variant without having a constructed deck. 2018-05-07 23:07:47 +03: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
Agetian
01017efab6 - Dev Mode: added a way to remove counters from permanent. 2018-04-29 18:51:46 +03:00
Meerkov
9aac61e350 Undo XStream update, to support Android. 
It's not clear why 1.4.10 was not working for Android, but it wasn't my goal to update specifically so rolling back that change.


(cherry picked from commit 43642e85a8d05d02d4c65c87eed8e51d5c1a3a56)
 2018-04-28 08:42:48 +00: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
Agetian
e8d0fe07f4 - Preparing Forge for Android publish 1.6.9.005 [hotfix]. 2018-04-26 07:36:04 +03:00
Agetian
83665d0992 - Preparing Forge for Android publish 1.6.9.004 [AI hotfix]. 2018-04-25 07:17:39 +03:00
Agetian
a8277f5e13 - Preparing Forge for Android publish 1.6.9.003 [hotfix]. 2018-04-23 09:56:48 +03:00
austinio7116
e5db8ff8b3 Merge branch 'assorted-fixes' into 'master' 
Adding Rat Colony to card limit exceptions, fixing Goblin Chainwhirler.

Closes #527

See merge request core-developers/forge!470
 2018-04-23 06:36:40 +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
Agetian
ec266d6d9b - Preparing Forge for Android publish 1.6.9.002 [bugfixes]. 2018-04-23 06:49:21 +03:00
Agetian
30f8e8b16c - Preparing Forge for Android publish 1.6.9.001 [incremental]. 2018-04-21 06:36:46 +03: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
eb0724954b Merge branch 'brawlfixes' into historicformats 2018-04-19 18:21:36 +01:00
maustin
0168a20e7e Use later reprints in card-themed generated decks 2018-04-19 18:21:00 +01: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
0aea9ce153 Fix imports. 
Woops, commited too fast. Adding imports for MyRandom.
 2018-04-17 16:28:27 -07:00
Meerkov
4925db1b66 Remove Math.Random in favor of MyRandom. 
This is a continuation of the RNG updates. Math.Random is an insecure PRNG which is actually different than java.util.Random as well.
 2018-04-17 16:25:43 -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
Meerkov
130fc4ee18 Complete update to Java 8. 2018-04-16 20:38:20 -07:00
austinio7116
41e1997d73 Deactivate the choose format button if a quest world is selected 2018-04-16 22:00:55 +01:00
austinio7116
e359042766 New quest screen format selector now updates button text when a format is selected 2018-04-16 20:33:38 +01:00
austinio7116
ad6f26f6a9 Separated the historic format selector UI for android from the filter class so that it can also be used to select any format for quest pools 2018-04-16 20:17:19 +01:00
austinio7116
e1ed1ae69c Grouped formats by historic subtype as well as type in android scroll selector 2018-04-15 19:53:30 +01:00
maustin
b4526df691 Merge branch 'master' into historicformats 2018-04-10 14:07:06 +01:00
Agetian
afe040d0b6 - Minor cleanup. 2018-04-10 10:58:51 +03:00
Agetian
9a43c1b3ae - Ensure that players have equal player panel heights in a two-player game in Landscape mode 2018-04-10 10:56:33 +03:00
Agetian
7e58e204ed - Code style cleanup/unification in multiplayer Forge for Android. 2018-04-10 10:49:24 +03: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
maustin
ba793ac44e Renamed "Sanctioned format" to "Defined format" in quest starting pool options and enabled selecting from historic and other non-sanctioned formats in android quests 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
e01eab131f Attempt to add other formats to format filter submenu on android 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