OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sun, 19 May 2013 00:43:05 +0000 (02:43 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded click to toggle selection, more firing of selection changed, and methods to...
NathanSweet [Sun, 19 May 2013 00:40:19 +0000 (02:40 +0200)]
Added click to toggle selection, more firing of selection changed, and methods to get/restore expanded nodes.

11 years agoFixed a couple checkSegments calls.
NathanSweet [Sun, 19 May 2013 00:39:37 +0000 (02:39 +0200)]
Fixed a couple checkSegments calls.

11 years agoupdated to ADT 22
badlogic [Sat, 18 May 2013 16:14:04 +0000 (18:14 +0200)]
updated to ADT 22

11 years agoFix build. Update GWT jars. Ugh.
Justin Shapcott [Sat, 18 May 2013 14:41:19 +0000 (07:41 -0700)]
Fix build. Update GWT jars. Ugh.

11 years agoMerge pull request #408 from jjurach/pixmap-triangle
Mario Zechner [Sat, 18 May 2013 11:07:23 +0000 (04:07 -0700)]
Merge pull request #408 from jjurach/pixmap-triangle

added Pixmap#fillTriangle

11 years agoadded mention of Pixmap#fillTriangle
James Jurach [Sat, 18 May 2013 04:22:05 +0000 (23:22 -0500)]
added mention of Pixmap#fillTriangle

11 years agoclean up fillTriangle() variables. remove SWAP().
James Jurach [Sat, 18 May 2013 04:17:26 +0000 (23:17 -0500)]
clean up fillTriangle() variables. remove SWAP().

11 years agoremove accidental radius parameter from fillTriangle
James Jurach [Sat, 18 May 2013 04:17:13 +0000 (23:17 -0500)]
remove accidental radius parameter from fillTriangle

11 years agoMerge remote-tracking branch 'upstream/master' into pixmap-triangle
James Jurach [Sat, 18 May 2013 02:54:34 +0000 (21:54 -0500)]
Merge remote-tracking branch 'upstream/master' into pixmap-triangle

11 years agoMerge branch 'master' of https://github.com/vbousquet/libgdx into vbousquet-master
Justin Shapcott [Fri, 17 May 2013 19:23:42 +0000 (12:23 -0700)]
Merge branch 'master' of https://github.com/vbousquet/libgdx into vbousquet-master

11 years agoAdded infos in the CHANGES file.
Vincent Bousquet [Fri, 17 May 2013 18:02:26 +0000 (20:02 +0200)]
Added infos in the CHANGES file.
Renamed AssetLoader to AssetDownloader to avoid having 2 classes with
the same name in Gdx.
Set download size of audio file to 0 when not using browser cache (they
are not preloaded but directly loaded by the audio system).

11 years agoMerge pull request #395 from Adelier/patch-1
Mario Zechner [Fri, 17 May 2013 11:53:58 +0000 (04:53 -0700)]
Merge pull request #395 from Adelier/patch-1

add intersectLinePolygon method

11 years agoMerge pull request #405 from semtiko/patch-1
Mario Zechner [Fri, 17 May 2013 11:53:31 +0000 (04:53 -0700)]
Merge pull request #405 from semtiko/patch-1

Rectangle and Circle improvements

11 years agoMerge pull request #407 from veger/master
Mario Zechner [Fri, 17 May 2013 11:52:53 +0000 (04:52 -0700)]
Merge pull request #407 from veger/master

Add font name to hiero settings file

11 years agoRemoved javadocs for params that had no actual text.
NathanSweet [Fri, 17 May 2013 04:58:06 +0000 (06:58 +0200)]
Removed javadocs for params that had no actual text.

Reduces noise.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 17 May 2013 04:57:24 +0000 (06:57 +0200)]
Merge remote-tracking branch 'origin/master'

Conflicts:
gdx/src/com/badlogic/gdx/graphics/glutils/ShapeRenderer.java

11 years agoFinally smoked these deprecated classes.
NathanSweet [Fri, 17 May 2013 04:51:52 +0000 (06:51 +0200)]
Finally smoked these deprecated classes.

11 years agoAdded methods that take offset and count for polyline and polygon.
NathanSweet [Fri, 17 May 2013 04:50:49 +0000 (06:50 +0200)]
Added methods that take offset and count for polyline and polygon.

ShapeRenderer got formatted. Damned messy contributors! :p

11 years agoGWT:Refactored preloader for improved progress report and audio
Vincent Bousquet [Thu, 16 May 2013 23:04:51 +0000 (01:04 +0200)]
GWT:Refactored preloader for improved progress report and audio
preloading.
GWT:Cleaned up code to use XmlHttpRequest 2 binary downloads.
GWT:Add capability to extend reflection system with module configuration
property

11 years agoAdded two color line drawing to ShapeRenderer.
Stefan Bachmann [Thu, 16 May 2013 16:33:04 +0000 (17:33 +0100)]
Added two color line drawing to ShapeRenderer.

11 years agoadded Pixmap#fillTriangle
James Jurach [Thu, 16 May 2013 07:32:39 +0000 (02:32 -0500)]
added Pixmap#fillTriangle

11 years agoMerge pull request #406 from Maescool/master
Mario Zechner [Wed, 15 May 2013 22:46:59 +0000 (15:46 -0700)]
Merge pull request #406 from Maescool/master

Added some extra OUYA mappings

11 years agoMerge pull request #403 from sluglit/master
Mario Zechner [Wed, 15 May 2013 22:44:31 +0000 (15:44 -0700)]
Merge pull request #403 from sluglit/master

Add JNI wrappers for Box2d's conveyor belt functions

11 years agoAdd font name to hiero settings file
Maarten Bezemer [Wed, 15 May 2013 22:02:10 +0000 (00:02 +0200)]
Add font name to hiero settings file

11 years agoImplement Contact GWT Backend (SetTangentSpeed/GetTangentSpeed methods)
Gareth [Wed, 15 May 2013 20:18:46 +0000 (22:18 +0200)]
Implement Contact GWT Backend (SetTangentSpeed/GetTangentSpeed methods)

11 years agoBox2d Conveyor tests
Gareth [Wed, 15 May 2013 18:29:04 +0000 (20:29 +0200)]
Box2d Conveyor tests

11 years agoAdded some extra OUYA mappings
Pieter Maes [Wed, 15 May 2013 14:11:00 +0000 (16:11 +0200)]
Added some extra OUYA mappings

11 years agoMerge pull request #1 from semtiko/patch-2
Alex Vega [Wed, 15 May 2013 07:07:39 +0000 (00:07 -0700)]
Merge pull request #1 from semtiko/patch-2

Circle, add setPosition and setRadius methods

11 years agoCircle, add setPosition and setRadius methods
Alex Vega [Wed, 15 May 2013 07:06:47 +0000 (11:06 +0400)]
Circle, add setPosition and setRadius methods

11 years agoRectangle, add setPosition methods
Alex Vega [Wed, 15 May 2013 07:05:53 +0000 (11:05 +0400)]
Rectangle, add setPosition methods

11 years agoMerge pull request #401 from semtiko/patch-1
Mario Zechner [Tue, 14 May 2013 22:33:32 +0000 (15:33 -0700)]
Merge pull request #401 from semtiko/patch-1

Rectangle, add setSize methods

11 years agoRemove windows extension from ant scripts
Gareth [Tue, 14 May 2013 20:01:26 +0000 (22:01 +0200)]
Remove windows extension from ant scripts

11 years agoMerge branch 'master' of https://github.com/sluglit/libgdx.git
Gareth [Tue, 14 May 2013 19:54:32 +0000 (21:54 +0200)]
Merge branch 'master' of https://github.com/sluglit/libgdx.git

11 years agoAdded Box2d support for conveyers
Gareth [Tue, 14 May 2013 19:37:10 +0000 (21:37 +0200)]
Added Box2d support for conveyers

11 years agoMerge branch 'master' of https://github.com/sluglit/libgdx.git
Gareth [Tue, 14 May 2013 19:37:10 +0000 (21:37 +0200)]
Merge branch 'master' of https://github.com/sluglit/libgdx.git

11 years agoAdded Box2d support for conveyers
Gareth [Tue, 14 May 2013 19:06:33 +0000 (21:06 +0200)]
Added Box2d support for conveyers

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Tue, 14 May 2013 19:15:21 +0000 (21:15 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoList selection now width of list, not prefWidth.
NathanSweet [Tue, 14 May 2013 19:15:08 +0000 (21:15 +0200)]
List selection now width of list, not prefWidth.

11 years agoGet methods for transform and projection matrixes, to match SpriteBatch.
NathanSweet [Tue, 14 May 2013 19:14:48 +0000 (21:14 +0200)]
Get methods for transform and projection matrixes, to match SpriteBatch.

11 years agoAdded Box2d support for conveyers
Gareth [Tue, 14 May 2013 19:06:33 +0000 (21:06 +0200)]
Added Box2d support for conveyers

11 years agoAdd style to default GWT preloading.
Justin Shapcott [Tue, 14 May 2013 12:47:21 +0000 (05:47 -0700)]
Add style to default GWT preloading.

11 years agoRectangle, add setSize methods
Alex Vega [Tue, 14 May 2013 09:05:26 +0000 (13:05 +0400)]
Rectangle, add setSize methods

For more flexibility

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 13 May 2013 19:31:16 +0000 (21:31 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded resourcefiles to build. Fixed hack with hardcoded font files for gdx-core....
NathanSweet [Mon, 13 May 2013 19:30:51 +0000 (21:30 +0200)]
Added resourcefiles to build. Fixed hack with hardcoded font files for gdx-core. Put assets files into gdx-tools.jar.

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Mon, 13 May 2013 09:38:04 +0000 (11:38 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agofixed issue 1368, lwjgl can't handle null for data supplied via glBufferData...
badlogic [Mon, 13 May 2013 09:37:57 +0000 (11:37 +0200)]
fixed issue 1368, lwjgl can't handle null for data supplied via glBufferData...

11 years agofixed issue 1426, spritebatch should check size limit, we use shorts for indexing...
badlogic [Mon, 13 May 2013 09:01:28 +0000 (11:01 +0200)]
fixed issue 1426, spritebatch should check size limit, we use shorts for indexing...

11 years agofixed issue 1434, ImmediateModeRenderer20 didn't handle texture coordinates correctly
badlogic [Mon, 13 May 2013 08:54:08 +0000 (10:54 +0200)]
fixed issue 1434, ImmediateModeRenderer20 didn't handle texture coordinates correctly

11 years agoUpdate for AtlasTiledMapLoader name change
Justin Shapcott [Sun, 12 May 2013 21:12:23 +0000 (14:12 -0700)]
Update for AtlasTiledMapLoader name change

11 years agoAdd GWT emulation of AtlasTmxMapLoader
Justin Shapcott [Sun, 12 May 2013 21:06:18 +0000 (14:06 -0700)]
Add GWT emulation of AtlasTmxMapLoader

11 years agoSync AtlasTmxMapLoader with TmxMapLoader changes
Justin Shapcott [Sun, 12 May 2013 21:05:24 +0000 (14:05 -0700)]
Sync AtlasTmxMapLoader with TmxMapLoader changes

11 years agoSync GWT emulation of TmxMapLoader to core changes
Justin Shapcott [Sun, 12 May 2013 20:58:18 +0000 (13:58 -0700)]
Sync GWT emulation of TmxMapLoader to core changes

11 years agoRename AtlasTiledMapLoader to AtlasTmxMapLoader
Justin Shapcott [Sun, 12 May 2013 20:53:55 +0000 (13:53 -0700)]
Rename AtlasTiledMapLoader to AtlasTmxMapLoader

Since this loader specifically loads .tmx maps it should be named
accordingly. In LibGDX, a TiledMap is not intrinsically tied to the Tiled
application or its tmx format. This name clarifies that the loader
specifically loads tmx files.

11 years agoMerge pull request #396 from manuelbua/gdx-tiled-packer-redux-gles2
MobiDevelop [Sun, 12 May 2013 20:31:26 +0000 (13:31 -0700)]
Merge pull request #396 from manuelbua/gdx-tiled-packer-redux-gles2

Get back the gdx-tiled-preprocessor

11 years agoUpdate CHANGES
Manuel Bua [Sun, 12 May 2013 15:36:22 +0000 (17:36 +0200)]
Update CHANGES

11 years agoFixed JSON parsing of a single non-object, non-array.
NathanSweet [Sun, 12 May 2013 14:06:04 +0000 (16:06 +0200)]
Fixed JSON parsing of a single non-object, non-array.

11 years agoAvoid duplicate aliases in TexturePacker2
Manuel Bua [Sun, 12 May 2013 13:16:48 +0000 (15:16 +0200)]
Avoid duplicate aliases in TexturePacker2

Test resource updated

11 years agoFix javadoc, avoid use of nested iterator, ensure use alias and indexes
Manuel Bua [Sun, 12 May 2013 13:01:28 +0000 (15:01 +0200)]
Fix javadoc, avoid use of nested iterator, ensure use alias and indexes

11 years agoJavadocs.
NathanSweet [Sun, 12 May 2013 11:04:17 +0000 (13:04 +0200)]
Javadocs.

11 years agoadd intersectLinePolygon method
Alexey [Sun, 12 May 2013 00:27:54 +0000 (04:27 +0400)]
add intersectLinePolygon method

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 11 May 2013 19:59:34 +0000 (21:59 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoCache JsonValue size.
NathanSweet [Sat, 11 May 2013 19:59:22 +0000 (21:59 +0200)]
Cache JsonValue size.

Who calls size() every iteration on 100k elements, anway? :p

11 years agoMerge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2
Manuel Bua [Sat, 11 May 2013 17:05:55 +0000 (19:05 +0200)]
Merge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2

11 years agoFix NPE due to checking Null parameters
Manuel Bua [Sat, 11 May 2013 16:45:19 +0000 (18:45 +0200)]
Fix NPE due to checking Null parameters

11 years agoRemove Gdx.files dependency by using a custom FileHandleResolver
Manuel Bua [Sat, 11 May 2013 16:44:46 +0000 (18:44 +0200)]
Remove Gdx.files dependency by using a custom FileHandleResolver

Update javadocs accordingly.

Now only graphics resources impose the creation of a LwjglApplication: this
is probably subject to change in the future, where loading both maps
metadata and graphics resources should be made conditional.

11 years agoFixed, effectively set blended tiles
Manuel Bua [Sat, 11 May 2013 15:42:45 +0000 (17:42 +0200)]
Fixed, effectively set blended tiles

11 years agoAdd back the "blended tiles" property
Manuel Bua [Sat, 11 May 2013 14:12:44 +0000 (16:12 +0200)]
Add back the "blended tiles" property

The rendering will introduce blending optimizations at some point.

11 years agoChange GWT preloader to load assets concurrently.
Justin Shapcott [Fri, 10 May 2013 21:06:17 +0000 (14:06 -0700)]
Change GWT preloader to load assets concurrently.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 10 May 2013 12:49:40 +0000 (14:49 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoUse listener class name if title is null.
NathanSweet [Fri, 10 May 2013 12:49:23 +0000 (14:49 +0200)]
Use listener class name if title is null.

11 years agoMerge pull request #384 from noblemaster/master
Mario Zechner [Fri, 10 May 2013 08:25:37 +0000 (01:25 -0700)]
Merge pull request #384 from noblemaster/master

iOS Bugfix: playing music files that are not in the assets folder!

11 years agoDo not add "blended tile" property anymore, more javadocs
Manuel Bua [Thu, 9 May 2013 19:25:11 +0000 (21:25 +0200)]
Do not add "blended tile" property anymore, more javadocs

11 years agoShapreRenderer x method.
NathanSweet [Thu, 9 May 2013 16:23:00 +0000 (18:23 +0200)]
ShapreRenderer x method.

I used it all the time.

11 years agoNothing to see here.
NathanSweet [Thu, 9 May 2013 12:57:27 +0000 (14:57 +0200)]
Nothing to see here.

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

11 years agoFixed TextField
NathanSweet [Thu, 9 May 2013 12:00:06 +0000 (14:00 +0200)]
Fixed TextField

(which I broke because I don't test all the things).

11 years agoMerge pull request #391 from tommycli/master
Nathan Sweet [Thu, 9 May 2013 11:51:57 +0000 (04:51 -0700)]
Merge pull request #391 from tommycli/master

Make LwjglAWTCanvas clean up its created resources on exit

11 years agoRun eclipse formatter
Tommy C. Li [Thu, 9 May 2013 02:37:39 +0000 (19:37 -0700)]
Run eclipse formatter

11 years agoMake LwjglAWTCanvas clean up its created resources on exit
Tommy C. Li [Thu, 9 May 2013 02:36:09 +0000 (19:36 -0700)]
Make LwjglAWTCanvas clean up its created resources on exit

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 9 May 2013 00:27:49 +0000 (02:27 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoTextField setting to support storing but not displaying chars not in the font.
NathanSweet [Thu, 9 May 2013 00:27:30 +0000 (02:27 +0200)]
TextField setting to support storing but not displaying chars not in the font.

11 years agoVarious fixes
Manuel Bua [Wed, 8 May 2013 20:52:22 +0000 (22:52 +0200)]
Various fixes

Uses better name for packed tilesets
Update preprocessed test resources.
Do not create a new StaticTiledMapTile if it's of no use
Remove unneeded references

11 years agoMerge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2
Manuel Bua [Wed, 8 May 2013 20:27:01 +0000 (22:27 +0200)]
Merge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2

11 years agoMerge pull request #390 from manuelbua/fix-reformat
Nathan Sweet [Wed, 8 May 2013 20:21:08 +0000 (13:21 -0700)]
Merge pull request #390 from manuelbua/fix-reformat

Perform automatic formatting

11 years agoPerform automatic formatting
Manuel Bua [Wed, 8 May 2013 20:16:00 +0000 (22:16 +0200)]
Perform automatic formatting

Got owned by Nate!

11 years agoMerge pull request #389 from manuelbua/fix-javadoc
Nathan Sweet [Wed, 8 May 2013 20:00:40 +0000 (13:00 -0700)]
Merge pull request #389 from manuelbua/fix-javadoc

Ouch, fix missing javadocs for null parameter

11 years agoOuch, fix missing javadocs for null parameter
Manuel Bua [Wed, 8 May 2013 19:57:57 +0000 (21:57 +0200)]
Ouch, fix missing javadocs for null parameter

11 years agoMerge pull request #388 from manuelbua/texturepacker2-addimage
Nathan Sweet [Wed, 8 May 2013 19:46:45 +0000 (12:46 -0700)]
Merge pull request #388 from manuelbua/texturepacker2-addimage

Add support for ImageProcessor to accept BufferedImage objects as input

11 years agoAdd support for ImageProcessor to accept BufferedImage objects as input
Manuel Bua [Wed, 8 May 2013 19:28:29 +0000 (21:28 +0200)]
Add support for ImageProcessor to accept BufferedImage objects as input

Update TexturePacker2 to accommodate ImageProcessor changes and exposes new
constructor and method.

11 years agoMerge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2
Manuel Bua [Wed, 8 May 2013 19:01:17 +0000 (21:01 +0200)]
Merge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2

11 years agoAlternative version that builds one single TextureAtlas for all the tiles
Manuel Bua [Mon, 6 May 2013 20:06:48 +0000 (22:06 +0200)]
Alternative version that builds one single TextureAtlas for all the tiles
across all tilesets, for any processed map instead of splitting the result
into multiple atlases.

11 years agoMerge pull request #387 from semtiko/patch-1
Nathan Sweet [Mon, 6 May 2013 18:17:15 +0000 (11:17 -0700)]
Merge pull request #387 from semtiko/patch-1

Stage. Add clear() in dispose()

11 years agoAdd clear() in dispose()
Alex Vega [Mon, 6 May 2013 18:07:23 +0000 (22:07 +0400)]
Add clear() in dispose()

Without clear() even after "stage = null;" click listeners still work eveb on another screens.

11 years agoFixed texture packer alias names (that I just broke).
NathanSweet [Sun, 5 May 2013 21:26:57 +0000 (23:26 +0200)]
Fixed texture packer alias names (that I just broke).

11 years agoA little clean up for sorting rects by name.
NathanSweet [Sun, 5 May 2013 19:31:18 +0000 (21:31 +0200)]
A little clean up for sorting rects by name.

11 years agoMerge pull request #386 from veger/master
Nathan Sweet [Sun, 5 May 2013 19:26:30 +0000 (12:26 -0700)]
Merge pull request #386 from veger/master

Fix issue 1377, Sort Texture atlas regions by their name

11 years agoChanges.
NathanSweet [Sun, 5 May 2013 19:25:42 +0000 (21:25 +0200)]
Changes.

11 years agoRefactored parentToLocalCoordinates.
NathanSweet [Sun, 5 May 2013 19:20:59 +0000 (21:20 +0200)]
Refactored parentToLocalCoordinates.

I tested this via GroupTest and it seems to work. Not sure why we were doing two rotations for origin? If there was a good reason I'd like to include a test case in GroupTest. I wrote localToParentCoordinates with only a single rotation, so if we really do need two rotations that would also be broken.

Besides using a single rotation, I removed branching where we only saved a couple subtractions.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sun, 5 May 2013 19:13:08 +0000 (21:13 +0200)]
Merge remote-tracking branch 'origin/master'