OSDN Git Service
blackbluegl [Fri, 7 Jun 2013 13:22:42 +0000 (15:22 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx.git
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
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
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.
Zeb Barnett [Thu, 6 Jun 2013 06:40:33 +0000 (01:40 -0500)]
[fixed] DefaultGroupStrategy now works while using OpenGL 2.0
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
Vincent Bousquet [Wed, 5 Jun 2013 19:09:36 +0000 (21:09 +0200)]
Make Page and Rect public to allow reuse and extension
NathanSweet [Wed, 5 Jun 2013 16:48:02 +0000 (18:48 +0200)]
Merge remote-tracking branch 'origin/master'
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.
Mario Zechner [Wed, 5 Jun 2013 16:02:05 +0000 (09:02 -0700)]
Merge pull request #458 from xoppa/3dapi2
Fix GLES10Shader texture wrap
Xoppa [Wed, 5 Jun 2013 15:52:53 +0000 (17:52 +0200)]
Fix GLES10Shader texture wrap
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
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
Xoppa [Mon, 3 Jun 2013 22:15:34 +0000 (00:15 +0200)]
Update tests to use AnimationController
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
Xoppa [Mon, 3 Jun 2013 21:41:17 +0000 (23:41 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi2
Xoppa [Mon, 3 Jun 2013 21:11:59 +0000 (23:11 +0200)]
Add AnimationController
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.
NathanSweet [Mon, 3 Jun 2013 10:21:23 +0000 (12:21 +0200)]
Minor organization.
NathanSweet [Mon, 3 Jun 2013 10:20:56 +0000 (12:20 +0200)]
Merge remote-tracking branch 'origin/master'
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
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
BlackBluegL [Sun, 2 Jun 2013 21:58:27 +0000 (23:58 +0200)]
gdx test fixed
BlackBluegL [Sun, 2 Jun 2013 21:51:23 +0000 (23:51 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Conflicts resolved:
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
BlackBluegL [Sun, 2 Jun 2013 21:32:10 +0000 (23:32 +0200)]
* Fog can be null. null = no fog
* Fog distance is calculated in DefaultShader class
* DefaultShader check fog setup for a Renderable in canRender
* Test fixed
Justin Shapcott [Sun, 2 Jun 2013 20:49:38 +0000 (13:49 -0700)]
Add new classes to GWT module definition.
NathanSweet [Sun, 2 Jun 2013 20:36:20 +0000 (22:36 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sun, 2 Jun 2013 19:30:59 +0000 (21:30 +0200)]
Fixed delete key adding char to textfield.
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
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
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
Dylan Taft [Sun, 2 Jun 2013 00:51:50 +0000 (20:51 -0400)]
Add support for Tiled map GID object property in AtlasTmxMapLoader
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.
NathanSweet [Sun, 2 Jun 2013 13:47:40 +0000 (15:47 +0200)]
Updates for the max selectbox list feature.
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
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.
NathanSweet [Sun, 2 Jun 2013 12:35:32 +0000 (14:35 +0200)]
No need to set button size when it doesn't contain children.
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
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.
Xoppa [Sat, 1 Jun 2013 23:08:39 +0000 (01:08 +0200)]
Add strong typed fixed length array to UBJsonReader
Mario Zechner [Sat, 1 Jun 2013 22:07:53 +0000 (15:07 -0700)]
Merge pull request #449 from frustaci/patch-1
Update Shape.java
NathanSweet [Sat, 1 Jun 2013 19:40:58 +0000 (21:40 +0200)]
Allow setting your own TableToolkit.
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.
NathanSweet [Sat, 1 Jun 2013 12:49:16 +0000 (14:49 +0200)]
Fixed right command key on Mac.
NathanSweet [Sat, 1 Jun 2013 12:34:58 +0000 (14:34 +0200)]
Fixed actions on an actor being cleared by an action.
NathanSweet [Sat, 1 Jun 2013 12:17:32 +0000 (14:17 +0200)]
Minor changes to match other scene2d.ui code.
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
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
Yonsh [Sat, 1 Jun 2013 08:50:37 +0000 (16:50 +0800)]
Add ObjectFloatMap
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.
badlogic [Fri, 31 May 2013 21:30:50 +0000 (23:30 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 21:30:38 +0000 (23:30 +0200)]
added diffusecolortexture sub shader
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.
NathanSweet [Fri, 31 May 2013 21:05:10 +0000 (23:05 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Fri, 31 May 2013 21:02:43 +0000 (23:02 +0200)]
Removed JsonValue boxing, boolean field, and addChild. Updated JsonReader.
badlogic [Fri, 31 May 2013 20:53:04 +0000 (22:53 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 20:52:56 +0000 (22:52 +0200)]
added diffuse texture sub shader
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.
NathanSweet [Fri, 31 May 2013 20:29:28 +0000 (22:29 +0200)]
Merge remote-tracking branch 'origin/master'
Nathan Sweet [Fri, 31 May 2013 20:28:14 +0000 (13:28 -0700)]
Merge pull request #444 from xoppa/3dapi2
Faster load ubjson
Xoppa [Fri, 31 May 2013 20:23:41 +0000 (22:23 +0200)]
Faster load ubjson
badlogic [Fri, 31 May 2013 20:19:57 +0000 (22:19 +0200)]
more fixes
badlogic [Fri, 31 May 2013 20:06:56 +0000 (22:06 +0200)]
more changes to composite shader
badlogic [Fri, 31 May 2013 20:02:39 +0000 (22:02 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 20:02:24 +0000 (22:02 +0200)]
added initial draft of composite shader and transform subshader
NathanSweet [Fri, 31 May 2013 19:20:55 +0000 (21:20 +0200)]
Javadocs.
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
Xoppa [Fri, 31 May 2013 17:13:17 +0000 (19:13 +0200)]
Add transform to calculateBounds, fix transform
badlogic [Fri, 31 May 2013 16:24:14 +0000 (18:24 +0200)]
fixed ios check in iosgl20.cpp
badlogic [Fri, 31 May 2013 11:55:01 +0000 (13:55 +0200)]
fixed fetch script to pull in ios robovm natives into proper location
badlogic [Fri, 31 May 2013 11:17:11 +0000 (13:17 +0200)]
added gdx-invaders robovm project
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
badlogic [Fri, 31 May 2013 10:28:15 +0000 (12:28 +0200)]
added vector pinball and super jumper robovm projects. not working
blackbluegl [Fri, 31 May 2013 09:47:17 +0000 (11:47 +0200)]
+ fog distance changed in shader code (fade to fog before the camera clip geometry)
+ fog test case added
blackbluegl [Fri, 31 May 2013 09:09:31 +0000 (11:09 +0200)]
+ fog moved to Lights class ( fog is active if fog's alpha is bigger than 0 )
badlogic [Fri, 31 May 2013 02:39:39 +0000 (04:39 +0200)]
fixed more stuff, working
badlogic [Fri, 31 May 2013 02:26:33 +0000 (04:26 +0200)]
minor ios fixups
badlogic [Fri, 31 May 2013 02:07:36 +0000 (04:07 +0200)]
added robovm backend, initial commit
badlogic [Fri, 31 May 2013 00:18:58 +0000 (02:18 +0200)]
fixed a super nasty bug in AssetManager, concurrency is hard :)
Mario Zechner [Thu, 30 May 2013 23:07:48 +0000 (16:07 -0700)]
Merge pull request #441 from xoppa/3dapi2
Update ModelLoaderTest
moly [Thu, 30 May 2013 19:17:37 +0000 (20:17 +0100)]
fixed merge conflict
moly [Thu, 30 May 2013 19:12:37 +0000 (20:12 +0100)]
fixed pan being set in OpenALMusic#play
Xoppa [Thu, 30 May 2013 18:08:56 +0000 (20:08 +0200)]
Update ModelLoaderTest
badlogic [Thu, 30 May 2013 17:26:58 +0000 (19:26 +0200)]
and one more update
badlogic [Thu, 30 May 2013 17:23:35 +0000 (19:23 +0200)]
more updates
badlogic [Thu, 30 May 2013 17:21:00 +0000 (19:21 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 17:20:51 +0000 (19:20 +0200)]
small change to model loader test
Mario Zechner [Thu, 30 May 2013 17:19:01 +0000 (10:19 -0700)]
Merge pull request #440 from xoppa/3dapi2
Add BasicScene3DTest
badlogic [Thu, 30 May 2013 17:16:02 +0000 (19:16 +0200)]
added simple cube with two textures, added ModelLoaderTest to reproduce loader issue
Xoppa [Thu, 30 May 2013 16:55:08 +0000 (18:55 +0200)]
Add BasicScene3DTest
badlogic [Thu, 30 May 2013 16:43:10 +0000 (18:43 +0200)]
fixed pax britannica, vectorpinball png crush settings et. al.
badlogic [Thu, 30 May 2013 16:25:28 +0000 (18:25 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 16:25:17 +0000 (18:25 +0200)]
updated libobjectal.dll, fixed vector-pinball png crush settings
NathanSweet [Thu, 30 May 2013 16:15:51 +0000 (18:15 +0200)]
Merge remote-tracking branch 'origin/master'
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.
badlogic [Thu, 30 May 2013 16:10:13 +0000 (18:10 +0200)]
fixed pax-britannica png crush settings
badlogic [Thu, 30 May 2013 16:06:51 +0000 (18:06 +0200)]
fixed super jumper png crush settings
badlogic [Thu, 30 May 2013 15:34:46 +0000 (17:34 +0200)]
updated CHANGES
badlogic [Thu, 30 May 2013 15:34:10 +0000 (17:34 +0200)]
removed File#file(), removed box2d-editor
badlogic [Thu, 30 May 2013 15:18:55 +0000 (17:18 +0200)]
fixed issue 1456, Intersector#intersectRayBounds had a bug