OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoUpdate swig to version 2.0.10
Xoppa [Thu, 6 Jun 2013 18:37:38 +0000 (20:37 +0200)]
Update swig to version 2.0.10

11 years agoBullet: Fix swig with correct Model path
Xoppa [Thu, 6 Jun 2013 18:23:26 +0000 (20:23 +0200)]
Bullet: Fix swig with correct Model path

11 years agoMerge pull request #461 from apautrot/master
MobiDevelop [Thu, 6 Jun 2013 13:13:48 +0000 (06:13 -0700)]
Merge pull request #461 from apautrot/master

Added missing key mapping in getLwjglKeyCode

11 years agoMerge pull request #460 from zbarnett/master
MobiDevelop [Thu, 6 Jun 2013 13:12:57 +0000 (06:12 -0700)]
Merge pull request #460 from zbarnett/master

[fixed] DefaultGroupStrategy now works with OpenGL 2.0

11 years agoAdded missing key mapping in getLwjglKeyCode, for keys APOSTROPHE, END, PAGE_DOWN...
apautrot [Thu, 6 Jun 2013 09:11:47 +0000 (11:11 +0200)]
Added missing key mapping in getLwjglKeyCode, for keys APOSTROPHE, END, PAGE_DOWN, PAGE_UP, INSERT.

11 years ago[fixed] DefaultGroupStrategy now works while using OpenGL 2.0
Zeb Barnett [Thu, 6 Jun 2013 06:40:33 +0000 (01:40 -0500)]
[fixed] DefaultGroupStrategy now works while using OpenGL 2.0

11 years agoMerge pull request #459 from vbousquet/master
Nathan Sweet [Wed, 5 Jun 2013 20:00:33 +0000 (13:00 -0700)]
Merge pull request #459 from vbousquet/master

TexturePacker2 : make Page & Rect public to allow reuse in other projects

11 years agoMake Page and Rect public to allow reuse and extension
Vincent Bousquet [Wed, 5 Jun 2013 19:09:36 +0000 (21:09 +0200)]
Make Page and Rect public to allow reuse and extension

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Wed, 5 Jun 2013 16:48:02 +0000 (18:48 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoFixed JGLFW command key on Mac.
NathanSweet [Wed, 5 Jun 2013 16:47:46 +0000 (18:47 +0200)]
Fixed JGLFW command key on Mac.

I had broke it because I break the things.

11 years agoMerge pull request #458 from xoppa/3dapi2
Mario Zechner [Wed, 5 Jun 2013 16:02:05 +0000 (09:02 -0700)]
Merge pull request #458 from xoppa/3dapi2

Fix GLES10Shader texture wrap

11 years agoFix GLES10Shader texture wrap
Xoppa [Wed, 5 Jun 2013 15:52:53 +0000 (17:52 +0200)]
Fix GLES10Shader texture wrap

11 years agoMerge pull request #435 from moly/mediapan
Mario Zechner [Tue, 4 Jun 2013 10:53:06 +0000 (03:53 -0700)]
Merge pull request #435 from moly/mediapan

Added panning support for Music

11 years agoMerge pull request #451 from xoppa/3dapi2
Mario Zechner [Mon, 3 Jun 2013 22:16:13 +0000 (15:16 -0700)]
Merge pull request #451 from xoppa/3dapi2

Add AnimationController & strong typed fixed length array to UBJsonReader

11 years agoUpdate tests to use AnimationController
Xoppa [Mon, 3 Jun 2013 22:15:34 +0000 (00:15 +0200)]
Update tests to use AnimationController

11 years agoMerge pull request #457 from ttencate/master
Mario Zechner [Mon, 3 Jun 2013 22:14:45 +0000 (15:14 -0700)]
Merge pull request #457 from ttencate/master

Check for GL_FRAMEBUFFER_UNSUPPORTED error from glCheckFramebufferStatus

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx into 3dapi2
Xoppa [Mon, 3 Jun 2013 21:41:17 +0000 (23:41 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi2

11 years agoAdd AnimationController
Xoppa [Mon, 3 Jun 2013 21:11:59 +0000 (23:11 +0200)]
Add AnimationController

11 years agoCheck for GL_FRAMEBUFFER_UNSUPPORTED error from glCheckFramebufferStatus
Thomas ten Cate [Mon, 3 Jun 2013 19:41:00 +0000 (20:41 +0100)]
Check for GL_FRAMEBUFFER_UNSUPPORTED error from glCheckFramebufferStatus

According to the OpenGL ES 2.0 spec
(http://www.khronos.org/registry/gles/specs/2.0/es_cm_spec_2.0.24.pdf),
CheckFramebufferStatus can return FRAMEBUFFER_UNSUPPORTED if e.g. the
texture isn't a color-renderable format. We should throw in that case,
not silently fail to work. Also throw for any other cases that aren't
FRAMEBUFFER_COMPLETE; according to the spec there shouldn't be any.

Also add some documentation about officially supported formats. In
particular, RGB888 and RGBA8888 do work on many devices, but aren't
listed in the spec as color-renderable formats.

11 years agoMinor organization.
NathanSweet [Mon, 3 Jun 2013 10:21:23 +0000 (12:21 +0200)]
Minor organization.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 3 Jun 2013 10:20:56 +0000 (12:20 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoMerge pull request #456 from SG57/patch-1
Nathan Sweet [Mon, 3 Jun 2013 10:20:43 +0000 (03:20 -0700)]
Merge pull request #456 from SG57/patch-1

SelectBox: maxListCount off-by-one bug quick fix

11 years agoSelectBox: maxListCount off-by-one bug quick fix
Cord Rehn [Mon, 3 Jun 2013 06:47:41 +0000 (00:47 -0600)]
SelectBox: maxListCount off-by-one bug quick fix

The obsolete height-fitting code has a chance to cause an off-by-one-item bug in the drop down box due to a possible precision loss from [ height -=  height % itemHeight ].

This height fitting code is obsolete and unneeded as of the patch implementing maxListCount where the height is calculated off desired number of items and not prefHeight().  This fix simply removes the old code.

This height fitting is now handled

11 years agoAdd new classes to GWT module definition.
Justin Shapcott [Sun, 2 Jun 2013 20:49:38 +0000 (13:49 -0700)]
Add new classes to GWT module definition.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sun, 2 Jun 2013 20:36:20 +0000 (22:36 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoFixed delete key adding char to textfield.
NathanSweet [Sun, 2 Jun 2013 19:30:59 +0000 (21:30 +0200)]
Fixed delete key adding char to textfield.

11 years agoMerge pull request #430 from dylanetaft/master
MobiDevelop [Sun, 2 Jun 2013 19:09:44 +0000 (12:09 -0700)]
Merge pull request #430 from dylanetaft/master

Add support for GID attribute & Issue 1477 Fix

11 years agoAvoid potential precision loss during conversion from long millis time to float secon...
Dylan Taft [Sun, 2 Jun 2013 17:45:49 +0000 (13:45 -0400)]
Avoid potential precision loss during conversion from long millis time to float seconds time by subtracting intial time in millis in updateAnimationBaseTime function

11 years agoIssue 1477 - AnimatedTiledMapsTile should use an interval of float seconds, not float ms
Dylan Taft [Sun, 2 Jun 2013 04:20:39 +0000 (00:20 -0400)]
Issue 1477 - AnimatedTiledMapsTile should use an interval of float seconds, not float ms

11 years agoAdd support for Tiled map GID object property in AtlasTmxMapLoader
Dylan Taft [Sun, 2 Jun 2013 00:51:50 +0000 (20:51 -0400)]
Add support for Tiled map GID object property in AtlasTmxMapLoader

11 years agoTableLayout updates.
NathanSweet [Sun, 2 Jun 2013 13:56:59 +0000 (15:56 +0200)]
TableLayout updates.

* Don't invalidate in computeSize, which would cause another layout.
* Don't apply toolkit width/height to widget sizes, as this doesn't work for nested tables. Eg, the outer table would double the inner table's prefwidth, which has already been doubled by the inner table.

11 years agoUpdates for the max selectbox list feature.
NathanSweet [Sun, 2 Jun 2013 13:47:40 +0000 (15:47 +0200)]
Updates for the max selectbox list feature.

11 years agoMerge pull request #454 from SG57/patch-1
Nathan Sweet [Sun, 2 Jun 2013 13:36:27 +0000 (06:36 -0700)]
Merge pull request #454 from SG57/patch-1

SelectBox: added set max # items to display in dropdown

11 years agoSelectBox: added set max # items to display in dropdown
Cord Rehn [Sun, 2 Jun 2013 13:11:00 +0000 (07:11 -0600)]
SelectBox: added set max # items to display in dropdown

Added backwards compatible functionality for configuring the max # of items to display in the dropdown SelectList.

You set the maximum number of items you want displayed in the dropdown box until scrolling is required, or <= 0 to have it list them all, but should it reach the bottom/top of the screen then scrolling is required.

This is also a solution to an API defect. There was no previous easy way to modify the inner SelectList's prefHeight() to adjust the dropdown list's displayed height.

11 years agoNo need to set button size when it doesn't contain children.
NathanSweet [Sun, 2 Jun 2013 12:35:32 +0000 (14:35 +0200)]
No need to set button size when it doesn't contain children.

11 years agoMerge pull request #452 from SG57/patch-1
Nathan Sweet [Sun, 2 Jun 2013 08:23:57 +0000 (01:23 -0700)]
Merge pull request #452 from SG57/patch-1

TextField bug: DELETE char not notifying listener

11 years agoTextField bug: DELETE char not notifying listener
SG57 [Sun, 2 Jun 2013 01:34:23 +0000 (19:34 -0600)]
TextField bug: DELETE char not notifying listener

Quick fix.

When the DELETE key was pressed, it was returning before notifying the attached TextFieldListener that its respective TextField was changed.

If this is intended behavior (which I pray it isn't...), then we should at least be consistent and handle the BACKSPACE case the same as well.

11 years agoAdd strong typed fixed length array to UBJsonReader
Xoppa [Sat, 1 Jun 2013 23:08:39 +0000 (01:08 +0200)]
Add strong typed fixed length array to UBJsonReader

11 years agoMerge pull request #449 from frustaci/patch-1
Mario Zechner [Sat, 1 Jun 2013 22:07:53 +0000 (15:07 -0700)]
Merge pull request #449 from frustaci/patch-1

Update Shape.java

11 years agoAllow setting your own TableToolkit.
NathanSweet [Sat, 1 Jun 2013 19:40:58 +0000 (21:40 +0200)]
Allow setting your own TableToolkit.

11 years agoUpdate Shape.java
frustaci [Sat, 1 Jun 2013 13:28:14 +0000 (10:28 -0300)]
Update Shape.java

Small ordinal fix in shape as per jniGetType().
Now Shape.Type.Polygon.ordinal()returns 2 as expected.

11 years agoFixed right command key on Mac.
NathanSweet [Sat, 1 Jun 2013 12:49:16 +0000 (14:49 +0200)]
Fixed right command key on Mac.

11 years agoFixed actions on an actor being cleared by an action.
NathanSweet [Sat, 1 Jun 2013 12:34:58 +0000 (14:34 +0200)]
Fixed actions on an actor being cleared by an action.

11 years agoMinor changes to match other scene2d.ui code.
NathanSweet [Sat, 1 Jun 2013 12:17:32 +0000 (14:17 +0200)]
Minor changes to match other scene2d.ui code.

11 years agoMerge pull request #446 from SG57/patch-1
Nathan Sweet [Sat, 1 Jun 2013 12:13:32 +0000 (05:13 -0700)]
Merge pull request #446 from SG57/patch-1

List: select 'nothing', and disable item selection

11 years agoMerge pull request #447 from Yonsh/patch-1
Nathan Sweet [Sat, 1 Jun 2013 11:35:28 +0000 (04:35 -0700)]
Merge pull request #447 from Yonsh/patch-1

Add ObjectFloatMap to gwt module definition

11 years agoAdd ObjectFloatMap
Yonsh [Sat, 1 Jun 2013 08:50:37 +0000 (16:50 +0800)]
Add ObjectFloatMap

11 years agoList: added ability to select 'nothing', and ability to disable item selection ...
SG57 [Sat, 1 Jun 2013 06:40:01 +0000 (00:40 -0600)]
List:  added ability to select 'nothing', and ability to disable item selection (+ bug/defect fix)

This adds functionality to the List Actor so it may behave like that of a ListView akin to Android's.  This is backwards compatible.

This is essential in situations where you may not always want to have an item selected (like a touch-based file browser), or where you may not want items even selectable at all (like during a tutorial).

The bug/defect fix was if you look in the old setSelection(String name) method, you'll see it sets the selectedIndex to -1, then tries to find an item with that name.  When it doesn't, it leaves the selectedIndex at -1 which essentially sets it to nothing.

*Note*
When the List is NOT selectable, it will no longer eat its touch event meaning they will still propagate down.

I'm not 100% sure if that is the behavior you want versus the contrary where it eats the touch event despite not doing anything.  Regardless, I have a note of this behavior change in the setSelectable comment.

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 21:30:50 +0000 (23:30 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoadded diffusecolortexture sub shader
badlogic [Fri, 31 May 2013 21:30:38 +0000 (23:30 +0200)]
added diffusecolortexture sub shader

11 years agoMerge pull request #445 from Jadems/master
Nathan Sweet [Fri, 31 May 2013 21:28:41 +0000 (14:28 -0700)]
Merge pull request #445 from Jadems/master

GestureDetector no longer consumes events.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 31 May 2013 21:05:10 +0000 (23:05 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoRemoved JsonValue boxing, boolean field, and addChild. Updated JsonReader.
NathanSweet [Fri, 31 May 2013 21:02:43 +0000 (23:02 +0200)]
Removed JsonValue boxing, boolean field, and addChild. Updated JsonReader.

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 20:53:04 +0000 (22:53 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoadded diffuse texture sub shader
badlogic [Fri, 31 May 2013 20:52:56 +0000 (22:52 +0200)]
added diffuse texture sub shader

11 years agoGestureDetector no longer consumes any events
Matthew Williamson [Fri, 31 May 2013 20:43:13 +0000 (15:43 -0500)]
GestureDetector no longer consumes any events

Reverting a previous change of mine. On closer inspection, having the
GestureDetector consume touch up or drag likely causes more trouble than
good.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 31 May 2013 20:29:28 +0000 (22:29 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoMerge pull request #444 from xoppa/3dapi2
Nathan Sweet [Fri, 31 May 2013 20:28:14 +0000 (13:28 -0700)]
Merge pull request #444 from xoppa/3dapi2

Faster load ubjson

11 years agoFaster load ubjson
Xoppa [Fri, 31 May 2013 20:23:41 +0000 (22:23 +0200)]
Faster load ubjson

11 years agomore fixes
badlogic [Fri, 31 May 2013 20:19:57 +0000 (22:19 +0200)]
more fixes

11 years agomore changes to composite shader
badlogic [Fri, 31 May 2013 20:06:56 +0000 (22:06 +0200)]
more changes to composite shader

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 20:02:39 +0000 (22:02 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoadded initial draft of composite shader and transform subshader
badlogic [Fri, 31 May 2013 20:02:24 +0000 (22:02 +0200)]
added initial draft of composite shader and transform subshader

11 years agoJavadocs.
NathanSweet [Fri, 31 May 2013 19:20:55 +0000 (21:20 +0200)]
Javadocs.

11 years agoMerge pull request #443 from xoppa/3dapi2
Mario Zechner [Fri, 31 May 2013 18:21:17 +0000 (11:21 -0700)]
Merge pull request #443 from xoppa/3dapi2

Add transform to calculateBounds, fix transform

11 years agoAdd transform to calculateBounds, fix transform
Xoppa [Fri, 31 May 2013 17:13:17 +0000 (19:13 +0200)]
Add transform to calculateBounds, fix transform

11 years agofixed ios check in iosgl20.cpp
badlogic [Fri, 31 May 2013 16:24:14 +0000 (18:24 +0200)]
fixed ios check in iosgl20.cpp

11 years agofixed fetch script to pull in ios robovm natives into proper location
badlogic [Fri, 31 May 2013 11:55:01 +0000 (13:55 +0200)]
fixed fetch script to pull in ios robovm natives into proper location

11 years agoadded gdx-invaders robovm project
badlogic [Fri, 31 May 2013 11:17:11 +0000 (13:17 +0200)]
added gdx-invaders robovm project

11 years agofixed robovm backend graphics initialization, create was called at an unfortunate...
badlogic [Fri, 31 May 2013 10:58:46 +0000 (12:58 +0200)]
fixed robovm backend graphics initialization, create was called at an unfortunate time :p, super jumper et al are working

11 years agoadded vector pinball and super jumper robovm projects. not working
badlogic [Fri, 31 May 2013 10:28:15 +0000 (12:28 +0200)]
added vector pinball and super jumper robovm projects. not working

11 years agofixed more stuff, working
badlogic [Fri, 31 May 2013 02:39:39 +0000 (04:39 +0200)]
fixed more stuff, working

11 years agominor ios fixups
badlogic [Fri, 31 May 2013 02:26:33 +0000 (04:26 +0200)]
minor ios fixups

11 years agoadded robovm backend, initial commit
badlogic [Fri, 31 May 2013 02:07:36 +0000 (04:07 +0200)]
added robovm backend, initial commit

11 years agofixed a super nasty bug in AssetManager, concurrency is hard :)
badlogic [Fri, 31 May 2013 00:18:58 +0000 (02:18 +0200)]
fixed a super nasty bug in AssetManager, concurrency is hard :)

11 years agoMerge pull request #441 from xoppa/3dapi2
Mario Zechner [Thu, 30 May 2013 23:07:48 +0000 (16:07 -0700)]
Merge pull request #441 from xoppa/3dapi2

Update ModelLoaderTest

11 years agofixed merge conflict
moly [Thu, 30 May 2013 19:17:37 +0000 (20:17 +0100)]
fixed merge conflict

11 years agofixed pan being set in OpenALMusic#play
moly [Thu, 30 May 2013 19:12:37 +0000 (20:12 +0100)]
fixed pan being set in OpenALMusic#play

11 years agoUpdate ModelLoaderTest
Xoppa [Thu, 30 May 2013 18:08:56 +0000 (20:08 +0200)]
Update ModelLoaderTest

11 years agoand one more update
badlogic [Thu, 30 May 2013 17:26:58 +0000 (19:26 +0200)]
and one more update

11 years agomore updates
badlogic [Thu, 30 May 2013 17:23:35 +0000 (19:23 +0200)]
more updates

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 17:21:00 +0000 (19:21 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agosmall change to model loader test
badlogic [Thu, 30 May 2013 17:20:51 +0000 (19:20 +0200)]
small change to model loader test

11 years agoMerge pull request #440 from xoppa/3dapi2
Mario Zechner [Thu, 30 May 2013 17:19:01 +0000 (10:19 -0700)]
Merge pull request #440 from xoppa/3dapi2

Add BasicScene3DTest

11 years agoadded simple cube with two textures, added ModelLoaderTest to reproduce loader issue
badlogic [Thu, 30 May 2013 17:16:02 +0000 (19:16 +0200)]
added simple cube with two textures, added ModelLoaderTest to reproduce loader issue

11 years agoAdd BasicScene3DTest
Xoppa [Thu, 30 May 2013 16:55:08 +0000 (18:55 +0200)]
Add BasicScene3DTest

11 years agofixed pax britannica, vectorpinball png crush settings et. al.
badlogic [Thu, 30 May 2013 16:43:10 +0000 (18:43 +0200)]
fixed pax britannica, vectorpinball png crush settings et. al.

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 16:25:28 +0000 (18:25 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoupdated libobjectal.dll, fixed vector-pinball png crush settings
badlogic [Thu, 30 May 2013 16:25:17 +0000 (18:25 +0200)]
updated libobjectal.dll, fixed vector-pinball png crush settings

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 30 May 2013 16:15:51 +0000 (18:15 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded clamp() to allow a min/max range outside the slider's range.
NathanSweet [Thu, 30 May 2013 16:15:32 +0000 (18:15 +0200)]
Added clamp() to allow a min/max range outside the slider's range.

11 years agofixed pax-britannica png crush settings
badlogic [Thu, 30 May 2013 16:10:13 +0000 (18:10 +0200)]
fixed pax-britannica png crush settings

11 years agofixed super jumper png crush settings
badlogic [Thu, 30 May 2013 16:06:51 +0000 (18:06 +0200)]
fixed super jumper png crush settings

11 years agoupdated CHANGES
badlogic [Thu, 30 May 2013 15:34:46 +0000 (17:34 +0200)]
updated CHANGES

11 years agoremoved File#file(), removed box2d-editor
badlogic [Thu, 30 May 2013 15:34:10 +0000 (17:34 +0200)]
removed File#file(), removed box2d-editor

11 years agofixed issue 1456, Intersector#intersectRayBounds had a bug
badlogic [Thu, 30 May 2013 15:18:55 +0000 (17:18 +0200)]
fixed issue 1456, Intersector#intersectRayBounds had a bug

11 years agofixed issue 1459, Decal#setScaleY was wrong
badlogic [Thu, 30 May 2013 15:06:58 +0000 (17:06 +0200)]
fixed issue 1459, Decal#setScaleY was wrong

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 30 May 2013 12:31:36 +0000 (14:31 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded int rgba methods for easier setting using 0x11223344.
NathanSweet [Thu, 30 May 2013 12:31:27 +0000 (14:31 +0200)]
Added int rgba methods for easier setting using 0x11223344.

11 years agoFixed pref width.
NathanSweet [Thu, 30 May 2013 12:30:53 +0000 (14:30 +0200)]
Fixed pref width.