OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
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 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 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.

11 years agoFormat.
NathanSweet [Thu, 30 May 2013 12:30:42 +0000 (14:30 +0200)]
Format.

11 years agoMerge pull request #438 from Jadems/master
Nathan Sweet [Thu, 30 May 2013 06:04:33 +0000 (23:04 -0700)]
Merge pull request #438 from Jadems/master

Fixed long presses being handled incorrectly.

11 years agoFixed long presses behaving incorrectly.
Matthew Williamson [Thu, 30 May 2013 03:23:23 +0000 (22:23 -0500)]
Fixed long presses behaving incorrectly.

Fixed long presses causing events not to be consumed by the
GestureDetector. This issue was causing the GestureDetector to return
false in touchDragged and touchUp whenever a longPress returned true
resulting in unexpected behavior which one would likely only notice when
chaining InputProcessors in an InputMultiplexer.

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

11 years agofixed cuboc
badlogic [Thu, 30 May 2013 00:52:11 +0000 (02:52 +0200)]
fixed cuboc

11 years agoMerge pull request #437 from xoppa/3dapi2
Xoppa [Wed, 29 May 2013 21:09:50 +0000 (14:09 -0700)]
Merge pull request #437 from xoppa/3dapi2

Fix opacity on models

11 years agoFix opacity on models
Xoppa [Wed, 29 May 2013 21:08:29 +0000 (23:08 +0200)]
Fix opacity on models

11 years agoMerge pull request #434 from moly/androidaudiofix
Mario Zechner [Wed, 29 May 2013 20:48:45 +0000 (13:48 -0700)]
Merge pull request #434 from moly/androidaudiofix

AndroidSound#play/loop now returns -1 on failure, to match other backends

11 years agoMerge pull request #436 from justinbowes/1470_osx_backspace_causes_forward_delete
Mario Zechner [Wed, 29 May 2013 20:31:40 +0000 (13:31 -0700)]
Merge pull request #436 from justinbowes/1470_osx_backspace_causes_forward_delete

Fix for Issue 1470: On OS X TextField deletes symbols from the right side

11 years agoFix OSX backspace behaving like delete key due to bug in LWJGL Keyboard.getEventChara...
Justin Bowes [Wed, 29 May 2013 19:38:06 +0000 (15:38 -0400)]
Fix OSX backspace behaving like delete key due to bug in LWJGL Keyboard.getEventCharacter()

11 years agoMerge pull request #429 from xoppa/3dapi2
Mario Zechner [Wed, 29 May 2013 15:48:38 +0000 (08:48 -0700)]
Merge pull request #429 from xoppa/3dapi2

Add skeletontest and various fixes

11 years agoFix GLES10 shader
Xoppa [Wed, 29 May 2013 15:17:17 +0000 (17:17 +0200)]
Fix GLES10 shader

11 years agoAdded viewport settings to Stage.
NathanSweet [Wed, 29 May 2013 02:42:07 +0000 (04:42 +0200)]
Added viewport settings to Stage.

11 years agoFix MeshBuilder#box
Xoppa [Tue, 28 May 2013 23:45:57 +0000 (01:45 +0200)]
Fix MeshBuilder#box

11 years agoAllow nested calls to begin().
NathanSweet [Tue, 28 May 2013 22:41:41 +0000 (00:41 +0200)]
Allow nested calls to begin().

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Tue, 28 May 2013 21:43:24 +0000 (23:43 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoImproved generics and fixed removeAll. Thanks Javier J. <javierj@us.es>!
NathanSweet [Tue, 28 May 2013 21:42:25 +0000 (23:42 +0200)]
Improved generics and fixed removeAll. Thanks Javier J. <javierj@us.es>!

11 years agoMerge pull request #433 from MoopsLC/master
Nathan Sweet [Tue, 28 May 2013 21:20:25 +0000 (14:20 -0700)]
Merge pull request #433 from MoopsLC/master

draw substring of BitmapFontCache

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

11 years agoFixed pooling cells.
NathanSweet [Tue, 28 May 2013 20:19:12 +0000 (22:19 +0200)]
Fixed pooling cells.

11 years agoUpdate BitmapFontCache.java
MoopsLC [Tue, 28 May 2013 17:50:38 +0000 (14:50 -0300)]
Update BitmapFontCache.java

allow for drawing a substring of the cache for letter-by-letter text scrolling

11 years agoDefault to GL_REPEAT, add mtl shininess and opacity, fix BlendingAttribute constructor
Xoppa [Tue, 28 May 2013 17:44:46 +0000 (19:44 +0200)]
Default to GL_REPEAT, add mtl shininess and opacity, fix BlendingAttribute constructor

11 years agoAndroidSound#play/loop now returns -1 on failure, to match other backends
moly [Tue, 28 May 2013 17:22:34 +0000 (18:22 +0100)]
AndroidSound#play/loop now returns -1 on failure, to match other backends

11 years agoMerge pull request #427 from veger/master
Nathan Sweet [Tue, 28 May 2013 14:54:36 +0000 (07:54 -0700)]
Merge pull request #427 from veger/master

ImageTextButtonStyle: Do not set fields twice and add constructor

11 years agoAdded getPressedButton.
NathanSweet [Tue, 28 May 2013 14:40:04 +0000 (16:40 +0200)]
Added getPressedButton.

11 years agoPooled cells.
NathanSweet [Tue, 28 May 2013 14:39:54 +0000 (16:39 +0200)]
Pooled cells.

11 years agoAdd skeletontest
Xoppa [Mon, 27 May 2013 22:05:46 +0000 (00:05 +0200)]
Add skeletontest

11 years agoDisabled debug.
NathanSweet [Mon, 27 May 2013 20:53:43 +0000 (22:53 +0200)]
Disabled debug.

11 years agoDo not set ImageTextButtonStyle fields twice
Maarten Bezemer [Mon, 27 May 2013 17:21:25 +0000 (19:21 +0200)]
Do not set ImageTextButtonStyle fields twice
Add constructor accepting TextButtonStyle objects

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 27 May 2013 16:57:47 +0000 (18:57 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoRemove widget from cell when removed from table.
NathanSweet [Mon, 27 May 2013 16:45:10 +0000 (18:45 +0200)]
Remove widget from cell when removed from table.

11 years agoAdded sets to changes.
NathanSweet [Mon, 27 May 2013 16:45:01 +0000 (18:45 +0200)]
Added sets to changes.

11 years agoFixed 1454.
NathanSweet [Mon, 27 May 2013 16:44:52 +0000 (18:44 +0200)]
Fixed 1454.

11 years agoAdded sets!
NathanSweet [Mon, 27 May 2013 16:44:45 +0000 (18:44 +0200)]
Added sets!

11 years agoFixed SpriteBatch float[] method offsets.
NathanSweet [Mon, 27 May 2013 16:44:29 +0000 (18:44 +0200)]
Fixed SpriteBatch float[] method offsets.

11 years agoFixed array addAll.
NathanSweet [Mon, 27 May 2013 16:44:10 +0000 (18:44 +0200)]
Fixed array addAll.

11 years agomerged with master
badlogic [Sun, 26 May 2013 12:48:04 +0000 (14:48 +0200)]
merged with master

11 years agomoved platform poms to gdx/jni/maven, do the same for extensions later on
badlogic [Sun, 26 May 2013 12:47:04 +0000 (14:47 +0200)]
moved platform poms to gdx/jni/maven, do the same for extensions later on