Skip to content

Commit

Permalink
More for 03.17
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolaas de Bruyn committed Mar 19, 2015
1 parent 3a06349 commit d20987b
Show file tree
Hide file tree
Showing 21 changed files with 54 additions and 13 deletions.
Binary file added Skulls/assets/Interface/darkness.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Skulls/assets/Models/enemies/enemies.j3m
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Material My Material : Common/MatDefs/Misc/Unshaded.j3md {
MaterialParameters {
ColorMap : Flip Models/enemies/enemies.png
AlphaDiscardThreshold : 0.5
}
AdditionalRenderState {
}
}
Binary file added Skulls/assets/Models/enemies/enemies.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Skulls/assets/Models/enemies/ghost.j3o
Binary file not shown.
3 changes: 3 additions & 0 deletions Skulls/assets/Models/enemies/ghost.j3odata
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
#Wed Mar 18 14:11:11 CAT 2015
ORIGINAL_PATH=Models/enemies/ghost.blend
Binary file added Skulls/assets/Models/enemies/mummy.j3o
Binary file not shown.
3 changes: 3 additions & 0 deletions Skulls/assets/Models/enemies/mummy.j3odata
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
#Wed Mar 18 14:12:35 CAT 2015
ORIGINAL_PATH=Models/enemies/mummy.blend
Binary file added Skulls/assets/Models/enemies/skeleton.j3o
Binary file not shown.
3 changes: 3 additions & 0 deletions Skulls/assets/Models/enemies/skeleton.j3odata
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
#Wed Mar 18 14:12:50 CAT 2015
ORIGINAL_PATH=Models/enemies/skeleton.blend
Binary file added Skulls/assets/Models/enemies/zombie.j3o
Binary file not shown.
3 changes: 3 additions & 0 deletions Skulls/assets/Models/enemies/zombie.j3odata
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
#Wed Mar 18 14:12:55 CAT 2015
ORIGINAL_PATH=Models/enemies/zombie.blend
Binary file added Skulls/assets/Models/static/dungeon_pixel.j3o
Binary file not shown.
3 changes: 3 additions & 0 deletions Skulls/assets/Models/static/dungeon_pixel.j3odata
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
#Wed Mar 18 13:45:42 CAT 2015
ORIGINAL_PATH=Models/static/dungeon_pixel.blend
Binary file added Skulls/assets/Models/static/dungeon_pixel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions Skulls/nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ is divided into following sections:
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Skulls-impl">
<import file="assets-impl.xml"/>
<import file="linuxlauncher-impl.xml"/>
<import file="launch4j-impl.xml"/>
<import file="mobile-impl.xml"/>
<import file="macapp-impl.xml"/>
<import file="launch4j-impl.xml"/>
<import file="linuxlauncher-impl.xml"/>
<import file="assets-impl.xml"/>
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
Expand Down Expand Up @@ -1016,7 +1015,7 @@ is divided into following sections:
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,-mac-app,-mobile-deployment,-launch4j-exe,-linux-launcher" description="Build JAR." name="jar"/>
<target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,-linux-launcher,-launch4j-exe,-mac-app" description="Build JAR." name="jar"/>
<!--
=================
EXECUTION SECTION
Expand Down
4 changes: 2 additions & 2 deletions Skulls/nbproject/genfiles.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ build.xml.script.CRC32=79a29eb7
build.xml.stylesheet.CRC32=[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=0ccb49ba
nbproject/build-impl.xml.script.CRC32=a0c37273
nbproject/build-impl.xml.data.CRC32=e7b1b2bc
nbproject/build-impl.xml.script.CRC32=f008f0be
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
23 changes: 23 additions & 0 deletions Skulls/nbproject/linuxlauncher-impl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--linuxlauncher-impl.xml v1.1-->
<project name="linuxlauncher-impl" basedir="..">

<target name="-linux-launcher" depends="-test-linux-launcher-enabled" if="is.linux.launcher.enabled">
<echo>Linux Launcher Creation</echo>
<echo file="${application.title}.sh">#!/bin/sh
java JVMARGS -jar ${application.title}.jar
</echo>
<replace file="${application.title}.sh" token="JVMARGS" value="${run.jvmargs}"/>
<zip destfile="${dist.dir}/${application.title}-Linux.zip">
<zipfileset file="${application.title}.sh" filemode="755" prefix=""/>
<zipfileset file="${dist.jar}" prefix=""/>
<zipfileset dir="${dist.dir}/lib" prefix="lib/"/>
</zip>
<delete file="${application.title}.sh"/>
</target>
<target name="-test-linux-launcher-enabled">
<condition property="is.linux.launcher.enabled">
<istrue value="${linux.launcher.enabled}"/>
</condition>
</target>
</project>
2 changes: 1 addition & 1 deletion Skulls/nbproject/private/private.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
compile.on.save=false
compile.on.save=true
do.depend=false
do.jar=true
javac.debug=true
Expand Down
Empty file.
3 changes: 1 addition & 2 deletions Skulls/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
ant.customtasks.libs=android-base,launch4j
ant.customtasks.libs=launch4j
application.title=Skulls
application.vendor=jMonkeyEngine
assets.jar.name=assets.jar
Expand Down Expand Up @@ -75,7 +75,6 @@ main.class=com.jme3.skulls.MainApplication
meta.inf.dir=${src.dir}/META-INF
manifest.file=MANIFEST.MF
mkdist.disabled=false
mobile.android.enabled=true
mobile.android.package=com.jme3.skulls
mobile.android.target=android-19
platform.active=default_platform
Expand Down
3 changes: 0 additions & 3 deletions Skulls/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<extension file="linuxlauncher-impl.xml" id="linuxlauncher">
<dependency dependsOn="-linux-launcher" target="jar"/>
</extension>
<extension file="mobile-impl.xml" id="mobile">
<dependency dependsOn="-mobile-deployment" target="jar"/>
</extension>
</buildExtensions>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Skulls</name>
Expand Down

0 comments on commit d20987b

Please sign in to comment.