Skip to content

Commit

Permalink
Finish 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JavaSaBr committed Oct 2, 2017
2 parents 1602b14 + 5cbf5a8 commit 9ef26ca
Show file tree
Hide file tree
Showing 401 changed files with 10,717 additions and 7,448 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# jMonkeyEngine 3 SpaceShift Editor 1.1.0 #
# jMonkeyEngine 3 SpaceShift Editor 1.2.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)
Expand All @@ -11,6 +11,14 @@

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

## ver. 1.2.0 ##
* -Fixed the far view plane distance of the editor camera.
* -Updated tonegod.emitter library.
* -Added the new plugin Shader Node Tools.
* -Updated jME libraries.
* -Updated Tree Generator plugin.
* -Fixed some bugs.

## ver. 1.1.0 ##
* -Added the new plugin to generate trees.
* -Updated the Material Editor.
Expand Down
2 changes: 1 addition & 1 deletion app.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0
6 changes: 3 additions & 3 deletions build-native.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<project name="jME SpaceShift Editor" default="do-deploy" basedir="native-build"
xmlns:fx="javafx:com.sun.javafx.tools.ant">

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

<condition property="gradle.executable" value="${env.GRADLE_HOME}/bin/gradle.bat"
else="${env.GRADLE_HOME}/bin/gradle">
<condition property="gradle.executable" value="${basedir}/../gradlew.bat"
else="${basedir}/../gradlew">
<os family="windows"/>
</condition>

Expand Down
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply plugin: 'idea'
apply plugin: 'org.junit.platform.gradle.plugin'

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

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down Expand Up @@ -41,7 +41,6 @@ junitPlatform {
logManager 'org.apache.logging.log4j.jul.LogManager'
}


repositories {
mavenCentral()
jcenter()
Expand All @@ -59,7 +58,7 @@ dependencies {
compile 'org.controlsfx:controlsfx:8.40.13'

compile 'com.github.JavaSaBr:RlibFX:4.1.3'
compile 'com.github.JavaSaBr:RLib:6.3.6'
compile 'com.github.JavaSaBr:RLib:6.4.1'
compile 'com.github.JavaSaBr:JME3-JFX:1.6.1'

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
Expand Down Expand Up @@ -126,10 +125,10 @@ dependencies {
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'

// extensions
compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.6.0') {
compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.7.2') {
exclude group: 'org.jmonkeyengine'
}
compile ('com.github.JavaSaBr:tonegodemitter:2.3.4') {
compile ('com.github.JavaSaBr:tonegodemitter:2.4.0') {
exclude group: 'org.jmonkeyengine'
}

Expand Down Expand Up @@ -174,7 +173,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
}

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

artifacts {
Expand Down
Binary file not shown.
Binary file not shown.
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.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Thu Aug 10 08:06:48 MSK 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
Loading

0 comments on commit 9ef26ca

Please sign in to comment.