Commit 12ec523
committed
Squashed commit of the following:
commit 9999e3a
Merge: 8eb76f9 2159785
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Sun May 3 15:46:16 2026 +0100
Merge branch 'Ogre-Deprecation-J3o-Format' of https://github.com/NwosuTy/jmonkeyengine into Ogre-Deprecation-J3o-Format
commit 8eb76f9
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Sun May 3 15:46:08 2026 +0100
Removed Suggestion of USD and FBX support, Restored Comments
commit 2159785
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 15:29:07 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/package-info.java
commit 3177b2b
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 15:25:28 2026 +0200
Apply suggestion from @riccardobl
commit 3c80146
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Sun May 3 14:01:19 2026 +0100
Final Review Check Fix
Removed Fake Documentation URL Link
Switch TestOgreConvert mesh loaded back to ogreModel
Fixed 3 Scenes still using Deprecated Ogre Models
commit 8cec4a9
Merge: 7168f80 455f39f
Author: Dev_Conceited <94308549+NwosuTy@users.noreply.github.com>
Date: Sun May 3 12:52:31 2026 +0100
Merge branch 'jMonkeyEngine:master' into Ogre-Deprecation-J3o-Format
commit 7168f80
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:50:59 2026 +0200
Update jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java
commit bacb776
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:50:47 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMeshLoader.java
commit d3d4049
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:50:37 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SkeletonLoader.java
commit ba39bfe
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:50:27 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneLoader.java
commit cbf9d70
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:50:16 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMaterialLoader.java
commit 569c80e
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:50:07 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java
commit 512cd60
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:49:57 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java
commit a76c942
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:49:47 2026 +0200
Update jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java
commit 78de18c
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:49:38 2026 +0200
Update jme3-examples/src/main/java/jme3test/water/TestSceneWater.java
commit 4f7fc16
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:49:27 2026 +0200
Update jme3-examples/src/main/java/jme3test/renderer/TestAspectFov.java
commit 0de74b8
Author: Riccardo Balbo <os@rblb.it>
Date: Sun May 3 10:49:14 2026 +0200
Update jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java
commit f50a2e9
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Fri May 1 22:53:35 2026 +0100
Fixed Broken Scene Issue regarding Main.j3o
commit 8e07ad9
Merge: a48d1c5 44a0985
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Fri May 1 18:58:48 2026 +0100
Merge branch 'Ogre-Deprecation-J3o-Format' of https://github.com/NwosuTy/jmonkeyengine into Ogre-Deprecation-J3o-Format
commit a48d1c5
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Fri May 1 18:58:44 2026 +0100
Fixed Documentation Typos
commit 44a0985
Author: Riccardo Balbo <os@rblb.it>
Date: Fri May 1 18:38:32 2026 +0200
Update jme3-examples/src/main/java/jme3test/helloworld/HelloCollision.java
commit 359e226
Merge: f9f7367 918b984
Author: Riccardo Balbo <os@rblb.it>
Date: Fri May 1 17:38:31 2026 +0200
Merge remote-tracking branch 'upstream/master' into Ogre-Deprecation-J3o-Format
commit f9f7367
Merge: 01853cf 115a825
Author: Riccardo Balbo <os@rblb.it>
Date: Fri May 1 17:24:40 2026 +0200
Merge remote-tracking branch 'upstream/master' into Ogre-Deprecation-J3o-Format
commit 01853cf
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Thu Apr 30 13:39:52 2026 +0100
Restored J3o files and Deleted unused ogre files
Could Have Sworn i committed these files, restored them to fix null errors and failing screenshot tests
commit e9b04fc
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Thu Apr 30 12:52:46 2026 +0100
Failed Test Fix
Restored Elephant.Skeleton.xml file for the Core tests, needed a mes.xml file with an anim composer
Modified screenshottests files to load the .j3o files rather than the previously changed ogre files
commit 880ee10
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Wed Apr 29 18:12:07 2026 +0100
Typo Fix
commit c41f67f
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Wed Apr 29 18:08:36 2026 +0100
Test Gimpact and Removal of List of Ogre Files Text
commit 626b36a
Author: Dev_Conceited <tthompson3012@gmail.com>
Date: Wed Apr 29 18:05:06 2026 +0100
Deprecated Ogre Loaders
Marked Ogre Loaders with Deprecated Tag
Converted all Ogre files except where neccessary to .J3o file and modified where used in examples to load .j3o file itself, also deleted unused Ogre files1 parent 455f39f commit 12ec523
80 files changed
Lines changed: 133 additions & 63 deletions
File tree
- jme3-examples/src/main/java/jme3test
- animation
- bullet
- shape
- collision
- effect
- export
- helloworld
- light
- material
- model
- anim
- network
- post
- scene
- stress
- tools
- water
- jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre
- jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post
- jme3-testdata/src/main/resources
- Models
- Elephant
- Ferrari
- HoverTank
- MonkeyHead
- Ninja
- Oto
- Sign Post
- Sinbad
- SpaceCraft
- Teapot
- Terrain
- Tree
- WaterTest
- Scenes
- DotScene
- ManyLights
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
221 | 221 | | |
222 | 222 | | |
223 | 223 | | |
224 | | - | |
| 224 | + | |
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
173 | | - | |
| 173 | + | |
174 | 174 | | |
175 | 175 | | |
176 | 176 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
| 124 | + | |
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
141 | | - | |
| 141 | + | |
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| |||
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
167 | | - | |
| 167 | + | |
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
112 | | - | |
| 112 | + | |
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
160 | 160 | | |
161 | 161 | | |
162 | 162 | | |
163 | | - | |
164 | | - | |
| 163 | + | |
| 164 | + | |
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
294 | 294 | | |
295 | 295 | | |
296 | 296 | | |
297 | | - | |
| 297 | + | |
298 | 298 | | |
299 | 299 | | |
300 | 300 | | |
| |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
265 | | - | |
| 265 | + | |
266 | 266 | | |
267 | 267 | | |
268 | 268 | | |
269 | | - | |
| 269 | + | |
270 | 270 | | |
271 | 271 | | |
272 | 272 | | |
273 | | - | |
| 273 | + | |
274 | 274 | | |
275 | 275 | | |
276 | 276 | | |
277 | | - | |
| 277 | + | |
278 | 278 | | |
279 | 279 | | |
280 | 280 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
122 | | - | |
| 122 | + | |
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| |||
0 commit comments