diff --git a/build.gradle b/build.gradle index acea90b0..8a839b09 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,9 @@ project(":forge-gui-mobile") { dependencies { compile project(":forge-core") + compile project(":forge-game") compile project(":forge-ai") + compile project(":forge-gui") compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" } @@ -118,7 +120,9 @@ project(":forge-gui-mobile-desktop") { dependencies { compile project(":forge-core") + compile project(":forge-game") compile project(":forge-ai") + compile project(":forge-gui") compile project(":forge-gui-mobile") compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" diff --git a/forge-gui-mobile-desktop/.project b/forge-gui-mobile-desktop/.project index d5d6deba..f6c8e1a3 100644 --- a/forge-gui-mobile-desktop/.project +++ b/forge-gui-mobile-desktop/.project @@ -1,7 +1,7 @@ - mtg-forge-gradle-desktop - Project my-gdx-game-desktop created by Buildship. + forge-gui-mobile-desktop + @@ -20,17 +20,4 @@ org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature - - - assets - 2 - PARENT-1-PROJECT_LOC/core/assets - - - - - copy_PARENT - $%7BPARENT-2-PROJECT_LOC%7D/Projects/mtg-forge-ios - - diff --git a/forge-gui/build/resources/main/log4jConfig.config b/forge-gui/build/resources/main/log4jConfig.config new file mode 100644 index 00000000..cfd8e847 --- /dev/null +++ b/forge-gui/build/resources/main/log4jConfig.config @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=ALL, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n diff --git a/forge-gui/build/resources/main/proxy-template.ftl b/forge-gui/build/resources/main/proxy-template.ftl new file mode 100644 index 00000000..73e58c7f --- /dev/null +++ b/forge-gui/build/resources/main/proxy-template.ftl @@ -0,0 +1,31 @@ + + + + + + ${title} + + + +<#list urls as url> + + +
+ + + + +
+<#list cardList?keys as key> + ${cardList[key]} ${key}
+ +
+ + diff --git a/forge-gui/build/tmp/jar/MANIFEST.MF b/forge-gui/build/tmp/jar/MANIFEST.MF new file mode 100644 index 00000000..59499bce --- /dev/null +++ b/forge-gui/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +