OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge pull request #365 from noblemaster/master
Mario Zechner [Fri, 3 May 2013 08:43:55 +0000 (01:43 -0700)]
Merge pull request #365 from noblemaster/master

iOS Update for OpenGL + OpenAL (minor)

11 years agoMerge pull request #371 from ratalaika/master
Mario Zechner [Fri, 3 May 2013 08:41:53 +0000 (01:41 -0700)]
Merge pull request #371 from ratalaika/master

Fixed setColor of Pixmap GWT emulation

11 years agoMerge pull request #373 from dounan/master
Mario Zechner [Fri, 3 May 2013 08:40:54 +0000 (01:40 -0700)]
Merge pull request #373 from dounan/master

Fix jumpy zooming when panning and zooming

11 years agoAdd ChainShape.createChain that takes an array of floats
Dounan Shi [Fri, 3 May 2013 00:29:26 +0000 (17:29 -0700)]
Add ChainShape.createChain that takes an array of floats

11 years agoMerge pull request #376 from Ricorei/patch-1
Nathan Sweet [Thu, 2 May 2013 19:33:46 +0000 (12:33 -0700)]
Merge pull request #376 from Ricorei/patch-1

Fix for get (int key, int defaultValue) method in IntIntMap.java

11 years agoUpdate IntIntMap.java
Ricorei [Thu, 2 May 2013 18:58:48 +0000 (21:58 +0300)]
Update IntIntMap.java

Method get is broken.
Ex : Using get(0, -1) on a new IntIntMap would return 0 (zeroValue) instead of that -1 (defaultValue) because there isn't the hasZeroValue check like in the remove method.

There is also a chance that other methods like getStash or getAndIncrement are affected too.

11 years agoUpdate pointer1 and pointer2 during touchDragged no matter if pinching or not.
Dounan Shi [Thu, 2 May 2013 01:41:01 +0000 (18:41 -0700)]
Update pointer1 and pointer2 during touchDragged no matter if pinching or not.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Wed, 1 May 2013 15:23:22 +0000 (17:23 +0200)]
Merge remote-tracking branch 'origin/master'

11 years ago1403, ignore freeing objects not obtained.
NathanSweet [Wed, 1 May 2013 15:23:03 +0000 (17:23 +0200)]
1403, ignore freeing objects not obtained.

11 years agoArray ctors that take an array now also take offset and count. ArrayMap iterators...
NathanSweet [Wed, 1 May 2013 15:22:47 +0000 (17:22 +0200)]
Array ctors that take an array now also take offset and count. ArrayMap iterators toArray added.

11 years agoMerge pull request #364 from Yonsh/patch-1
MobiDevelop [Wed, 1 May 2013 13:31:18 +0000 (06:31 -0700)]
Merge pull request #364 from Yonsh/patch-1

Fixes issue #1408

11 years agomore CHANGES
badlogic [Tue, 30 Apr 2013 17:33:04 +0000 (19:33 +0200)]
more CHANGES

11 years agoupdated CHANGES file
badlogic [Tue, 30 Apr 2013 17:31:25 +0000 (19:31 +0200)]
updated CHANGES file

11 years agoupdated lwjgl, only tested on mac so far
badlogic [Tue, 30 Apr 2013 17:20:30 +0000 (19:20 +0200)]
updated lwjgl, only tested on mac so far

11 years agoFixed setColor of Pixmap GWT emulation
ratalaika [Mon, 29 Apr 2013 11:39:31 +0000 (13:39 +0200)]
Fixed setColor of Pixmap GWT emulation

The color was used as ARGB and if should be used as RGBA.

11 years agoAdd HexagonalTiledMapRenderer and associated test
Justin Shapcott [Sat, 27 Apr 2013 13:25:48 +0000 (06:25 -0700)]
Add HexagonalTiledMapRenderer and associated test

11 years agoFixed skin in GWT again.
NathanSweet [Fri, 26 Apr 2013 11:15:40 +0000 (13:15 +0200)]
Fixed skin in GWT again.

11 years agoSupport for external paths (old version only loads from asset).
Christoph Aschwanden [Fri, 26 Apr 2013 04:30:01 +0000 (13:30 +0900)]
Support for external paths (old version only loads from asset).

11 years agoiOS Update for OpenGL: allow creating textures without pixels (e.g. for buffering).
Christoph Aschwanden [Fri, 26 Apr 2013 03:28:33 +0000 (12:28 +0900)]
iOS Update for OpenGL: allow creating textures without pixels (e.g. for buffering).

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 25 Apr 2013 20:24:06 +0000 (22:24 +0200)]
Merge remote-tracking branch 'origin/master'

Conflicts:
backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/scenes/scene2d/ui/Skin.java

11 years agoFixed GWT Skin.
NathanSweet [Thu, 25 Apr 2013 20:22:34 +0000 (22:22 +0200)]
Fixed GWT Skin.

11 years agoUpdate GwtFileHandle.java
Yonsh [Thu, 25 Apr 2013 20:13:56 +0000 (04:13 +0800)]
Update GwtFileHandle.java

bug fix:
http://badlogicgames.com/forum/viewtopic.php?f=11&t=5831#p39768

11 years agofirst attempt at fixing JSON in GWT backend...
badlogic [Thu, 25 Apr 2013 19:14:12 +0000 (21:14 +0200)]
first attempt at fixing JSON in GWT backend...

11 years agoFixed round tripping floats.
NathanSweet [Thu, 25 Apr 2013 13:34:08 +0000 (15:34 +0200)]
Fixed round tripping floats.

11 years agoMinor bug fixes.
NathanSweet [Thu, 25 Apr 2013 12:42:47 +0000 (14:42 +0200)]
Minor bug fixes.

11 years agoRemoved unused method.
NathanSweet [Thu, 25 Apr 2013 12:35:53 +0000 (14:35 +0200)]
Removed unused method.

11 years agoBetter "has no decimal" check.
NathanSweet [Thu, 25 Apr 2013 12:30:13 +0000 (14:30 +0200)]
Better "has no decimal" check.

11 years agoDouble in JsonReader.
NathanSweet [Thu, 25 Apr 2013 12:27:04 +0000 (14:27 +0200)]
Double in JsonReader.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 25 Apr 2013 12:23:21 +0000 (14:23 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoJSON refactoring for JsonValue.
NathanSweet [Thu, 25 Apr 2013 12:23:12 +0000 (14:23 +0200)]
JSON refactoring for JsonValue.

http://www.badlogicgames.com/wordpress/?p=2993

11 years agoFix GET request missing parameters.
MobiDevelop [Wed, 24 Apr 2013 21:34:59 +0000 (14:34 -0700)]
Fix GET request missing parameters.

The `url` variable was updated with the parameters but then wasn't used.

11 years agoAdded getItems.
NathanSweet [Wed, 24 Apr 2013 11:00:55 +0000 (13:00 +0200)]
Added getItems.

11 years agoMerge pull request #362 from SG57/patch-1
MobiDevelop [Tue, 23 Apr 2013 22:55:01 +0000 (15:55 -0700)]
Merge pull request #362 from SG57/patch-1

Update TiledMapTileSet - get TileSet tiles when TiledMapTile ID is unknown

11 years agoUpdate TiledMapTileSet.java
SG57 [Tue, 23 Apr 2013 22:29:22 +0000 (15:29 -0700)]
Update TiledMapTileSet.java

Made TileSet's Tiles iterable.

11 years agoUpdate TiledMapTileSet.java
SG57 [Tue, 23 Apr 2013 20:14:44 +0000 (13:14 -0700)]
Update TiledMapTileSet.java

Premise:
I am using Tiled Map Editor and giving properties, such as friction, to individual TileSet tiles as a template so that I may lay down 20 'ice' tiles and 20 'road' tiles without having to individually specify their respective properties (friction) for each tile laid as that would get cumbersome.

TileSets support properties for their Tiles, and libgdx allows access to these TileSets, however the TileSet class only allows access to their respective Tiles (and their respective properties) if you know the exact id of said Tile.

Current State:
[*]You may iterate through all the TiledMapTileSets for a given TileMap.
[*]For each TileSet, if you [b]do [/b]know the TiledMapTile's id, you may get TiledMapTile's from the TileSet using TileSet.getId(id).
[*]If you [b]do not [/b]know the id of the TiledMapTile, there is no way to iterate through all of its TiledMapTile's - such is my case since the user may make their own levels and the ids they may use are unknown to me

11 years agoMerge pull request #360 from aspic/master
Nathan Sweet [Sun, 21 Apr 2013 13:10:09 +0000 (06:10 -0700)]
Merge pull request #360 from aspic/master

Fix for issue #1397

11 years agoOnly update displayed text for password characters if password mode is
Kjetil Mehl [Sun, 21 Apr 2013 12:24:35 +0000 (14:24 +0200)]
Only update displayed text for password characters if password mode is
enabled.

11 years agoUpdate display text immediately after password character or password
Kjetil Mehl [Sun, 21 Apr 2013 12:15:56 +0000 (14:15 +0200)]
Update display text immediately after password character or password
mode has been enabled (issue 1397).

11 years agoMerge pull request #359 from siondream/master
MobiDevelop [Sat, 20 Apr 2013 16:31:33 +0000 (09:31 -0700)]
Merge pull request #359 from siondream/master

Fixes issue #1395

11 years agoFixes issue #1395
David Saltares [Sat, 20 Apr 2013 14:42:29 +0000 (15:42 +0100)]
Fixes issue #1395

11 years agoFix javadoc for ellipse
Justin Shapcott [Fri, 19 Apr 2013 21:30:50 +0000 (14:30 -0700)]
Fix javadoc for ellipse

11 years agoAdd ellipse rendering to ShapeRenderer
Justin Shapcott [Fri, 19 Apr 2013 21:27:40 +0000 (14:27 -0700)]
Add ellipse rendering to ShapeRenderer

11 years agoMerge pull request #349 from aspic/decal-color
Mario Zechner [Fri, 19 Apr 2013 15:55:45 +0000 (08:55 -0700)]
Merge pull request #349 from aspic/decal-color

Added convenient setColor methods for decal.

11 years agoMerge pull request #355 from semtiko/patch-1
Mario Zechner [Fri, 19 Apr 2013 15:55:10 +0000 (08:55 -0700)]
Merge pull request #355 from semtiko/patch-1

Fixed Live Wallpaper touch events

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

11 years agouseIndexes setting.
NathanSweet [Thu, 18 Apr 2013 12:57:13 +0000 (14:57 +0200)]
useIndexes setting.

11 years agoMerge pull request #354 from seroperson/master
Mario Zechner [Thu, 18 Apr 2013 12:20:24 +0000 (05:20 -0700)]
Merge pull request #354 from seroperson/master

Box2DDebugRenderer - correct color for contacts, some small changes

11 years agoAdd DataOutput to gdx.gwt.xml
Justin Shapcott [Wed, 17 Apr 2013 15:22:46 +0000 (08:22 -0700)]
Add DataOutput to gdx.gwt.xml

11 years agoMerge pull request #357 from Microbius/master
MobiDevelop [Wed, 17 Apr 2013 14:52:29 +0000 (07:52 -0700)]
Merge pull request #357 from Microbius/master

Little fix on load() in TmxMapLoader

11 years agoLittle fix on loading TiledMap
Microbius [Wed, 17 Apr 2013 14:22:44 +0000 (17:22 +0300)]
Little fix on loading TiledMap

11 years agoflag for contacts
seroperson [Tue, 16 Apr 2013 22:04:01 +0000 (01:04 +0300)]
flag for contacts

11 years agoDoubled accuracy of MathUtils cos/sin at cost of one addition for cosine.
NathanSweet [Tue, 16 Apr 2013 09:20:01 +0000 (11:20 +0200)]
Doubled accuracy of MathUtils cos/sin at cost of one addition for cosine.

11 years agoFixed Live Wallpaper touch events on older API
Alex Vega [Tue, 16 Apr 2013 09:00:23 +0000 (13:00 +0400)]
Fixed Live Wallpaper touch events on older API

11 years agoUse update(false) since we call processMessages().
NathanSweet [Tue, 16 Apr 2013 04:58:57 +0000 (06:58 +0200)]
Use update(false) since we call processMessages().

11 years agocolor for contacts, some others changes
seroperson [Mon, 15 Apr 2013 21:46:55 +0000 (00:46 +0300)]
color for contacts, some others changes

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 15 Apr 2013 17:11:28 +0000 (19:11 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoFixed JSON parsing that I broke...
NathanSweet [Mon, 15 Apr 2013 17:11:06 +0000 (19:11 +0200)]
Fixed JSON parsing that I broke...

11 years agoAdd TextureFilter to parameters for TmxMapLoader.
Justin Shapcott [Mon, 15 Apr 2013 16:17:12 +0000 (09:17 -0700)]
Add TextureFilter to parameters for TmxMapLoader.

11 years agoMerge pull request #351 from seroperson/master
Mario Zechner [Mon, 15 Apr 2013 16:26:11 +0000 (09:26 -0700)]
Merge pull request #351 from seroperson/master

remove the use of deprecated #mul()

11 years agoremove the use of deprecated #mul()
seroperson [Mon, 15 Apr 2013 16:00:25 +0000 (19:00 +0300)]
remove the use of deprecated #mul()

11 years agoJSOn changes
NathanSweet [Mon, 15 Apr 2013 13:31:22 +0000 (15:31 +0200)]
JSOn changes

11 years agoRemoved auto-imports. Added setColor docs for Sprite and Decal.
Kjetil Mehl [Mon, 15 Apr 2013 13:31:09 +0000 (15:31 +0200)]
Removed auto-imports. Added setColor docs for Sprite and Decal.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 15 Apr 2013 13:30:24 +0000 (15:30 +0200)]
Merge remote-tracking branch 'origin/master'

11 years ago1381, fixed Json round trip of longs.
NathanSweet [Mon, 15 Apr 2013 13:30:16 +0000 (15:30 +0200)]
1381, fixed Json round trip of longs.

11 years agoMerge pull request #346 from frustaci/patch-1
Mario Zechner [Mon, 15 Apr 2013 13:13:06 +0000 (06:13 -0700)]
Merge pull request #346 from frustaci/patch-1

Fixed forceVBO in Mesh

11 years agoMerge pull request #344 from semtiko/patch-1
Mario Zechner [Mon, 15 Apr 2013 13:11:36 +0000 (06:11 -0700)]
Merge pull request #344 from semtiko/patch-1

Fixed Live Wallpaper crash on Android 2.2

11 years agoAdded convenient setColor methods for decal.
Kjetil Mehl [Mon, 15 Apr 2013 13:01:10 +0000 (15:01 +0200)]
Added convenient setColor methods for decal.

11 years agoforceVBO in Mesh
frustaci [Mon, 15 Apr 2013 03:22:17 +0000 (00:22 -0300)]
forceVBO in Mesh

At least one recent commit https://github.com/libgdx/libgdx/commit/7020231ca8b1e14995d398603de525581e3d1282 has completely disabled VBO support in the SpriteBatch class for not so clear reasons.
My project uses GL20 for now only and I would like to use/test VBOs, so at least there's a way to bring back VBOs in spritebatch by using the forceVBO flag.
If someone could clarify why SpriteBatch was changed I would appreciate as well.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sun, 14 Apr 2013 05:54:24 +0000 (07:54 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded premultipliedAlpha setting.
NathanSweet [Sun, 14 Apr 2013 05:54:12 +0000 (07:54 +0200)]
Added premultipliedAlpha setting.

11 years agoFixed when root directory is blank.
NathanSweet [Sun, 14 Apr 2013 05:53:58 +0000 (07:53 +0200)]
Fixed when root directory is blank.

11 years agoFixed Live Wallpaper crash on Android 2.2
Alex Vega [Sat, 13 Apr 2013 18:34:11 +0000 (22:34 +0400)]
Fixed Live Wallpaper crash on Android 2.2

Maybe not only on 2.2, but i have 2 "engines" on HTC Hero with 2.2.1 and have a crash because view is not initialized, because can't be initialized if have more than 1 engine (see line 331).
So, i think it's just typo.

11 years agoadded #getVolume() to OpenALMusic...
badlogic [Fri, 12 Apr 2013 22:18:47 +0000 (00:18 +0200)]
added #getVolume() to OpenALMusic...

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 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 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 agoUpdated CHANGES file
Steven Plude [Tue, 9 Apr 2013 16:37:14 +0000 (12:37 -0400)]
Updated CHANGES file

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 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 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 agoFixed scrollpane padding.
NathanSweet [Sun, 7 Apr 2013 00:11:26 +0000 (02:11 +0200)]
Fixed scrollpane padding.

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 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();