OSDN Git Service
Xoppa [Sun, 24 Mar 2013 23:13:21 +0000 (00:13 +0100)]
revert
Xoppa [Sun, 24 Mar 2013 22:36:33 +0000 (23:36 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Conflicts:
gdx/src/com/badlogic/gdx/graphics/g3d/Model.java
gdx/src/com/badlogic/gdx/graphics/g3d/ModelBatch.java
tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BatchRenderTest.java
Xoppa [Sun, 24 Mar 2013 22:34:40 +0000 (23:34 +0100)]
Cant commit without this
Xoppa [Sun, 24 Mar 2013 22:30:38 +0000 (23:30 +0100)]
Use new model for bullet tests
badlogic [Sun, 24 Mar 2013 22:02:32 +0000 (23:02 +0100)]
made ModelBatch#render(Renderable) public, if someone doesn't want to use Models
badlogic [Sun, 24 Mar 2013 21:53:32 +0000 (22:53 +0100)]
renamed addXXX methods to render in ModelBatch
badlogic [Sun, 24 Mar 2013 21:51:29 +0000 (22:51 +0100)]
fixed node transform calculations
Mario Zechner [Sun, 24 Mar 2013 18:39:22 +0000 (11:39 -0700)]
Merge pull request #313 from xoppa/new3dapi
Additional NewMaterial constructors, use Array instances in ModelData
badlogic [Sun, 24 Mar 2013 18:38:39 +0000 (19:38 +0100)]
added proper disposal of things, need to fix Model#dispose, attribuets may have disposable resources, may even share them with other materials :/
Xoppa [Sun, 24 Mar 2013 18:34:50 +0000 (19:34 +0100)]
Additional NewMaterial constructors, use Array instances in ModelData
badlogic [Sun, 24 Mar 2013 18:28:47 +0000 (19:28 +0100)]
removed RenderBatch and consorts, merged Renderable and RenderInstance, separated RenderBatchListener into RenderableSorter and ShaderProvider
badlogic [Sun, 24 Mar 2013 17:07:40 +0000 (18:07 +0100)]
renamed ExclusiveTextures to DefaultTextureBinder, introduced TextureBinder interface, cleans up texture units properly (we may also render UI and other things...), removed OldBatchRenderer classes, extended Renderable to also contain transform, added NewModelTest, works :D
badlogic [Sun, 24 Mar 2013 15:58:00 +0000 (16:58 +0100)]
Merge branch 'master' into new3dapi
badlogic [Sun, 24 Mar 2013 15:42:28 +0000 (16:42 +0100)]
added ModelBatch, adaption of RenderBatch so i can experiment, see NewModelTest
badlogic [Sun, 24 Mar 2013 15:41:01 +0000 (16:41 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sun, 24 Mar 2013 15:40:54 +0000 (16:40 +0100)]
fixed issue 1346, freetype font leaked
badlogic [Sun, 24 Mar 2013 15:39:31 +0000 (16:39 +0100)]
fixed issue 1346, BitmapFonts generated by FreeTypeFontGenerator where leaking...
Mario Zechner [Sun, 24 Mar 2013 08:45:17 +0000 (01:45 -0700)]
Merge pull request #310 from xoppa/new3dapi
New3dapi, Bullet
Mario Zechner [Sun, 24 Mar 2013 08:44:11 +0000 (01:44 -0700)]
Merge pull request #311 from nbadal/master
Fix OUYA controller mappings on newer firmwares
Nick Badal [Sun, 24 Mar 2013 03:01:12 +0000 (20:01 -0700)]
Added check for new OUYA device name
Xoppa [Sun, 24 Mar 2013 01:24:24 +0000 (02:24 +0100)]
Use new model
badlogic [Sat, 23 Mar 2013 23:31:59 +0000 (00:31 +0100)]
Merge branch 'master' into new3dapi
Xoppa [Sat, 23 Mar 2013 23:30:09 +0000 (00:30 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Mario Zechner [Sat, 23 Mar 2013 23:28:42 +0000 (16:28 -0700)]
Merge pull request #304 from xoppa/misc
RemoteInput, add #isConnected and RemoteInputListener
Mario Zechner [Sat, 23 Mar 2013 23:28:09 +0000 (16:28 -0700)]
Merge pull request #308 from xoppa/bullet
Bullet, add contact callbacks and add GdxCollisionObjectBridge
badlogic [Sat, 23 Mar 2013 23:25:36 +0000 (00:25 +0100)]
merged new3dapi with master
badlogic [Sat, 23 Mar 2013 23:24:09 +0000 (00:24 +0100)]
added first draft of new Model class
Xoppa [Sat, 23 Mar 2013 22:12:02 +0000 (23:12 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Conflicts:
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
Mario Zechner [Sat, 23 Mar 2013 21:29:21 +0000 (14:29 -0700)]
Merge pull request #309 from xoppa/math
Camera: Fix incorrect order of arguments.
Xoppa [Sat, 23 Mar 2013 20:38:11 +0000 (21:38 +0100)]
Fix incorrect order of arguments.
Xoppa [Sat, 23 Mar 2013 20:36:02 +0000 (21:36 +0100)]
Forgot to commit this
Xoppa [Sat, 23 Mar 2013 19:44:19 +0000 (20:44 +0100)]
Swig generated files
Xoppa [Sat, 23 Mar 2013 19:41:28 +0000 (20:41 +0100)]
Add gdxManagedObject and small change gdxPooledObject
NathanSweet [Sat, 23 Mar 2013 14:58:45 +0000 (15:58 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sat, 23 Mar 2013 14:58:38 +0000 (15:58 +0100)]
Bounds checking for array insert.
Minor updates.
badlogic [Sat, 23 Mar 2013 11:09:19 +0000 (12:09 +0100)]
updated CHANGES file
Xoppa [Fri, 22 Mar 2013 21:18:48 +0000 (22:18 +0100)]
Swig generated files
Xoppa [Fri, 22 Mar 2013 21:12:15 +0000 (22:12 +0100)]
Add pooling of common used objects.
Xoppa [Fri, 22 Mar 2013 21:10:30 +0000 (22:10 +0100)]
Add compilerSuffix to the build files
badlogic [Fri, 22 Mar 2013 19:10:04 +0000 (20:10 +0100)]
changes updated
badlogic [Fri, 22 Mar 2013 19:09:20 +0000 (20:09 +0100)]
fixed box2d tests using applyXXX, they noe need an explitic wake flag
badlogic [Fri, 22 Mar 2013 19:07:46 +0000 (20:07 +0100)]
Updated box2d version to latest trunk, updated jni wrapper & GWT emu
badlogic [Fri, 22 Mar 2013 18:19:08 +0000 (19:19 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 22 Mar 2013 18:18:57 +0000 (19:18 +0100)]
added shared libs linking to jnigen
NathanSweet [Fri, 22 Mar 2013 11:41:41 +0000 (12:41 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Fri, 22 Mar 2013 11:32:26 +0000 (12:32 +0100)]
Fixed aliased images that are rotated.
Mario Zechner [Fri, 22 Mar 2013 10:25:00 +0000 (03:25 -0700)]
Merge pull request #307 from ajhager/master
Fixed issue 1309.
badlogic [Thu, 21 Mar 2013 17:11:01 +0000 (18:11 +0100)]
moved and renamed json loader pojos, should be base for new model class.
bullet is currently broken, need to modify the swig stuff.
badlogic [Thu, 21 Mar 2013 15:55:20 +0000 (16:55 +0100)]
[fixed] moved xoppa's package to top-level g3d package, moved old stuff to g3d.old for reference, removed TextureDict and TextureRef.java
badlogic [Thu, 21 Mar 2013 14:24:28 +0000 (15:24 +0100)]
merged with master
NathanSweet [Thu, 21 Mar 2013 12:34:17 +0000 (13:34 +0100)]
Throw better exception if allocation failed.
NathanSweet [Thu, 21 Mar 2013 12:18:35 +0000 (13:18 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Thu, 21 Mar 2013 12:18:10 +0000 (13:18 +0100)]
Check if pixmap memory was actually allocated.
MobiDevelop [Thu, 21 Mar 2013 05:33:54 +0000 (22:33 -0700)]
Fix loadProperties
MobiDevelop [Thu, 21 Mar 2013 05:19:16 +0000 (22:19 -0700)]
Fix Typo
Joseph Hager [Thu, 21 Mar 2013 04:24:37 +0000 (00:24 -0400)]
Use a more descriptive name for http client response.
Xoppa [Wed, 20 Mar 2013 17:57:43 +0000 (18:57 +0100)]
Change return type
Xoppa [Wed, 20 Mar 2013 17:34:30 +0000 (18:34 +0100)]
Update ContactCallbackTest
Xoppa [Wed, 20 Mar 2013 17:32:36 +0000 (18:32 +0100)]
Swig generated files
Xoppa [Wed, 20 Mar 2013 17:31:32 +0000 (18:31 +0100)]
Add contact callback filter
Xoppa [Wed, 20 Mar 2013 02:27:04 +0000 (03:27 +0100)]
Add ContactCallbackTest
Xoppa [Wed, 20 Mar 2013 02:25:34 +0000 (03:25 +0100)]
Swig generated files
Xoppa [Wed, 20 Mar 2013 02:24:41 +0000 (03:24 +0100)]
Add ContactAddedListener, ContactProcessedListener and ContactDestroyedListener.
Xoppa [Wed, 20 Mar 2013 02:21:40 +0000 (03:21 +0100)]
Add GdxCollisionObjectBridge #2
Xoppa [Wed, 20 Mar 2013 02:19:37 +0000 (03:19 +0100)]
Add GdxCollisionObjectBridge
Xoppa [Wed, 20 Mar 2013 02:17:39 +0000 (03:17 +0100)]
Add btManifoldPoint#getUserValue/setUserValue
Joseph Hager [Tue, 19 Mar 2013 15:57:44 +0000 (11:57 -0400)]
Fixed issue 1309
NathanSweet [Tue, 19 Mar 2013 13:44:10 +0000 (14:44 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Tue, 19 Mar 2013 13:43:57 +0000 (14:43 +0100)]
Minor updates.
Justin Shapcott [Mon, 18 Mar 2013 20:16:30 +0000 (13:16 -0700)]
Sync GWT backend with latest changes in core.
NathanSweet [Mon, 18 Mar 2013 13:51:30 +0000 (14:51 +0100)]
Fixed issue 1249.
NathanSweet [Mon, 18 Mar 2013 13:51:12 +0000 (14:51 +0100)]
Refactored Actions.add.
Added new Action classes.
NathanSweet [Mon, 18 Mar 2013 13:20:25 +0000 (14:20 +0100)]
Fixed issue 1266.
NathanSweet [Mon, 18 Mar 2013 13:16:03 +0000 (14:16 +0100)]
Fixed issue 1289.
NathanSweet [Mon, 18 Mar 2013 13:04:17 +0000 (14:04 +0100)]
Fixed issue 1330.
NathanSweet [Mon, 18 Mar 2013 12:58:05 +0000 (13:58 +0100)]
Fixed issue #1333.
NathanSweet [Mon, 18 Mar 2013 12:55:57 +0000 (13:55 +0100)]
Fixed issue #1323.
NathanSweet [Mon, 18 Mar 2013 12:43:59 +0000 (13:43 +0100)]
Added listener pause/resume.
NathanSweet [Mon, 18 Mar 2013 12:31:58 +0000 (13:31 +0100)]
Merge remote-tracking branch 'origin/master'
Nathan Sweet [Mon, 18 Mar 2013 12:31:41 +0000 (05:31 -0700)]
Merge pull request #305 from 0xg/master
Fix issue 1331 by adding a ShortArray class
NathanSweet [Mon, 18 Mar 2013 12:30:10 +0000 (13:30 +0100)]
Added target FPS for foreground, background, and minimized.
0xg [Mon, 18 Mar 2013 02:49:57 +0000 (03:49 +0100)]
Fix issue 1331 by adding a ShortArray class
Xoppa [Mon, 18 Mar 2013 00:30:36 +0000 (01:30 +0100)]
Add wake lock
Xoppa [Mon, 18 Mar 2013 00:03:44 +0000 (01:03 +0100)]
RemoteInput, add #isConnected and RemoteInputListener interface
Xoppa [Sun, 17 Mar 2013 19:52:16 +0000 (20:52 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx into misc
Mario Zechner [Sun, 17 Mar 2013 19:43:58 +0000 (12:43 -0700)]
Merge pull request #302 from manuelbua/quat-fix-mixed-sincos
Fix float precision issues and mixed usage of Math.sin, MathUtils.sin
Mario Zechner [Sun, 17 Mar 2013 19:42:46 +0000 (12:42 -0700)]
Merge pull request #303 from xoppa/bullet
Bullet, small changes
Xoppa [Sun, 17 Mar 2013 19:26:25 +0000 (20:26 +0100)]
Modify the bullet tests to use user values
Xoppa [Sun, 17 Mar 2013 19:22:00 +0000 (20:22 +0100)]
Swig generated files
Xoppa [Sun, 17 Mar 2013 19:21:23 +0000 (20:21 +0100)]
Add btBroadPhasePairArray#getCollisionObjectsValue
Xoppa [Sun, 17 Mar 2013 19:19:35 +0000 (20:19 +0100)]
Add btCollisionObject#getUserValue / setUserValue
Manuel Bua [Sun, 17 Mar 2013 17:34:37 +0000 (18:34 +0100)]
Fix float precision issues and mixed usage of Math.sin, MathUtils.sin
The mixed usage of both the high-precision and the faster trig functions
can leads to very different results and problems due to the nature of the
faster methods.
Also, the MathUtils implementation produces some slightly different results
when, for example, rotating a matrix on an arbitrary axis.
Xoppa [Sun, 17 Mar 2013 17:25:39 +0000 (18:25 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx into misc
badlogic [Sun, 17 Mar 2013 12:44:37 +0000 (13:44 +0100)]
fixed super koalio, glfw backend returns 0 for first delta time, as it should, didn't take that into account
badlogic [Sun, 17 Mar 2013 11:36:40 +0000 (12:36 +0100)]
updated objectall dlls and jars
badlogic [Sun, 17 Mar 2013 11:01:10 +0000 (12:01 +0100)]
fixed HttpStatus imports in gwt and ios backend
Mario Zechner [Sun, 17 Mar 2013 10:59:15 +0000 (03:59 -0700)]
Merge pull request #301 from semtiko/patch-1
Fix broken building in Net package
Alex Vega [Sun, 17 Mar 2013 10:43:33 +0000 (03:43 -0700)]
Merge pull request #1 from semtiko/patch-2
Fix imports
Alex Vega [Sun, 17 Mar 2013 10:42:44 +0000 (14:42 +0400)]
Fix imports
Alex Vega [Sun, 17 Mar 2013 10:42:01 +0000 (14:42 +0400)]
Fix broken buildind