Skip to content

Commit d20987b

Browse files
author
Nicolaas de Bruyn
committed
More for 03.17
1 parent 3a06349 commit d20987b

21 files changed

+54
-13
lines changed

Skulls/assets/Interface/darkness.png

133 KB
Loading
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Material My Material : Common/MatDefs/Misc/Unshaded.j3md {
2+
MaterialParameters {
3+
ColorMap : Flip Models/enemies/enemies.png
4+
AlphaDiscardThreshold : 0.5
5+
}
6+
AdditionalRenderState {
7+
}
8+
}
713 KB
Loading
679 KB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
#Wed Mar 18 14:11:11 CAT 2015
3+
ORIGINAL_PATH=Models/enemies/ghost.blend
286 KB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
#Wed Mar 18 14:12:35 CAT 2015
3+
ORIGINAL_PATH=Models/enemies/mummy.blend
224 KB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
#Wed Mar 18 14:12:50 CAT 2015
3+
ORIGINAL_PATH=Models/enemies/skeleton.blend
259 KB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
#Wed Mar 18 14:12:55 CAT 2015
3+
ORIGINAL_PATH=Models/enemies/zombie.blend
43.8 KB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
#Wed Mar 18 13:45:42 CAT 2015
3+
ORIGINAL_PATH=Models/static/dungeon_pixel.blend
61.2 KB
Loading

Skulls/nbproject/build-impl.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ is divided into following sections:
2020
2121
-->
2222
<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">
23-
<import file="assets-impl.xml"/>
24-
<import file="linuxlauncher-impl.xml"/>
25-
<import file="launch4j-impl.xml"/>
26-
<import file="mobile-impl.xml"/>
2723
<import file="macapp-impl.xml"/>
24+
<import file="launch4j-impl.xml"/>
25+
<import file="linuxlauncher-impl.xml"/>
26+
<import file="assets-impl.xml"/>
2827
<fail message="Please build using Ant 1.8.0 or higher.">
2928
<condition>
3029
<not>
@@ -1016,7 +1015,7 @@ is divided into following sections:
10161015
<!-- Empty placeholder for easier customization. -->
10171016
<!-- You can override this target in the ../build.xml file. -->
10181017
</target>
1019-
<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"/>
1018+
<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"/>
10201019
<!--
10211020
=================
10221021
EXECUTION SECTION

Skulls/nbproject/genfiles.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ build.xml.script.CRC32=79a29eb7
33
build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=0ccb49ba
7-
nbproject/build-impl.xml.script.CRC32=a0c37273
6+
nbproject/build-impl.xml.data.CRC32=e7b1b2bc
7+
nbproject/build-impl.xml.script.CRC32=f008f0be
88
nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--linuxlauncher-impl.xml v1.1-->
3+
<project name="linuxlauncher-impl" basedir="..">
4+
5+
<target name="-linux-launcher" depends="-test-linux-launcher-enabled" if="is.linux.launcher.enabled">
6+
<echo>Linux Launcher Creation</echo>
7+
<echo file="${application.title}.sh">#!/bin/sh
8+
java JVMARGS -jar ${application.title}.jar
9+
</echo>
10+
<replace file="${application.title}.sh" token="JVMARGS" value="${run.jvmargs}"/>
11+
<zip destfile="${dist.dir}/${application.title}-Linux.zip">
12+
<zipfileset file="${application.title}.sh" filemode="755" prefix=""/>
13+
<zipfileset file="${dist.jar}" prefix=""/>
14+
<zipfileset dir="${dist.dir}/lib" prefix="lib/"/>
15+
</zip>
16+
<delete file="${application.title}.sh"/>
17+
</target>
18+
<target name="-test-linux-launcher-enabled">
19+
<condition property="is.linux.launcher.enabled">
20+
<istrue value="${linux.launcher.enabled}"/>
21+
</condition>
22+
</target>
23+
</project>

Skulls/nbproject/private/private.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compile.on.save=false
1+
compile.on.save=true
22
do.depend=false
33
do.jar=true
44
javac.debug=true

Skulls/nbproject/private/retriever/catalog.xml

Whitespace-only changes.

Skulls/nbproject/project.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ annotation.processing.enabled=true
22
annotation.processing.enabled.in.editor=false
33
annotation.processing.processors.list=
44
annotation.processing.run.all.processors=true
5-
ant.customtasks.libs=android-base,launch4j
5+
ant.customtasks.libs=launch4j
66
application.title=Skulls
77
application.vendor=jMonkeyEngine
88
assets.jar.name=assets.jar
@@ -75,7 +75,6 @@ main.class=com.jme3.skulls.MainApplication
7575
meta.inf.dir=${src.dir}/META-INF
7676
manifest.file=MANIFEST.MF
7777
mkdist.disabled=false
78-
mobile.android.enabled=true
7978
mobile.android.package=com.jme3.skulls
8079
mobile.android.target=android-19
8180
platform.active=default_platform

Skulls/nbproject/project.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<extension file="linuxlauncher-impl.xml" id="linuxlauncher">
1616
<dependency dependsOn="-linux-launcher" target="jar"/>
1717
</extension>
18-
<extension file="mobile-impl.xml" id="mobile">
19-
<dependency dependsOn="-mobile-deployment" target="jar"/>
20-
</extension>
2118
</buildExtensions>
2219
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
2320
<name>Skulls</name>

0 commit comments

Comments
 (0)