Skip to content

Commit bcd93d9

Browse files
committed
Finish 1.3
2 parents 9ef26ca + 15cfda9 commit bcd93d9

File tree

100 files changed

+1667
-1950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1667
-1950
lines changed

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
# jMonkeyEngine 3 SpaceShift Editor 1.2.0 #
1+
# jMonkeyBuilder 1.3.0 #
22
## License: Apache Version 2.0 ##
33

44
[![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)
55

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

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

14+
## ver. 1.3.0 ##
15+
* -Updated static light probes.
16+
* -Implemented the import model action.
17+
* -Updated jME libraries.
18+
* -Fixed some bugs.
19+
1420
## ver. 1.2.0 ##
1521
* -Fixed the far view plane distance of the editor camera.
1622
* -Updated tonegod.emitter library.

app.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.0
1+
1.3.0

build-native.xml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="jME SpaceShift Editor" default="do-deploy" basedir="native-build"
2+
<project name="jMonkeyBuilder" default="do-deploy" basedir="native-build"
33
xmlns:fx="javafx:com.sun.javafx.tools.ant">
44

5-
<property name="editor.version" value="1.2.0"/>
5+
<property name="editor.version" value="1.3.0"/>
66
<property environment="env"/>
77

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

151151
<fx:resources id="appRes" >
152-
<fx:fileset dir="dist" includes="jme3-spaceshift-editor.jar"/>
152+
<fx:fileset dir="dist" includes="jmonkeybuilder.jar"/>
153153
<fx:fileset dir="dist" includes="licenses/*"/>
154154
<fx:fileset dir="dist" includes="licenses/libraries-licenses/*"/>
155155
<fx:fileset dir="dist" includes="libs/*"/>
@@ -159,21 +159,21 @@
159159
</fx:resources>
160160

161161
<fx:application id="fxApplication"
162-
name="jME3-SpaceShift-Editor"
162+
name="jMonkeyBuilder"
163163
mainClass="com.ss.editor.JFXApplication"
164164
toolkit="fx"
165165
version="${editor.version}"/>
166166

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

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

174174
<manifest>
175-
<attribute name="Implementation-Vendor" value="spaceshift.ru"/>
176-
<attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
175+
<attribute name="Implementation-Vendor" value="bitbucket.org/JavaSabr"/>
176+
<attribute name="Implementation-Title" value="jMonkeyBuilder"/>
177177
<attribute name="Implementation-Version" value="${editor.version}"/>
178178
</manifest>
179179
</fx:jar>
@@ -188,22 +188,19 @@
188188
includeDT="false"
189189
offlineAllowed="true"
190190
outdir="${basedir}/deploy"
191-
outfile="jME3 SpaceShift Editor" nativeBundles="all"
191+
outfile="jMonkeyBuilder" nativeBundles="all"
192192
updatemode="background" verbose="true">
193193

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

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

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

208205
<application refId="fxApplication"/>
209206
<resources refid="appRes"/>

build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2'
6+
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
77
}
88
}
99

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

1515
group = 'com.spaceshift'
16-
version = '1.2.0'
16+
version = '1.3.0'
1717

1818
sourceCompatibility = 1.8
1919
targetCompatibility = 1.8
@@ -24,11 +24,11 @@ compileTestJava {
2424
options.compilerArgs += '-parameters'
2525
}
2626

27-
ext.jmeVersion = "3.2_branch-SNAPSHOT"
27+
ext.jmeVersion = "3.2-SNAPSHOT"
2828
ext.jme3_xbuf_version = '0.9.1'
2929
ext.lwjglVersion = "3.1.2"
30-
ext.junitPlatformVersion = "1.0.0-M5"
31-
ext.junitJupiterVersion = "5.0.0-M5"
30+
ext.junitPlatformVersion = "1.0.0"
31+
ext.junitJupiterVersion = "5.0.0"
3232
ext.log4jVersion = '2.6.2'
3333

3434
junitPlatform {
@@ -125,7 +125,7 @@ dependencies {
125125
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
126126

127127
// extensions
128-
compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.7.2') {
128+
compile ('com.github.JavaSaBr:jmonkeybuilder-extension:1.9.3') {
129129
exclude group: 'org.jmonkeyengine'
130130
}
131131
compile ('com.github.JavaSaBr:tonegodemitter:2.4.0') {
@@ -173,7 +173,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
173173
}
174174

175175
task wrapper(type: Wrapper) {
176-
gradleVersion = '4.2'
176+
gradleVersion = '4.3'
177177
}
178178

179179
artifacts {
@@ -187,11 +187,10 @@ defaultTasks 'clean', 'install'
187187
install {
188188
repositories.mavenInstaller {
189189
pom.version = version
190-
pom.artifactId = 'jme3-spaceshift-editor'
190+
pom.artifactId = 'jmonkeybuilder'
191191
pom.project {
192192
licenses {
193193
license {
194-
name 'The Apache Software License, Version 2.0'
195194
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
196195
distribution 'repo'
197196
}
Binary file not shown.

0 commit comments

Comments
 (0)