Skip to content

Commit

Permalink
Finish 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
JavaSaBr committed Nov 10, 2017
2 parents 9ef26ca + 15cfda9 commit bcd93d9
Show file tree
Hide file tree
Showing 100 changed files with 1,667 additions and 1,950 deletions.
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
# jMonkeyEngine 3 SpaceShift Editor 1.2.0 #
# jMonkeyBuilder 1.3.0 #
## License: Apache Version 2.0 ##

[![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

* [Wiki](https://bitbucket.org/JavaSabr/jme3-spaceshift-editor/wiki/Home)
* [Wiki](https://bitbucket.org/JavaSabr/jmonkeybuilder/wiki/Home)
* [Download](https://yadi.sk/d/UuKcJBNgqbV3a)
* [Gitter](https://gitter.im/jME3-SpaceShift-Editor/Lobby?source=orgpage)
* [Official jMonkey thread](https://hub.jmonkeyengine.org/t/jme3-spaceshift-editor/35179)
* [Official jMonkey thread](https://hub.jmonkeyengine.org/t/editor-jmonkeybuilder/35179)
* [Youtube channel](https://www.youtube.com/playlist?list=PLNdOH0eRoQMBkLPBvTIDn02UFhcTJWsh7)

## [Video about this editor](https://youtu.be/5nX8HXYdENU) ##

## ver. 1.3.0 ##
* -Updated static light probes.
* -Implemented the import model action.
* -Updated jME libraries.
* -Fixed some bugs.

## ver. 1.2.0 ##
* -Fixed the far view plane distance of the editor camera.
* -Updated tonegod.emitter library.
Expand Down
2 changes: 1 addition & 1 deletion app.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.3.0
25 changes: 11 additions & 14 deletions build-native.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="jME SpaceShift Editor" default="do-deploy" basedir="native-build"
<project name="jMonkeyBuilder" default="do-deploy" basedir="native-build"
xmlns:fx="javafx:com.sun.javafx.tools.ant">

<property name="editor.version" value="1.2.0"/>
<property name="editor.version" value="1.3.0"/>
<property environment="env"/>

<condition property="gradle.executable" value="${basedir}/../gradlew.bat"
Expand Down Expand Up @@ -149,7 +149,7 @@
</copy>

<fx:resources id="appRes" >
<fx:fileset dir="dist" includes="jme3-spaceshift-editor.jar"/>
<fx:fileset dir="dist" includes="jmonkeybuilder.jar"/>
<fx:fileset dir="dist" includes="licenses/*"/>
<fx:fileset dir="dist" includes="licenses/libraries-licenses/*"/>
<fx:fileset dir="dist" includes="libs/*"/>
Expand All @@ -159,21 +159,21 @@
</fx:resources>

<fx:application id="fxApplication"
name="jME3-SpaceShift-Editor"
name="jMonkeyBuilder"
mainClass="com.ss.editor.JFXApplication"
toolkit="fx"
version="${editor.version}"/>

<mkdir dir="build/classes/META-INF"/>

<fx:jar destfile="dist/jme3-spaceshift-editor.jar">
<fx:jar destfile="dist/jmonkeybuilder.jar">
<fx:application refid="fxApplication"/>
<fileset dir="build/classes"/>
<fx:resources refid="appRes"/>

<manifest>
<attribute name="Implementation-Vendor" value="spaceshift.ru"/>
<attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
<attribute name="Implementation-Vendor" value="bitbucket.org/JavaSabr"/>
<attribute name="Implementation-Title" value="jMonkeyBuilder"/>
<attribute name="Implementation-Version" value="${editor.version}"/>
</manifest>
</fx:jar>
Expand All @@ -188,22 +188,19 @@
includeDT="false"
offlineAllowed="true"
outdir="${basedir}/deploy"
outfile="jME3 SpaceShift Editor" nativeBundles="all"
outfile="jMonkeyBuilder" nativeBundles="all"
updatemode="background" verbose="true">

<fx:platform>
<fx:jvmarg value="-XX:+AggressiveOpts"/>
<fx:jvmarg value="-XX:+UseParallelGC"/>
<fx:jvmarg value="-XX:+UseTLAB"/>
<fx:jvmarg value="-Djavafx.animation.fullspeed=true"/>
<!--<fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=192.168.94.210:6005,suspend=y"/>-->
</fx:platform>

<preferences shortcut="true" menu="true" install="false"/>

<info category="graphics" copyright="spaceshift.ru"
description="Editor for jMonkeyEngine 3 by SpaceShift Team"
email="[email protected]" license="Freeware" title="jME3 SpaceShift Editor" vendor="spaceshift.ru"/>
<info category="graphics"
description="The 3D Editor for jMonkeyEngine 3.2 by JavaSaBr"
email="[email protected]" license="Freeware" title="jMonkeyBuilder" vendor="bitbucket.org/JavaSabr"/>

<application refId="fxApplication"/>
<resources refid="appRes"/>
Expand Down
17 changes: 8 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2'
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
}
}

Expand All @@ -13,7 +13,7 @@ apply plugin: 'idea'
apply plugin: 'org.junit.platform.gradle.plugin'

group = 'com.spaceshift'
version = '1.2.0'
version = '1.3.0'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand All @@ -24,11 +24,11 @@ compileTestJava {
options.compilerArgs += '-parameters'
}

ext.jmeVersion = "3.2_branch-SNAPSHOT"
ext.jmeVersion = "3.2-SNAPSHOT"
ext.jme3_xbuf_version = '0.9.1'
ext.lwjglVersion = "3.1.2"
ext.junitPlatformVersion = "1.0.0-M5"
ext.junitJupiterVersion = "5.0.0-M5"
ext.junitPlatformVersion = "1.0.0"
ext.junitJupiterVersion = "5.0.0"
ext.log4jVersion = '2.6.2'

junitPlatform {
Expand Down Expand Up @@ -125,7 +125,7 @@ dependencies {
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'

// extensions
compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.7.2') {
compile ('com.github.JavaSaBr:jmonkeybuilder-extension:1.9.3') {
exclude group: 'org.jmonkeyengine'
}
compile ('com.github.JavaSaBr:tonegodemitter:2.4.0') {
Expand Down Expand Up @@ -173,7 +173,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
}

task wrapper(type: Wrapper) {
gradleVersion = '4.2'
gradleVersion = '4.3'
}

artifacts {
Expand All @@ -187,11 +187,10 @@ defaultTasks 'clean', 'install'
install {
repositories.mavenInstaller {
pom.version = version
pom.artifactId = 'jme3-spaceshift-editor'
pom.artifactId = 'jmonkeybuilder'
pom.project {
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
8 changes: 4 additions & 4 deletions native-build/package/linux/control
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: jme3-spaceshift-editor
Package: jmonkeybuilder
Version: @version@
Section: graphics
Maintainer: Java Developer <[email protected]>
Priority: optional
Architecture: amd64
Provides: jme3-spaceshift-editor
Homepage: https://spaceshift.ru/
Description: Asset Editor for jMonkeyEngine 3.2 by SpaceShift Team
Provides: jmonkeybuilder
Homepage: https://bitbucket.org/JavaSabr/jmonkeybuilder
Description: 3D Editor for jMonkeyEngine 3.2 by JavaSaBr
Binary file removed native-build/package/linux/jME3-SpaceShift-Editor.png
Binary file not shown.
Binary file added native-build/package/linux/jMonkeyBuilder.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 not shown.
Binary file added native-build/package/macosx/jMonkeyBuilder.icns
Binary file not shown.
Binary file not shown.
Binary file added native-build/package/windows/jMonkeyBuilder.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = 'jme3-spaceshift-editor'
rootProject.name = 'jMonkeyBuilder'
Loading

0 comments on commit bcd93d9

Please sign in to comment.