OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge pull request #321 from xoppa/new3dapi
Xoppa [Thu, 28 Mar 2013 20:17:33 +0000 (13:17 -0700)]
Merge pull request #321 from xoppa/new3dapi

Update getMaxTextureUnits, add sphere and cone, add BasicShapeTest

11 years agoUpdate getMaxTextureUnits, add sphere and cone, add BasicShapeTest
Xoppa [Wed, 27 Mar 2013 19:28:52 +0000 (20:28 +0100)]
Update getMaxTextureUnits, add sphere and cone, add BasicShapeTest

11 years agoMerge pull request #318 from xoppa/new3dapi
Mario Zechner [Tue, 26 Mar 2013 22:46:48 +0000 (15:46 -0700)]
Merge pull request #318 from xoppa/new3dapi

Redesign ModelBuilder

11 years agoRemove multiple model support, static instance and add begin/end checking
Xoppa [Tue, 26 Mar 2013 22:39:46 +0000 (23:39 +0100)]
Remove multiple model support, static instance and add begin/end checking

11 years agoRedesign ModelBuilder
Xoppa [Tue, 26 Mar 2013 21:40:02 +0000 (22:40 +0100)]
Redesign ModelBuilder

11 years agoMerge pull request #317 from xoppa/new3dapi
Mario Zechner [Tue, 26 Mar 2013 11:45:22 +0000 (04:45 -0700)]
Merge pull request #317 from xoppa/new3dapi

New3dapi, various changes

11 years agoAdd very basic cylinder shape
Xoppa [Mon, 25 Mar 2013 23:30:34 +0000 (00:30 +0100)]
Add very basic cylinder shape

11 years agoRemove unneed initialization
Xoppa [Mon, 25 Mar 2013 18:43:31 +0000 (19:43 +0100)]
Remove unneed initialization

11 years agoGenerate ids for materials if none given, very basic ModelBuilder class, use bits...
Xoppa [Mon, 25 Mar 2013 18:21:04 +0000 (19:21 +0100)]
Generate ids for materials if none given, very basic ModelBuilder class, use bits for VertexAttributes#Usage, fix bullet tests.

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Xoppa [Mon, 25 Mar 2013 00:12:07 +0000 (01:12 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

11 years agoAdd model ctor
Xoppa [Mon, 25 Mar 2013 00:07:08 +0000 (01:07 +0100)]
Add model ctor

11 years agonode translation/rotation/scale are initialized to sane values
badlogic [Sun, 24 Mar 2013 23:36:27 +0000 (00:36 +0100)]
node translation/rotation/scale are initialized to sane values

11 years agoadded ModelInstance :D, fixed up tests, bullet has issues with lighting, not sure why
badlogic [Sun, 24 Mar 2013 23:34:29 +0000 (00:34 +0100)]
added ModelInstance :D, fixed up tests, bullet has issues with lighting, not sure why

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
badlogic [Sun, 24 Mar 2013 23:16:41 +0000 (00:16 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

11 years agoMerge pull request #316 from xoppa/new3dapi
Mario Zechner [Sun, 24 Mar 2013 23:16:28 +0000 (16:16 -0700)]
Merge pull request #316 from xoppa/new3dapi

revert

11 years agorevert
Xoppa [Sun, 24 Mar 2013 23:13:21 +0000 (00:13 +0100)]
revert

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
badlogic [Sun, 24 Mar 2013 22:41:30 +0000 (23:41 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

11 years agomodified model
badlogic [Sun, 24 Mar 2013 22:41:28 +0000 (23:41 +0100)]
modified model

11 years agoMerge pull request #315 from xoppa/new3dapi
Mario Zechner [Sun, 24 Mar 2013 22:40:56 +0000 (15:40 -0700)]
Merge pull request #315 from xoppa/new3dapi

New3dapi

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
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

11 years agoCant commit without this
Xoppa [Sun, 24 Mar 2013 22:34:40 +0000 (23:34 +0100)]
Cant commit without this

11 years agoUse new model for bullet tests
Xoppa [Sun, 24 Mar 2013 22:30:38 +0000 (23:30 +0100)]
Use new model for bullet tests

11 years agomade ModelBatch#render(Renderable) public, if someone doesn't want to use Models
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

11 years agorenamed addXXX methods to render in ModelBatch
badlogic [Sun, 24 Mar 2013 21:53:32 +0000 (22:53 +0100)]
renamed addXXX methods to render in ModelBatch

11 years agofixed node transform calculations
badlogic [Sun, 24 Mar 2013 21:51:29 +0000 (22:51 +0100)]
fixed node transform calculations

11 years agoMerge pull request #313 from xoppa/new3dapi
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

11 years agoadded proper disposal of things, need to fix Model#dispose, attribuets may have dispo...
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 :/

11 years agoAdditional NewMaterial constructors, use Array instances in ModelData
Xoppa [Sun, 24 Mar 2013 18:34:50 +0000 (19:34 +0100)]
Additional NewMaterial constructors, use Array instances in ModelData

11 years agoremoved RenderBatch and consorts, merged Renderable and RenderInstance, separated...
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

11 years agorenamed ExclusiveTextures to DefaultTextureBinder, introduced TextureBinder interface...
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

11 years agoMerge branch 'master' into new3dapi
badlogic [Sun, 24 Mar 2013 15:58:00 +0000 (16:58 +0100)]
Merge branch 'master' into new3dapi

11 years agoadded ModelBatch, adaption of RenderBatch so i can experiment, see NewModelTest
badlogic [Sun, 24 Mar 2013 15:42:28 +0000 (16:42 +0100)]
added ModelBatch, adaption of RenderBatch so i can experiment, see NewModelTest

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sun, 24 Mar 2013 15:41:01 +0000 (16:41 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agofixed issue 1346, freetype font leaked
badlogic [Sun, 24 Mar 2013 15:40:54 +0000 (16:40 +0100)]
fixed issue 1346, freetype font leaked

11 years agofixed issue 1346, BitmapFonts generated by FreeTypeFontGenerator where leaking...
badlogic [Sun, 24 Mar 2013 15:39:31 +0000 (16:39 +0100)]
fixed issue 1346, BitmapFonts generated by FreeTypeFontGenerator where leaking...

11 years agoMerge pull request #310 from xoppa/new3dapi
Mario Zechner [Sun, 24 Mar 2013 08:45:17 +0000 (01:45 -0700)]
Merge pull request #310 from xoppa/new3dapi

New3dapi, Bullet

11 years agoMerge pull request #311 from nbadal/master
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

11 years agoAdded check for new OUYA device name
Nick Badal [Sun, 24 Mar 2013 03:01:12 +0000 (20:01 -0700)]
Added check for new OUYA device name

11 years agoUse new model
Xoppa [Sun, 24 Mar 2013 01:24:24 +0000 (02:24 +0100)]
Use new model

11 years agoMerge branch 'master' into new3dapi
badlogic [Sat, 23 Mar 2013 23:31:59 +0000 (00:31 +0100)]
Merge branch 'master' into new3dapi

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx 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

11 years agoMerge pull request #304 from xoppa/misc
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

11 years agoMerge pull request #308 from xoppa/bullet
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

11 years agomerged new3dapi with master
badlogic [Sat, 23 Mar 2013 23:25:36 +0000 (00:25 +0100)]
merged new3dapi with master

11 years agoadded first draft of new Model class
badlogic [Sat, 23 Mar 2013 23:24:09 +0000 (00:24 +0100)]
added first draft of new Model class

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
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

11 years agoMerge pull request #309 from xoppa/math
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.

11 years agoFix incorrect order of arguments.
Xoppa [Sat, 23 Mar 2013 20:38:11 +0000 (21:38 +0100)]
Fix incorrect order of arguments.

11 years agoForgot to commit this
Xoppa [Sat, 23 Mar 2013 20:36:02 +0000 (21:36 +0100)]
Forgot to commit this

11 years agoSwig generated files
Xoppa [Sat, 23 Mar 2013 19:44:19 +0000 (20:44 +0100)]
Swig generated files

11 years agoAdd gdxManagedObject and small change gdxPooledObject
Xoppa [Sat, 23 Mar 2013 19:41:28 +0000 (20:41 +0100)]
Add gdxManagedObject and small change gdxPooledObject

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 23 Mar 2013 14:58:45 +0000 (15:58 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoBounds checking for array insert.
NathanSweet [Sat, 23 Mar 2013 14:58:38 +0000 (15:58 +0100)]
Bounds checking for array insert.
Minor updates.

11 years agoupdated CHANGES file
badlogic [Sat, 23 Mar 2013 11:09:19 +0000 (12:09 +0100)]
updated CHANGES file

11 years agoSwig generated files
Xoppa [Fri, 22 Mar 2013 21:18:48 +0000 (22:18 +0100)]
Swig generated files

11 years agoAdd pooling of common used objects.
Xoppa [Fri, 22 Mar 2013 21:12:15 +0000 (22:12 +0100)]
Add pooling of common used objects.

11 years agoAdd compilerSuffix to the build files
Xoppa [Fri, 22 Mar 2013 21:10:30 +0000 (22:10 +0100)]
Add compilerSuffix to the build files

11 years agochanges updated
badlogic [Fri, 22 Mar 2013 19:10:04 +0000 (20:10 +0100)]
changes updated

11 years agofixed box2d tests using applyXXX, they noe need an explitic wake flag
badlogic [Fri, 22 Mar 2013 19:09:20 +0000 (20:09 +0100)]
fixed box2d tests using applyXXX, they noe need an explitic wake flag

11 years agoUpdated box2d version to latest trunk, updated jni wrapper & GWT emu
badlogic [Fri, 22 Mar 2013 19:07:46 +0000 (20:07 +0100)]
Updated box2d version to latest trunk, updated jni wrapper & GWT emu

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 22 Mar 2013 18:19:08 +0000 (19:19 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoadded shared libs linking to jnigen
badlogic [Fri, 22 Mar 2013 18:18:57 +0000 (19:18 +0100)]
added shared libs linking to jnigen

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 22 Mar 2013 11:41:41 +0000 (12:41 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoFixed aliased images that are rotated.
NathanSweet [Fri, 22 Mar 2013 11:32:26 +0000 (12:32 +0100)]
Fixed aliased images that are rotated.

11 years agoMerge pull request #307 from ajhager/master
Mario Zechner [Fri, 22 Mar 2013 10:25:00 +0000 (03:25 -0700)]
Merge pull request #307 from ajhager/master

Fixed issue 1309.

11 years agomoved and renamed json loader pojos, should be base for new model class.
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.

11 years ago[fixed] moved xoppa's package to top-level g3d package, moved old stuff to g3d.old...
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

11 years agomerged with master
badlogic [Thu, 21 Mar 2013 14:24:28 +0000 (15:24 +0100)]
merged with master

11 years agoThrow better exception if allocation failed.
NathanSweet [Thu, 21 Mar 2013 12:34:17 +0000 (13:34 +0100)]
Throw better exception if allocation failed.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 21 Mar 2013 12:18:35 +0000 (13:18 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoCheck if pixmap memory was actually allocated.
NathanSweet [Thu, 21 Mar 2013 12:18:10 +0000 (13:18 +0100)]
Check if pixmap memory was actually allocated.

11 years agoFix loadProperties
MobiDevelop [Thu, 21 Mar 2013 05:33:54 +0000 (22:33 -0700)]
Fix loadProperties

11 years agoFix Typo
MobiDevelop [Thu, 21 Mar 2013 05:19:16 +0000 (22:19 -0700)]
Fix Typo

11 years agoUse a more descriptive name for http client response.
Joseph Hager [Thu, 21 Mar 2013 04:24:37 +0000 (00:24 -0400)]
Use a more descriptive name for http client response.

11 years agoChange return type
Xoppa [Wed, 20 Mar 2013 17:57:43 +0000 (18:57 +0100)]
Change return type

11 years agoUpdate ContactCallbackTest
Xoppa [Wed, 20 Mar 2013 17:34:30 +0000 (18:34 +0100)]
Update ContactCallbackTest

11 years agoSwig generated files
Xoppa [Wed, 20 Mar 2013 17:32:36 +0000 (18:32 +0100)]
Swig generated files

11 years agoAdd contact callback filter
Xoppa [Wed, 20 Mar 2013 17:31:32 +0000 (18:31 +0100)]
Add contact callback filter

11 years agoAdd ContactCallbackTest
Xoppa [Wed, 20 Mar 2013 02:27:04 +0000 (03:27 +0100)]
Add ContactCallbackTest

11 years agoSwig generated files
Xoppa [Wed, 20 Mar 2013 02:25:34 +0000 (03:25 +0100)]
Swig generated files

11 years agoAdd ContactAddedListener, ContactProcessedListener and ContactDestroyedListener.
Xoppa [Wed, 20 Mar 2013 02:24:41 +0000 (03:24 +0100)]
Add ContactAddedListener, ContactProcessedListener and ContactDestroyedListener.

11 years agoAdd GdxCollisionObjectBridge #2
Xoppa [Wed, 20 Mar 2013 02:21:40 +0000 (03:21 +0100)]
Add GdxCollisionObjectBridge #2

11 years agoAdd GdxCollisionObjectBridge
Xoppa [Wed, 20 Mar 2013 02:19:37 +0000 (03:19 +0100)]
Add GdxCollisionObjectBridge

11 years agoAdd btManifoldPoint#getUserValue/setUserValue
Xoppa [Wed, 20 Mar 2013 02:17:39 +0000 (03:17 +0100)]
Add btManifoldPoint#getUserValue/setUserValue

11 years agoFixed issue 1309
Joseph Hager [Tue, 19 Mar 2013 15:57:44 +0000 (11:57 -0400)]
Fixed issue 1309

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Tue, 19 Mar 2013 13:44:10 +0000 (14:44 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoMinor updates.
NathanSweet [Tue, 19 Mar 2013 13:43:57 +0000 (14:43 +0100)]
Minor updates.

11 years agoSync GWT backend with latest changes in core.
Justin Shapcott [Mon, 18 Mar 2013 20:16:30 +0000 (13:16 -0700)]
Sync GWT backend with latest changes in core.

11 years agoFixed issue 1249.
NathanSweet [Mon, 18 Mar 2013 13:51:30 +0000 (14:51 +0100)]
Fixed issue 1249.

11 years agoRefactored Actions.add.
NathanSweet [Mon, 18 Mar 2013 13:51:12 +0000 (14:51 +0100)]
Refactored Actions.add.
Added new Action classes.

11 years agoFixed issue 1266.
NathanSweet [Mon, 18 Mar 2013 13:20:25 +0000 (14:20 +0100)]
Fixed issue 1266.

11 years agoFixed issue 1289.
NathanSweet [Mon, 18 Mar 2013 13:16:03 +0000 (14:16 +0100)]
Fixed issue 1289.

11 years agoFixed issue 1330.
NathanSweet [Mon, 18 Mar 2013 13:04:17 +0000 (14:04 +0100)]
Fixed issue 1330.

11 years agoFixed issue #1333.
NathanSweet [Mon, 18 Mar 2013 12:58:05 +0000 (13:58 +0100)]
Fixed issue #1333.

11 years agoFixed issue #1323.
NathanSweet [Mon, 18 Mar 2013 12:55:57 +0000 (13:55 +0100)]
Fixed issue #1323.

11 years agoAdded listener pause/resume.
NathanSweet [Mon, 18 Mar 2013 12:43:59 +0000 (13:43 +0100)]
Added listener pause/resume.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 18 Mar 2013 12:31:58 +0000 (13:31 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoMerge pull request #305 from 0xg/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

11 years agoAdded target FPS for foreground, background, and minimized.
NathanSweet [Mon, 18 Mar 2013 12:30:10 +0000 (13:30 +0100)]
Added target FPS for foreground, background, and minimized.

11 years agoFix issue 1331 by adding a ShortArray class
0xg [Mon, 18 Mar 2013 02:49:57 +0000 (03:49 +0100)]
Fix issue 1331 by adding a ShortArray class