sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,091 Commits 21 Branches 35 Tags
Commit Graph

6091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
empirephoenix
de1acb6a9b Merge pull request #576 from Fadorico/upstream 
Write/read the width and height of a quad
 2016-12-07 13:01:23 +01:00
empirephoenix
4663258904 Merge pull request #535 from papaspace/custom-blend-func 
Added RenderState.BlendMode.Custom
 2016-12-07 13:00:21 +01:00
empirephoenix
c5a24eb5f0 Merge pull request #559 from JavaSaBr/master-original 
added supporting window icons ans OffscreenSurface context for LWJGL3
 2016-12-05 11:25:45 +01:00
empirephoenix
2d6bfc3853 Merge pull request #571 from grizeldi/patch-1 
Added cleanup for ChaseCamera
 2016-12-05 11:25:13 +01:00
empirephoenix
0664e1d1b8 Merge pull request #567 from MeFisto94/FixDOMOutput 
Fixes #566 - XML Serialization handles empty buffers properly now.
 2016-12-05 11:23:42 +01:00
empirephoenix
63b0600b81 Merge pull request #572 from jMonkeyEngine/define_list_fix 
Fix DefineList regression
 2016-12-05 11:22:03 +01:00
Paul Speed
c7c239a56f Modified BitmapTextPage to always deep clone its mesh since otherwise 
BitmapText objects end up sharing them and that's bad.
 2016-12-04 20:35:57 -05:00
Paul Speed
4b78f099ca Broke out the Serializer's static initializer into a separate initialize() 
static method.  This allows servers to completely reset the Serializer's
registry when restarting the server in the same JVM instance.
 2016-12-04 16:28:03 -05:00
Paul Speed
f81c14de7c Another bitmap text clone fix. The text pages array (the list of the actual geometry of 
the bitmap text) wasn't really being cloned... only the elements were.  This meant that
that a cloned BitmapText object would continue to share the meshes from the original.
 2016-12-04 15:49:42 -05:00
Paul Speed
dbb1f14471 Another fix for BitmapText cloning where the regular clone() was 
completely bypassing the JME cloner framework... and making a bad
clone.
 2016-12-04 15:31:32 -05:00
Paul Speed
440096441d Fixed the cloned Letters to use the cloned StringBlock instead of the 
original reference.
 2016-12-04 14:24:45 -05:00
Paul Speed
157af24419 Added a test for cloning BitmapText. 2016-12-04 04:27:11 -05:00
Paul Speed
9fda417a66 Fix for issue #577 StringBlock cannot be cloned with the cloner because 
it is package private and the cloner cannot instantiate one directly.
Since it is extremely unlikely (read: impossible) that there would ever
be shared StringBlock references between BitmapText objects then it is safe
to just clone it directly.
It is important to note that BitmapText never really did support clone
before and only pretended to... so this wasn't really a regression.
 2016-12-04 04:24:57 -05:00
javasabr
1f9a5cd028 for prev commit 2016-12-03 16:58:30 +03:00
javasabr
544d94aed7 implemented supporting the OffscreenSurface context. 2016-12-03 16:55:50 +03:00
javasabr
13eec17ddd Merge remote-tracking branch 'github/master' into master-original 2016-12-03 14:33:10 +03:00
javasabr
911b99330b Merge remote-tracking branch 'github/master' into master-original 2016-11-28 06:20:20 +03:00
javasabr
06258a6ddc fixed crashes 2016-11-28 06:19:52 +03:00
Kirill Vainer
f38ddadc5b upload_native: debugging on master branch 2016-11-27 16:21:15 -05:00
Kirill Vainer
da8b53d0a2 upload_native: always assemble native 2016-11-27 15:16:28 -05:00
travis-ci
f7c161562a [ci skip] bullet: update linux natives 2016-11-27 19:42:17 +00:00
appveyor
247bdf853e [ci skip] bullet: update windows natives 2016-11-27 19:41:14 +00:00
Kirill Vainer
1e06ad091a upload_native: final check 2016-11-27 14:38:38 -05:00
travis-ci
e557fb3fb0 [ci skip] bullet: update linux natives 2016-11-27 19:36:07 +00:00
Kirill Vainer
f60ffcc967 upload_native: final check 2016-11-27 14:32:21 -05:00
Kirill Vainer
dd812b17c5 upload_native: uncomment lines 2016-11-27 14:24:31 -05:00
travis-ci
e268c3b9fe upload_native: more debugging 2016-11-27 14:18:21 -05:00
appveyor
1fd9797007 [ci skip] bullet: update windows natives 2016-11-27 18:03:01 +00:00
Kirill Vainer
3cdb7fd928 bullet-native: move generate headers task 2016-11-27 12:59:59 -05:00
travis-ci
2e8d69f809 [ci skip] bullet: update osx natives 2016-11-27 17:07:29 +00:00
appveyor
ba0185c7bd [ci skip] bullet: update windows natives 2016-11-27 17:04:38 +00:00
Kirill Vainer
16695d444f travis: fix duplicate yml addons 2016-11-27 12:02:05 -05:00
appveyor
7fd022d06f [ci skip] bullet: update windows natives 2016-11-27 16:51:59 +00:00
Kirill Vainer
47c2396093 travis/appveyor: final test for auto-building 2016-11-27 11:48:57 -05:00
Kirill Vainer
f58242f285 Revert "travis: test mac native upload" 
This reverts commit f5dbafe013023ad54eac5b1ccc34eb9fcb7a9a73.
 2016-11-27 11:46:06 -05:00
Kirill Vainer
0cfb97359f Revert "travis: test mac native upload (2)" 
This reverts commit 6e352bbf8a4e0df69f2dd4b1c5329237e504ed47.
 2016-11-27 11:46:03 -05:00
Kirill Vainer
3acee58f73 travis: add github as known ssh host 2016-11-27 11:38:16 -05:00
Kirill Vainer
6e352bbf8a travis: test mac native upload (2) 2016-11-27 11:28:49 -05:00
Kirill Vainer
f5dbafe013 travis: test mac native upload 2016-11-26 00:47:34 -05:00
travis-ci
d831d7f010 [ci skip] bullet: update linux natives 2016-11-26 05:41:23 +00:00
appveyor
5971d2e122 [ci skip] bullet: update windows natives 2016-11-26 05:41:00 +00:00
Kirill Vainer
19c5c2df24 travis: set key permissions 2016-11-26 00:38:15 -05:00
Kirill Vainer
964e0017e9 travis: set git identity 2016-11-26 00:31:54 -05:00
Kirill Vainer
44bf751e35 travis: fix incorrect condition 2016-11-26 00:24:51 -05:00
appveyor
0881856647 [ci skip] bullet: update windows natives 2016-11-26 05:21:15 +00:00
Kirill Vainer
553757528f appveyor: trigger native build 2016-11-26 00:18:41 -05:00
Kirill Vainer
316bef252d appveyor: fix key decoding 2016-11-26 00:17:50 -05:00
Kirill Vainer
7555f8a817 appveyor: backslash -> fwdslash 2016-11-26 00:13:14 -05:00
Kirill Vainer
8b2b57f01c travis: test native upload 2016-11-26 00:10:30 -05:00
Kirill Vainer
8fedbab263 travis: add upload native check 2016-11-25 23:34:33 -05:00