OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge pull request #336 from xoppa/new3dapi
Mario Zechner [Sun, 7 Apr 2013 19:28:04 +0000 (12:28 -0700)]
Merge pull request #336 from xoppa/new3dapi

New3dapi: Fix explosion, allow overwriting material attributes.

11 years agoremove attribute#set
Xoppa [Sun, 7 Apr 2013 19:25:26 +0000 (21:25 +0200)]
remove attribute#set

11 years agoFix invaders explosion
Xoppa [Sun, 7 Apr 2013 16:00:48 +0000 (18:00 +0200)]
Fix invaders explosion

11 years agoAllow overwriting material attributes.
Xoppa [Sun, 7 Apr 2013 00:44:26 +0000 (02:44 +0200)]
Allow overwriting material attributes.

11 years agoMerge pull request #330 from xoppa/new3dapi
Mario Zechner [Sat, 6 Apr 2013 23:04:37 +0000 (16:04 -0700)]
Merge pull request #330 from xoppa/new3dapi

New3dapi, rename to .shaders.DefaultShader, move Light and add direction and angle

11 years agoModelInstance: only set transform if it's not null
Xoppa [Sat, 6 Apr 2013 23:02:57 +0000 (01:02 +0200)]
ModelInstance: only set transform if it's not null

11 years agoAdd blended
Xoppa [Sat, 6 Apr 2013 22:53:40 +0000 (00:53 +0200)]
Add blended

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Xoppa [Sat, 6 Apr 2013 22:41:49 +0000 (00:41 +0200)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

11 years agorenamed BoneAnimation -> NodeAnimation, fixed up a few things in gdx-invaders, still...
badlogic [Sat, 6 Apr 2013 22:17:56 +0000 (00:17 +0200)]
renamed BoneAnimation -> NodeAnimation, fixed up a few things in gdx-invaders, still rather broken

11 years agoMerge branch 'master' into new3dapi
badlogic [Sat, 6 Apr 2013 20:35:55 +0000 (22:35 +0200)]
Merge branch 'master' into new3dapi

11 years agoFixed list pref width.
NathanSweet [Sat, 6 Apr 2013 19:23:09 +0000 (21:23 +0200)]
Fixed list pref width.

11 years agoAdded time scale action.
NathanSweet [Sat, 6 Apr 2013 12:25:12 +0000 (14:25 +0200)]
Added time scale action.

11 years ago1345, fixed primitive wrapper generic types.
NathanSweet [Sat, 6 Apr 2013 12:15:23 +0000 (14:15 +0200)]
1345, fixed primitive wrapper generic types.

11 years agoGuard against nested iterator usage by throwing an exception. Issue 1361.
NathanSweet [Sat, 6 Apr 2013 12:02:45 +0000 (14:02 +0200)]
Guard against nested iterator usage by throwing an exception. Issue 1361.

11 years agoAnother try at fixing applets.
NathanSweet [Sat, 6 Apr 2013 11:16:19 +0000 (13:16 +0200)]
Another try at fixing applets.

11 years agoMore shader optimizations, still not happy about the performance....
Xoppa [Fri, 5 Apr 2013 20:55:09 +0000 (22:55 +0200)]
More shader optimizations, still not happy about the performance....

11 years agoDon't use specular when lighting is not used.
Xoppa [Fri, 5 Apr 2013 20:02:55 +0000 (22:02 +0200)]
Don't use specular when lighting is not used.

11 years agoSmall shader fix
Xoppa [Fri, 5 Apr 2013 19:55:38 +0000 (21:55 +0200)]
Small shader fix

11 years agoAdd specular to GLES20
Xoppa [Fri, 5 Apr 2013 18:52:42 +0000 (20:52 +0200)]
Add specular to GLES20

11 years ago#1290, native libs with applets.
NathanSweet [Fri, 5 Apr 2013 18:52:05 +0000 (20:52 +0200)]
#1290, native libs with applets.

11 years ago#1357, fixed table getRow();
NathanSweet [Fri, 5 Apr 2013 18:43:10 +0000 (20:43 +0200)]
#1357, fixed table getRow();

11 years agohttp://youtu.be/Ay9BWM8lwOA
NathanSweet [Fri, 5 Apr 2013 18:12:36 +0000 (20:12 +0200)]
http://youtu.be/Ay9BWM8lwOA

11 years agoIssue #1353, internal getters and setters.
NathanSweet [Fri, 5 Apr 2013 18:09:08 +0000 (20:09 +0200)]
Issue #1353, internal getters and setters.

Getters/setters were used internally for x, y, width, height, scalex, scaley and rotation to facilitate notification when those properties are retrieved or set. Turns out overriding these isn't really very useful, so we decided not to use the getters and setters internally. Other properties that might be useful to override were left alone, such as isVisible, setStage, setParent, etc.

Also, think of all zee performancez gained!

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 5 Apr 2013 17:38:25 +0000 (19:38 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoDetected usage of nested iterator() and throw exception.
NathanSweet [Fri, 5 Apr 2013 17:37:19 +0000 (19:37 +0200)]
Detected usage of nested iterator() and throw exception.

11 years agoRemove obsolete setWidget call.
NathanSweet [Fri, 5 Apr 2013 17:32:00 +0000 (19:32 +0200)]
Remove obsolete setWidget call.

11 years agoFire change event in setItems.
NathanSweet [Fri, 5 Apr 2013 17:31:47 +0000 (19:31 +0200)]
Fire change event in setItems.

11 years agoClose writer.
NathanSweet [Fri, 5 Apr 2013 17:31:36 +0000 (19:31 +0200)]
Close writer.

11 years agoChange HttpParametersUtils emulation.
Justin Shapcott [Fri, 5 Apr 2013 13:58:59 +0000 (06:58 -0700)]
Change HttpParametersUtils emulation.

Instead of emulating HttpParametersUtils, emulate java.net.URLEncoder.
This allows the encoding to be set (amongst the limited options available
in GWT) and provides consistency across backends.

11 years agoFix GwtGraphics.getDensity()
MobiDevelop [Fri, 5 Apr 2013 13:39:27 +0000 (06:39 -0700)]
Fix GwtGraphics.getDensity()

Previous commit changed to a double, which caused a type mismatch with the return type. 

11 years agoMerge pull request #288 from kreymerman/gwt_fixes
MobiDevelop [Fri, 5 Apr 2013 04:37:50 +0000 (21:37 -0700)]
Merge pull request #288 from kreymerman/gwt_fixes

Couple of small fixes in GWT backend

11 years agoAdd HttpParametersUtils to GWT emulation.
Justin Shapcott [Thu, 4 Apr 2013 20:18:38 +0000 (13:18 -0700)]
Add HttpParametersUtils to GWT emulation.

Because URLEncoder does not exist in GWT-land, the emulated class uses an
equivalent encode method provided by GWT's URL class.

11 years agoAdd GLES20 ambient, directional, point and spot lights.
Xoppa [Thu, 4 Apr 2013 18:25:01 +0000 (20:25 +0200)]
Add GLES20 ambient, directional, point and spot lights.

11 years agocancel method.
NathanSweet [Wed, 3 Apr 2013 22:59:37 +0000 (00:59 +0200)]
cancel method.

11 years agoGetter for writer.
NathanSweet [Wed, 3 Apr 2013 22:55:04 +0000 (00:55 +0200)]
Getter for writer.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Wed, 3 Apr 2013 17:53:50 +0000 (19:53 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded setWriter method.
NathanSweet [Wed, 3 Apr 2013 17:53:43 +0000 (19:53 +0200)]
Added setWriter method.

11 years agobackgroundFPS should be 0 by default.
NathanSweet [Wed, 3 Apr 2013 17:53:34 +0000 (19:53 +0200)]
backgroundFPS should be 0 by default.

11 years agoAdd Light#type
Xoppa [Tue, 2 Apr 2013 18:50:03 +0000 (20:50 +0200)]
Add Light#type

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Justin Shapcott [Tue, 2 Apr 2013 13:05:57 +0000 (06:05 -0700)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoAdd workaround for missing delete key events
Justin Shapcott [Tue, 2 Apr 2013 13:01:40 +0000 (06:01 -0700)]
Add workaround for missing delete key events

In Jelly Bean, the behavior when hitting delete on the soft keyboard was
changed so it does not send key events in certain circumstances. We want
the key events so we send them ourselves.

This workaround was previously added for GL10 but was missed for GL20.

11 years agoMinor fix to Lwjgl target FPS. Oops.
NathanSweet [Tue, 2 Apr 2013 00:37:59 +0000 (02:37 +0200)]
Minor fix to Lwjgl target FPS. Oops.

11 years agoCleaned up LwjglApplicationConfiguration target FPS.
NathanSweet [Tue, 2 Apr 2013 00:35:39 +0000 (02:35 +0200)]
Cleaned up LwjglApplicationConfiguration target FPS.

11 years agoMinor doc changes
Xoppa [Mon, 1 Apr 2013 23:09:31 +0000 (01:09 +0200)]
Minor doc changes

11 years agoMerge pull request #294 from dieend/issue188
Nathan Sweet [Mon, 1 Apr 2013 23:07:53 +0000 (16:07 -0700)]
Merge pull request #294 from dieend/issue188

issue #188

11 years agoUpdate Light#equals
Xoppa [Mon, 1 Apr 2013 23:06:13 +0000 (01:06 +0200)]
Update Light#equals

11 years agoAdd ambient light
Xoppa [Mon, 1 Apr 2013 22:42:30 +0000 (00:42 +0200)]
Add ambient light

11 years agoSet DefaultShader.ignoreUnimplemented to true by default for now.
Xoppa [Mon, 1 Apr 2013 22:10:06 +0000 (00:10 +0200)]
Set DefaultShader.ignoreUnimplemented to true by default for now.

11 years agoRename TestShader to DefaultShader and move to .shaders package, move Light and add...
Xoppa [Mon, 1 Apr 2013 22:00:07 +0000 (00:00 +0200)]
Rename TestShader to DefaultShader and move to .shaders package, move Light and add direction and angle.

11 years agoUse negative lightsCount to disable lighting
Xoppa [Mon, 1 Apr 2013 21:38:52 +0000 (23:38 +0200)]
Use negative lightsCount to disable lighting

11 years agoMerge pull request #329 from xoppa/new3dapi
Mario Zechner [Mon, 1 Apr 2013 21:38:00 +0000 (14:38 -0700)]
Merge pull request #329 from xoppa/new3dapi

New3dapi: Remove static TestShader.lightsCount

11 years agomerged PR by seraph
badlogic [Mon, 1 Apr 2013 21:22:57 +0000 (22:22 +0100)]
merged PR by seraph

11 years agoMerge pull request #324 from tescott/master
Mario Zechner [Mon, 1 Apr 2013 21:09:40 +0000 (14:09 -0700)]
Merge pull request #324 from tescott/master

Issue #1355- Joint user data

11 years agoRemove static TestShader.lightsCount
Xoppa [Mon, 1 Apr 2013 21:03:38 +0000 (23:03 +0200)]
Remove static TestShader.lightsCount

11 years agoMerge pull request #328 from xoppa/new3dapi
Mario Zechner [Mon, 1 Apr 2013 20:32:29 +0000 (13:32 -0700)]
Merge pull request #328 from xoppa/new3dapi

New3dapi, various changes

11 years agoFix docs
Xoppa [Mon, 1 Apr 2013 20:31:35 +0000 (22:31 +0200)]
Fix docs

11 years agoRevert render signature
Xoppa [Mon, 1 Apr 2013 20:26:02 +0000 (22:26 +0200)]
Revert render signature

11 years agoAdd some additional methods to ModelBuilder and update the tests with the modified...
Xoppa [Mon, 1 Apr 2013 18:58:58 +0000 (20:58 +0200)]
Add some additional methods to ModelBuilder and update the tests with the modified ModelBatch#render signature.

11 years agoAdd BaseShaderProvider.
Xoppa [Mon, 1 Apr 2013 18:54:33 +0000 (20:54 +0200)]
Add BaseShaderProvider.

11 years agoRemove ModelInstance#copyMaterials and do that in copyNodes instead, add constructor...
Xoppa [Mon, 1 Apr 2013 18:51:52 +0000 (20:51 +0200)]
Remove ModelInstance#copyMaterials and do that in copyNodes instead, add constructor to specify the id(s) of the node to copy.

11 years agoUpdate gdxinvaders to render the arraylist at once.
Xoppa [Mon, 1 Apr 2013 18:48:48 +0000 (20:48 +0200)]
Update gdxinvaders to render the arraylist at once.

11 years agoSet shader before sorting, change signature so its possible to add multiple Renderabl...
Xoppa [Mon, 1 Apr 2013 18:47:42 +0000 (20:47 +0200)]
Set shader before sorting, change signature so its possible to add multiple RenderableProviders at once, add addding with only shader, add adding arrays.

11 years agoAdd Model#getManagedDisposables() and check if a Disposable already exists before...
Xoppa [Mon, 1 Apr 2013 18:44:54 +0000 (20:44 +0200)]
Add Model#getManagedDisposables() and check if a Disposable already exists before adding.

11 years agoUpdated CHANGES doc.
Tim Scott [Sun, 31 Mar 2013 13:08:50 +0000 (08:08 -0500)]
Updated CHANGES doc.

11 years agoUpdated gwt-backend emulation with Joint user data capability.
Tim Scott [Sun, 31 Mar 2013 13:03:40 +0000 (08:03 -0500)]
Updated gwt-backend emulation with Joint user data capability.

11 years agoJoints now can have user data associated with them.
Tim Scott [Sat, 30 Mar 2013 20:41:10 +0000 (15:41 -0500)]
Joints now can have user data associated with them.

11 years agofixed NetAPITest, StreamUtils import was borked
badlogic [Sat, 30 Mar 2013 09:40:33 +0000 (10:40 +0100)]
fixed NetAPITest, StreamUtils import was borked

11 years agominor clean up in JsonModelLoader
badlogic [Sat, 30 Mar 2013 09:01:32 +0000 (10:01 +0100)]
minor clean up in JsonModelLoader

11 years agoMerge pull request #323 from xoppa/new3dapi
Mario Zechner [Sat, 30 Mar 2013 08:55:36 +0000 (01:55 -0700)]
Merge pull request #323 from xoppa/new3dapi

New3dapi, remove old code, gles10 renderer, etc.

11 years agoThis shouldnt be included (was to test an issue on the tracker)
Xoppa [Sat, 30 Mar 2013 00:57:18 +0000 (01:57 +0100)]
This shouldnt be included (was to test an issue on the tracker)

11 years agoForgot to commit this (i should really cleanup)
Xoppa [Sat, 30 Mar 2013 00:37:49 +0000 (01:37 +0100)]
Forgot to commit this (i should really cleanup)

11 years ago- Remove old g3d stuff
Xoppa [Sat, 30 Mar 2013 00:26:55 +0000 (01:26 +0100)]
- Remove old g3d stuff

11 years ago- Update gdxinvaders to use new 3d api (todo: explosions)
Xoppa [Sat, 30 Mar 2013 00:24:57 +0000 (01:24 +0100)]
- Update gdxinvaders to use new 3d api (todo: explosions)

11 years ago- Update the tests to use the new 3d api
Xoppa [Sat, 30 Mar 2013 00:23:04 +0000 (01:23 +0100)]
- Update the tests to use the new 3d api

- Disable ShadowMappingTest and SoftMeshTest for now

11 years agoAdd GLES10Shader
Xoppa [Sat, 30 Mar 2013 00:20:46 +0000 (01:20 +0100)]
Add GLES10Shader

11 years ago- Move ObjLoader
Xoppa [Sat, 30 Mar 2013 00:18:51 +0000 (01:18 +0100)]
- Move ObjLoader

- Make JsonModelLoader dont implement ModelLoader
- Rename NewMaterial to Material
- Add ModelInstance constructor by position

11 years agoMove HttpParametersUtils and StreamUtils.
Justin Shapcott [Fri, 29 Mar 2013 14:45:05 +0000 (07:45 -0700)]
Move HttpParametersUtils and StreamUtils.

These new homes make more sense for these classes than the root package.

11 years agointroduced RenderableProvider, to generalize ModelBatch
badlogic [Thu, 28 Mar 2013 22:05:13 +0000 (23:05 +0100)]
introduced RenderableProvider, to generalize ModelBatch

11 years agomade attribte non-disposable again
badlogic [Thu, 28 Mar 2013 21:55:03 +0000 (22:55 +0100)]
made attribte non-disposable again

11 years agofixed up Xoppa's PR as discussed on IRC
badlogic [Thu, 28 Mar 2013 21:48:39 +0000 (22:48 +0100)]
fixed up Xoppa's PR as discussed on IRC

11 years agoMerge pull request #322 from xoppa/new3dapi
Mario Zechner [Thu, 28 Mar 2013 21:41:11 +0000 (14:41 -0700)]
Merge pull request #322 from xoppa/new3dapi

New3dapi: Add Model.ManagedInstance, implement Disposable for Model, ModelInstance...

11 years agoi suck
badlogic [Thu, 28 Mar 2013 21:35:15 +0000 (22:35 +0100)]
i suck

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
badlogic [Thu, 28 Mar 2013 20:54:19 +0000 (21:54 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

11 years agomore animation stuff
badlogic [Thu, 28 Mar 2013 20:54:03 +0000 (21:54 +0100)]
more animation stuff

11 years agoRemove useless code
Xoppa [Thu, 28 Mar 2013 20:43:53 +0000 (21:43 +0100)]
Remove useless code

11 years agoAdd Model.ManagedInstance, implement Disposable for Model, ModelInstance, NewMaterial...
Xoppa [Thu, 28 Mar 2013 20:35:21 +0000 (21:35 +0100)]
Add Model.ManagedInstance, implement Disposable for Model, ModelInstance, NewMaterial, Attribute.

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 agocorrected url for blog post on 0.9.8 release
Seraphim [Wed, 27 Mar 2013 20:16:25 +0000 (21:16 +0100)]
corrected url for blog post on 0.9.8 release

11 years agoissue-1104 summarize changes
Seraphim [Wed, 27 Mar 2013 20:12:38 +0000 (21:12 +0100)]
issue-1104 summarize changes

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 agoChange renderer used in TiledMapBench.
Justin Shapcott [Wed, 27 Mar 2013 15:39:47 +0000 (08:39 -0700)]
Change renderer used in TiledMapBench.

11 years agoAdd disabledBackground to TextFieldStyle.
Justin Shapcott [Wed, 27 Mar 2013 14:17:27 +0000 (07:17 -0700)]
Add disabledBackground to TextFieldStyle.

11 years agoAdd parens in TextField ternary operators.
Justin Shapcott [Wed, 27 Mar 2013 13:39:20 +0000 (06:39 -0700)]
Add parens in TextField ternary operators.

11 years agoMerge pull request #320 from MobiDevelop/scene2d
Nathan Sweet [Wed, 27 Mar 2013 13:04:33 +0000 (06:04 -0700)]
Merge pull request #320 from MobiDevelop/scene2d

Add focused styles for TextField.

11 years agoMerge pull request #319 from guoguo12/master
Mario Zechner [Wed, 27 Mar 2013 07:23:52 +0000 (00:23 -0700)]
Merge pull request #319 from guoguo12/master

Make order of modifiers consistent

11 years agoMake order of modifiers consistent
Allen Guo [Wed, 27 Mar 2013 06:17:32 +0000 (03:17 -0300)]
Make order of modifiers consistent

11 years agoAdd focused styles for TextField.
Justin Shapcott [Wed, 27 Mar 2013 05:28:45 +0000 (22:28 -0700)]
Add focused styles for TextField.

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