Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
28f509d
Update GLImageFormats.java
joliver82 May 17, 2018
71fcaa9
Merge remote-tracking branch 'upstream/master'
joliver82 May 23, 2018
4f8a2cc
Merge pull request #3 from jMonkeyEngine/master
joliver82 Nov 14, 2018
05db003
Merge pull request #4 from jMonkeyEngine/master
joliver82 Jun 1, 2019
18b431f
Modified JmeBatchRenderBackend to clear the inner buffer of the image…
Nov 19, 2019
38e330b
Merge pull request #5 from jMonkeyEngine/master
joliver82 Nov 20, 2019
f9282c1
First impl of testcasefor multiple atlases issue. Still missing to ad…
joliver82 Dec 19, 2019
9d8cbfa
Merge pull request #7 from jMonkeyEngine/master
joliver82 Mar 9, 2020
2a6ca82
Merge branch 'nifty-batch-fix' into master
joliver82 Mar 9, 2020
0569a0a
Merge remote-tracking branch 'upstream/master'
Jan 25, 2021
8a90e91
Manual merge pending stuff from jme3 base
Jan 25, 2021
1092b80
Manual merge
Jan 25, 2021
066ba48
Merge pull request #9 from jMonkeyEngine/master
joliver82 Feb 15, 2021
6a4b4d2
Merge pull request #10 from jMonkeyEngine/master
joliver82 Mar 16, 2021
2800a92
Merge branch 'jMonkeyEngine:master' into master
joliver82 Oct 7, 2024
62f5398
Merge branch 'jMonkeyEngine:master' into master
joliver82 Apr 25, 2025
0248d8e
Merge branch 'jMonkeyEngine:master' into master
joliver82 Jul 9, 2025
d95b31a
Updated openalsoft based on NGEngine and set ANDROID_SUPPORT_FLEXIBLE…
Aug 30, 2025
605866a
Changed docker image to build android natives to ghcr.io/cirruslabs/a…
Sep 7, 2025
be712c7
Changed github actions to install cmake in docker image and properly …
Sep 9, 2025
5256c3c
Added change requested by @riccardobl linking with libc++ static
Oct 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge pull request #10 from jMonkeyEngine/master
Update fork
  • Loading branch information
joliver82 authored Mar 16, 2021
commit 6a4b4d2d4cd25490827b07a660949aef20ef8a32

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.