OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoRefactor lighting
Xoppa [Wed, 17 Apr 2013 17:13:03 +0000 (19:13 +0200)]
Refactor lighting

11 years agoRename Material#add to #set, allow mask for vertex attributes.
Xoppa [Mon, 15 Apr 2013 21:40:24 +0000 (23:40 +0200)]
Rename Material#add to #set, allow mask for vertex attributes.

11 years agoFix colorSet and basic shapes
Xoppa [Mon, 15 Apr 2013 16:33:49 +0000 (18:33 +0200)]
Fix colorSet and basic shapes

11 years agoAdd base 3d test
Xoppa [Mon, 15 Apr 2013 15:21:15 +0000 (17:21 +0200)]
Add base 3d test

11 years agoAdd vertex attribute defines to DefaultShader
Xoppa [Mon, 15 Apr 2013 15:01:20 +0000 (17:01 +0200)]
Add vertex attribute defines to DefaultShader

11 years agoMerge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Xoppa [Mon, 15 Apr 2013 14:56:20 +0000 (16:56 +0200)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

11 years agoAdd MeshPartBuilder#setColor, line, triangle, primitiveType etc.
Xoppa [Mon, 15 Apr 2013 14:55:55 +0000 (16:55 +0200)]
Add MeshPartBuilder#setColor, line, triangle, primitiveType etc.

11 years agoMerge pull request #343 from xoppa/new3dapi
Mario Zechner [Mon, 15 Apr 2013 13:17:33 +0000 (06:17 -0700)]
Merge pull request #343 from xoppa/new3dapi

new3dapi: use CameraInputController for bullet tests

11 years agoRemove unneeded code
Xoppa [Sat, 13 Apr 2013 00:16:06 +0000 (02:16 +0200)]
Remove unneeded code

11 years agouse CameraInputController for bullet tests
Xoppa [Fri, 12 Apr 2013 22:53:46 +0000 (00:53 +0200)]
use CameraInputController for bullet tests

11 years agotoggling flags
badlogic [Fri, 12 Apr 2013 22:15:11 +0000 (00:15 +0200)]
toggling flags

11 years agoadded invader rotation and lights
badlogic [Fri, 12 Apr 2013 20:46:08 +0000 (22:46 +0200)]
added invader rotation and lights

11 years agoMerge branch 'master' into new3dapi
badlogic [Fri, 12 Apr 2013 20:36:25 +0000 (22:36 +0200)]
Merge branch 'master' into new3dapi

11 years agoMerge pull request #342 from xoppa/new3dapi
Mario Zechner [Fri, 12 Apr 2013 20:35:48 +0000 (13:35 -0700)]
Merge pull request #342 from xoppa/new3dapi

New3dapi: small changes

11 years agoMerge pull request #339 from fivevsthree/master
Mario Zechner [Fri, 12 Apr 2013 20:32:50 +0000 (13:32 -0700)]
Merge pull request #339 from fivevsthree/master

Added getVolume to Music

11 years agoSmall changes: share modelinstance#transform and add camerainputcontroller
Xoppa [Fri, 12 Apr 2013 19:54:36 +0000 (21:54 +0200)]
Small changes: share modelinstance#transform and add camerainputcontroller

11 years agoMerge pull request #341 from frustaci/patch-1
Nathan Sweet [Fri, 12 Apr 2013 19:36:40 +0000 (12:36 -0700)]
Merge pull request #341 from frustaci/patch-1

Update ParticleEmitterBox2D.java

11 years agoUpdate ParticleEmitterBox2D.java
frustaci [Fri, 12 Apr 2013 13:29:07 +0000 (10:29 -0300)]
Update ParticleEmitterBox2D.java

The particleCollided check is just plain wrong and is making the whole particleemitter to react to the collisions happening instead of the single particle that collided.

11 years agoMerge pull request #340 from xoppa/new3dapi
Mario Zechner [Thu, 11 Apr 2013 22:31:20 +0000 (15:31 -0700)]
Merge pull request #340 from xoppa/new3dapi

New3dapi: Add ModelLoader

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 11 Apr 2013 05:16:43 +0000 (07:16 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoBetter fix for issue 1345.
NathanSweet [Thu, 11 Apr 2013 05:15:46 +0000 (07:15 +0200)]
Better fix for issue 1345.

11 years agoAdded boolean to turn off float color mask.
NathanSweet [Thu, 11 Apr 2013 05:15:32 +0000 (07:15 +0200)]
Added boolean to turn off float color mask.

11 years agoFix faces
Xoppa [Tue, 9 Apr 2013 19:02:34 +0000 (21:02 +0200)]
Fix faces

11 years agoAdd .obj loader
Xoppa [Tue, 9 Apr 2013 17:27:54 +0000 (19:27 +0200)]
Add .obj loader

11 years agoUpdated CHANGES file
Steven Plude [Tue, 9 Apr 2013 16:37:14 +0000 (12:37 -0400)]
Updated CHANGES file

11 years agoAdd ModelLoader
Xoppa [Tue, 9 Apr 2013 16:28:27 +0000 (18:28 +0200)]
Add ModelLoader

11 years agoIOS and GWT backends use volume field
Steven Plude [Tue, 9 Apr 2013 15:56:55 +0000 (11:56 -0400)]
IOS and GWT backends use volume field

11 years agoAdded getVolume to Music
Steven Plude [Tue, 9 Apr 2013 14:59:54 +0000 (10:59 -0400)]
Added getVolume to Music

11 years agoMerge pull request #333 from kreymerman/gwt_theme
MobiDevelop [Mon, 8 Apr 2013 23:16:35 +0000 (16:16 -0700)]
Merge pull request #333 from kreymerman/gwt_theme

Changed default Gwt theme to edited Chrome theme with gwt-prefixed css classes only

11 years agoSync GWT emulation to changes in core.
Justin Shapcott [Mon, 8 Apr 2013 22:32:52 +0000 (15:32 -0700)]
Sync GWT emulation to changes in core.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 8 Apr 2013 06:17:36 +0000 (08:17 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoFixed OSX crash on 10.7.* when window is resized.
NathanSweet [Mon, 8 Apr 2013 06:17:22 +0000 (08:17 +0200)]
Fixed OSX crash on 10.7.* when window is resized.

See JGLFW for other half of fix!

11 years agoMerge pull request #338 from jblambe/master
MobiDevelop [Mon, 8 Apr 2013 02:00:54 +0000 (19:00 -0700)]
Merge pull request #338 from jblambe/master

TMX Loader: Raise exceptions for unsupported formats

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 agoAdded error messages for unsupported formats:
John Bernard Lambe [Sun, 7 Apr 2013 19:09:28 +0000 (20:09 +0100)]
Added error messages for unsupported formats:
Previously a NullPointerException was thrown if the 'map/layer/data' tag had no 'encoding' attribute.
No 'encoding' attribute means that XML encoding is used, and this is not supported by the loader.
I also added a different exception for when there is an 'encoding' value that the loader does not recognise (for future encodings).
I also added a minor comment.

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

11 years agoMerge pull request #337 from TimeToPlay/feature
Nathan Sweet [Sun, 7 Apr 2013 13:39:17 +0000 (06:39 -0700)]
Merge pull request #337 from TimeToPlay/feature

Issue #1376 Solution for ParticleEditor keyboard events handler.

11 years agoIssue #1376 Solution for ParticleEditor keyboard events handler.
TimeToPlay [Sun, 7 Apr 2013 09:58:39 +0000 (12:58 +0300)]
Issue #1376 Solution for ParticleEditor keyboard events handler.

11 years agoSet default target FPS to 61.
NathanSweet [Sun, 7 Apr 2013 02:13:45 +0000 (04:13 +0200)]
Set default target FPS to 61.

Seems some drivers don't use vsync in windowed mode, so run flat out. This shouldn't hurt anything when vsync is working properly.

11 years agoFire an event on touchUp even if the value didn't change, so listeners can see when...
NathanSweet [Sun, 7 Apr 2013 02:12:20 +0000 (04:12 +0200)]
Fire an event on touchUp even if the value didn't change, so listeners can see when a drag ends via isDragging.

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

11 years agoFixed scrollpane padding.
NathanSweet [Sun, 7 Apr 2013 00:11:26 +0000 (02:11 +0200)]
Fixed scrollpane padding.

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.