OSDN Git Service
Justin Shapcott [Sun, 12 May 2013 20:58:18 +0000 (13:58 -0700)]
Sync GWT emulation of TmxMapLoader to core changes
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.
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
Manuel Bua [Sun, 12 May 2013 15:36:22 +0000 (17:36 +0200)]
Update CHANGES
NathanSweet [Sun, 12 May 2013 14:06:04 +0000 (16:06 +0200)]
Fixed JSON parsing of a single non-object, non-array.
Manuel Bua [Sun, 12 May 2013 13:16:48 +0000 (15:16 +0200)]
Avoid duplicate aliases in TexturePacker2
Test resource updated
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
NathanSweet [Sun, 12 May 2013 11:04:17 +0000 (13:04 +0200)]
Javadocs.
NathanSweet [Sat, 11 May 2013 19:59:34 +0000 (21:59 +0200)]
Merge remote-tracking branch 'origin/master'
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
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
Manuel Bua [Sat, 11 May 2013 16:45:19 +0000 (18:45 +0200)]
Fix NPE due to checking Null parameters
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.
Manuel Bua [Sat, 11 May 2013 15:42:45 +0000 (17:42 +0200)]
Fixed, effectively set blended tiles
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.
Justin Shapcott [Fri, 10 May 2013 21:06:17 +0000 (14:06 -0700)]
Change GWT preloader to load assets concurrently.
NathanSweet [Fri, 10 May 2013 12:49:40 +0000 (14:49 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Fri, 10 May 2013 12:49:23 +0000 (14:49 +0200)]
Use listener class name if title is null.
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!
Manuel Bua [Thu, 9 May 2013 19:25:11 +0000 (21:25 +0200)]
Do not add "blended tile" property anymore, more javadocs
NathanSweet [Thu, 9 May 2013 16:23:00 +0000 (18:23 +0200)]
ShapreRenderer x method.
I used it all the time.
NathanSweet [Thu, 9 May 2013 12:57:27 +0000 (14:57 +0200)]
Nothing to see here.
NathanSweet [Thu, 9 May 2013 12:00:20 +0000 (14:00 +0200)]
Merge remote-tracking branch 'origin/master'
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).
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
Tommy C. Li [Thu, 9 May 2013 02:37:39 +0000 (19:37 -0700)]
Run eclipse formatter
Tommy C. Li [Thu, 9 May 2013 02:36:09 +0000 (19:36 -0700)]
Make LwjglAWTCanvas clean up its created resources on exit
NathanSweet [Thu, 9 May 2013 00:27:49 +0000 (02:27 +0200)]
Merge remote-tracking branch 'origin/master'
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.
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
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
Nathan Sweet [Wed, 8 May 2013 20:21:08 +0000 (13:21 -0700)]
Merge pull request #390 from manuelbua/fix-reformat
Perform automatic formatting
Manuel Bua [Wed, 8 May 2013 20:16:00 +0000 (22:16 +0200)]
Perform automatic formatting
Got owned by Nate!
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
Manuel Bua [Wed, 8 May 2013 19:57:57 +0000 (21:57 +0200)]
Ouch, fix missing javadocs for null parameter
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
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.
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
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.
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()
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.
NathanSweet [Sun, 5 May 2013 21:26:57 +0000 (23:26 +0200)]
Fixed texture packer alias names (that I just broke).
NathanSweet [Sun, 5 May 2013 19:31:18 +0000 (21:31 +0200)]
A little clean up for sorting rects by name.
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
NathanSweet [Sun, 5 May 2013 19:25:42 +0000 (21:25 +0200)]
Changes.
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.
NathanSweet [Sun, 5 May 2013 19:13:08 +0000 (21:13 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sun, 5 May 2013 19:13:00 +0000 (21:13 +0200)]
Wrote a proper localToParentCoordinates without the unscaled, unrotated restriction.
GroupTest is a test for it.
Manuel Bua [Sun, 5 May 2013 18:51:37 +0000 (20:51 +0200)]
Better resource management when the AssetManager is not used
This permit the removal of AtlasTiledMap whose reason to exist was to track
resource usage only.
Changes propagated to other loader and tests as needed.
Manuel Bua [Sat, 4 May 2013 23:37:36 +0000 (01:37 +0200)]
Respect filter settings also in synchronous loading
Minor refactoring
Manuel Bua [Sat, 4 May 2013 23:26:38 +0000 (01:26 +0200)]
Fixed setting texture filters on a non-rendering thread
Manuel Bua [Sat, 4 May 2013 22:58:22 +0000 (00:58 +0200)]
Add new tests for TiledMapAtlas direct loading and AssetManager loading
Add resources (+preprocessed) to be able to run tests on checkout.
Note about resources: the "tiled-atlas-src" directory contains the source
used to build the "tiled-atlas-processed" resources: you can build the
preprocessor by running "ant -f build.xml gdx-tiled-preprocessor" in the
root libgdx/ directory.
Once built, run it against the source data, specifying an input and an
output directory:
<packer> <libgdx/.../tiled-atlas-src> <libgdx/.../tiled-atlas-processed>
Note that at this time the preprocessor will NOT overwrite the destination
folder if it already contains the same data, so make sure it's clean.
Manuel Bua [Sat, 4 May 2013 22:54:33 +0000 (00:54 +0200)]
Add null parameter check before use
Manuel Bua [Sat, 4 May 2013 22:34:33 +0000 (00:34 +0200)]
Add new Tiled map loader with TextureAtlas support
Initial code from Justin Shapcott, thanks for sharing!
Port all changes from latest TmxMapLoader, load more map properties, check
for correct encoding
Minor refactoring
Add support for force-enabling custom texture filters
Add support for multiple TextureAtlases
Manuel Bua [Sat, 4 May 2013 22:27:39 +0000 (00:27 +0200)]
Packing tilesets should walk all used tilesets, not only the last one
Previously the last loaded Map object was used to walk the tilesets and
pack them, now tilesets are being tracked consistently and enumerated
correctly.
Minor refactoring.
Add support for packing and loading multiple atlases in a single map,
adding a custom map property "atlas_<tilesetname>" to link a tileset to its
atlas.
Manuel Bua [Sat, 4 May 2013 22:21:53 +0000 (00:21 +0200)]
Minor refactoring
Manuel Bua [Sat, 4 May 2013 14:18:21 +0000 (16:18 +0200)]
Fixed tile removal feature, track usedIds per-tileset spawning across
different maps
Also refactored and removed old unused code.
Manuel Bua [Sat, 4 May 2013 11:51:49 +0000 (13:51 +0200)]
Bring back the gdx-tiled-preprocessor tool
Add tool back to the ant build script
Reset org.eclipse settings to the same as gdx-tools (formatter profile)
Reimport test data
Refactored to use the new TexturePacker2.
Add support for ImageProcessor to accept BufferedImage objects as input
Update TexturePacker2 to accommodate ImageProcessor changes and exposes new
constructor and method.
Added me to CONTRIBUTORS file
Christoph Aschwanden [Sun, 5 May 2013 06:36:51 +0000 (15:36 +0900)]
Bugfix: allows playing music files outside the assets folder.
MobiDevelop [Sun, 5 May 2013 04:38:34 +0000 (21:38 -0700)]
Merge pull request #383 from seroperson/math
Setter methods in Ellipse and Circle
seroperson [Sun, 5 May 2013 00:36:08 +0000 (03:36 +0300)]
#set(Circle) & #set(Ellipse)
Maarten Bezemer [Sun, 5 May 2013 00:14:46 +0000 (00:14 +0000)]
Fix issue 1377, Sort Texture atlas regions by their name
Maarten Bezemer [Sun, 5 May 2013 00:11:49 +0000 (00:11 +0000)]
Add method that returns the name of the Rect atlas region
Justin Shapcott [Sat, 4 May 2013 22:01:34 +0000 (15:01 -0700)]
Audit and organize GWT module def.
Additional small changes for GWT compatibility.
badlogic [Sat, 4 May 2013 19:03:57 +0000 (21:03 +0200)]
'fixed' issue 1337 by adding javadoc :/
badlogic [Sat, 4 May 2013 18:59:26 +0000 (20:59 +0200)]
fixed issue 1366, glCompressedTexImage2D implemented. will only work with desktop texture formats
badlogic [Sat, 4 May 2013 18:46:08 +0000 (20:46 +0200)]
fixed issue 1393, polygon region constructor taking region + vertices was calculating uvs incorrectly
badlogic [Sat, 4 May 2013 18:20:34 +0000 (20:20 +0200)]
fixed issue 1416, doSleep is honored in box2d World constructor
badlogic [Sat, 4 May 2013 16:50:01 +0000 (18:50 +0200)]
fixed freetype and bullet jnigen ios build script
badlogic [Sat, 4 May 2013 16:47:58 +0000 (18:47 +0200)]
fixed ios jnigen template, requires ios sdk 6.1
Justin Shapcott [Sat, 4 May 2013 16:16:26 +0000 (09:16 -0700)]
Remove unused imports in GWT emulation
Justin Shapcott [Sat, 4 May 2013 16:11:55 +0000 (09:11 -0700)]
Fix flip/rotation for cells when yUp = false
Also applied formatter, and moved the cell creation into its own method to
avoid duplication of the flip/rotate logic for each encoding.
Nathan Sweet [Sat, 4 May 2013 06:52:10 +0000 (23:52 -0700)]
Merge pull request #379 from broken-e/master
Array 4-arg constructor in GWT emu
broken-e [Fri, 3 May 2013 20:35:28 +0000 (13:35 -0700)]
Update Array.java
fixed bug introduced by update of SnapshotArray that needed the 4 arg constructor
Mario Zechner [Fri, 3 May 2013 08:49:01 +0000 (01:49 -0700)]
Merge pull request #363 from viridia/master
Add ShaderProgram method to set a mat3 uniform from a FloatBuffer.
Mario Zechner [Fri, 3 May 2013 08:46:15 +0000 (01:46 -0700)]
Merge pull request #368 from tjunnone/netErrorResponse
Fix for HTTP error responses being handled as failed requests
Mario Zechner [Fri, 3 May 2013 08:45:06 +0000 (01:45 -0700)]
Merge pull request #369 from tjunnone/httpVerbs2
Adding support for the HTTP verbs PUT and DELETE
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)
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
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
Dounan Shi [Fri, 3 May 2013 00:29:26 +0000 (17:29 -0700)]
Add ChainShape.createChain that takes an array of floats
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
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.
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.
NathanSweet [Wed, 1 May 2013 15:23:22 +0000 (17:23 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Wed, 1 May 2013 15:23:03 +0000 (17:23 +0200)]
1403, ignore freeing objects not obtained.
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.
MobiDevelop [Wed, 1 May 2013 13:31:18 +0000 (06:31 -0700)]
Merge pull request #364 from Yonsh/patch-1
Fixes issue #1408
badlogic [Tue, 30 Apr 2013 17:33:04 +0000 (19:33 +0200)]
more CHANGES
badlogic [Tue, 30 Apr 2013 17:31:25 +0000 (19:31 +0200)]
updated CHANGES file
badlogic [Tue, 30 Apr 2013 17:20:30 +0000 (19:20 +0200)]
updated lwjgl, only tested on mac so far
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.
Tomas Junnonen [Sun, 28 Apr 2013 14:10:07 +0000 (10:10 -0400)]
Adding support for the HTTP verbs PUT and DELETE
Tomas Junnonen [Sun, 28 Apr 2013 13:18:52 +0000 (09:18 -0400)]
Fix for HTTP error responses being handled as failed requests
On HTTP errors, set the HttpClientResponse input stream to the
error stream. This allows for reading the server's error response
in the handleHttpResponse callback.
Justin Shapcott [Sat, 27 Apr 2013 13:25:48 +0000 (06:25 -0700)]
Add HexagonalTiledMapRenderer and associated test
NathanSweet [Fri, 26 Apr 2013 11:15:40 +0000 (13:15 +0200)]
Fixed skin in GWT again.
Christoph Aschwanden [Fri, 26 Apr 2013 04:30:01 +0000 (13:30 +0900)]
Support for external paths (old version only loads from asset).
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).
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
NathanSweet [Thu, 25 Apr 2013 20:22:34 +0000 (22:22 +0200)]
Fixed GWT Skin.