External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2016-02-27 09:28:01 +01:00
commit 56294eac50
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/assembly/distribution.xml
View file

@ -4,6 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd"> http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<id>mage-client</id>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>

2
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -169,8 +169,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (deck != null) { if (deck != null) {
this.cardSelector.loadSideboard(new ArrayList<>(deck.getSideboard()), this.bigCard); this.cardSelector.loadSideboard(new ArrayList<>(deck.getSideboard()), this.bigCard);
} }
// TODO: take from preferences
this.cardSelector.switchToGrid();
this.btnExit.setVisible(false); this.btnExit.setVisible(false);
this.btnImport.setVisible(false); this.btnImport.setVisible(false);

1
Mage.Server/src/main/assembly/distribution.xml
View file

@ -4,6 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd"> http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<id>mage-server</id>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>

4
Utils/gen-simple-cards-by-set.pl
View file

@ -46,13 +46,13 @@ if(!exists $knownSets{$setName}) {
my $packageName = $knownSets{$setName}; my $packageName = $knownSets{$setName};
$setName =~ s/"/\\"/g; $setName =~ s/"/\\"/g;
system("gen-existing-cards-by-set.pl \"$setName\""); system("./gen-existing-cards-by-set.pl \"$setName\"");
# Generate missing simple cards # Generate missing simple cards
print "Simple cards generated: \n"; print "Simple cards generated: \n";
foreach my $cardName (@setCards) { foreach my $cardName (@setCards) {
my $fileName = "../Mage.Sets/src/mage/sets/" . $packageName . "/" . toCamelCase(${$cardName}[0]) . ".java"; my $fileName = "../Mage.Sets/src/mage/sets/" . $packageName . "/" . toCamelCase(${$cardName}[0]) . ".java";
if(!-e $fileName) { if(!-e $fileName) {
system("gen-card.pl \"${$cardName}[0]\" true"); system("./gen-card.pl \"${$cardName}[0]\" true");
} }
} }