OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge pull request #394 from xoppa/new3dapi
Mario Zechner [Sat, 11 May 2013 21:06:54 +0000 (14:06 -0700)]
Merge pull request #394 from xoppa/new3dapi

new3dapi: Fix lighting

11 years agoFix lighting
Xoppa [Sat, 11 May 2013 21:02:16 +0000 (23:02 +0200)]
Fix lighting

11 years agoMerge branch 'master' into new3dapi
badlogic [Sat, 11 May 2013 20:05:36 +0000 (22:05 +0200)]
Merge branch 'master' into new3dapi

11 years agoMerge pull request #393 from xoppa/new3dapi
Xoppa [Sat, 11 May 2013 20:02:51 +0000 (13:02 -0700)]
Merge pull request #393 from xoppa/new3dapi

New3dapi

11 years agoUpdate assets
Xoppa [Sat, 11 May 2013 20:01:58 +0000 (22:01 +0200)]
Update assets

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 agonew3dapi: various, including a start of normal mapping
Xoppa [Sat, 11 May 2013 19:58:41 +0000 (21:58 +0200)]
new3dapi: various, including a start of normal mapping

11 years agomerged with master, fixed Json model loader to use new Json API
badlogic [Sat, 11 May 2013 19:23:37 +0000 (21:23 +0200)]
merged with master, fixed Json model loader to use new Json API

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 #385 from xoppa/new3dapi
Mario Zechner [Fri, 10 May 2013 08:41:32 +0000 (01:41 -0700)]
Merge pull request #385 from xoppa/new3dapi

New3dapi: various changes, including animation and skinning

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 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 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 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 agoBetter separate local, model and world transform
Xoppa [Sun, 5 May 2013 21:25:50 +0000 (23:25 +0200)]
Better separate local, model and world transform

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'

11 years agoWrote a proper localToParentCoordinates without the unscaled, unrotated restriction.
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.

11 years agoUpdate g3db loader
Xoppa [Sun, 5 May 2013 19:01:51 +0000 (21:01 +0200)]
Update g3db loader

11 years agoNew3dapi: various changes, including animation and skinning
Xoppa [Sun, 5 May 2013 17:06:36 +0000 (19:06 +0200)]
New3dapi: various changes, including animation and skinning

11 years agoBugfix: allows playing music files outside the assets folder.
Christoph Aschwanden [Sun, 5 May 2013 06:36:51 +0000 (15:36 +0900)]
Bugfix: allows playing music files outside the assets folder.

11 years agoMerge pull request #383 from seroperson/math
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

11 years ago#set(Circle) & #set(Ellipse)
seroperson [Sun, 5 May 2013 00:36:08 +0000 (03:36 +0300)]
#set(Circle) & #set(Ellipse)

11 years agoFix issue 1377, Sort Texture atlas regions by their name
Maarten Bezemer [Sun, 5 May 2013 00:14:46 +0000 (00:14 +0000)]
Fix issue 1377, Sort Texture atlas regions by their name

11 years agoAdd method that returns the name of the Rect atlas region
Maarten Bezemer [Sun, 5 May 2013 00:11:49 +0000 (00:11 +0000)]
Add method that returns the name of the Rect atlas region

11 years agoAudit and organize GWT module def.
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.

11 years ago'fixed' issue 1337 by adding javadoc :/
badlogic [Sat, 4 May 2013 19:03:57 +0000 (21:03 +0200)]
'fixed' issue 1337 by adding javadoc :/

11 years agofixed issue 1366, glCompressedTexImage2D implemented. will only work with desktop...
badlogic [Sat, 4 May 2013 18:59:26 +0000 (20:59 +0200)]
fixed issue 1366, glCompressedTexImage2D implemented. will only work with desktop texture formats

11 years agofixed issue 1393, polygon region constructor taking region + vertices was calculating...
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

11 years agofixed issue 1416, doSleep is honored in box2d World constructor
badlogic [Sat, 4 May 2013 18:20:34 +0000 (20:20 +0200)]
fixed issue 1416, doSleep is honored in box2d World constructor

11 years agofixed freetype and bullet jnigen ios build script
badlogic [Sat, 4 May 2013 16:50:01 +0000 (18:50 +0200)]
fixed freetype and bullet jnigen ios build script

11 years agofixed ios jnigen template, requires ios sdk 6.1
badlogic [Sat, 4 May 2013 16:47:58 +0000 (18:47 +0200)]
fixed ios jnigen template, requires ios sdk 6.1

11 years agoRemove unused imports in GWT emulation
Justin Shapcott [Sat, 4 May 2013 16:16:26 +0000 (09:16 -0700)]
Remove unused imports in GWT emulation

11 years agoFix flip/rotation for cells when yUp = false
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.

11 years agoMerge pull request #379 from broken-e/master
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

11 years agoUpdate Array.java
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

11 years agoMerge pull request #363 from viridia/master
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.

11 years agoMerge pull request #368 from tjunnone/netErrorResponse
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

11 years agoMerge pull request #370 from xoppa/new3dapi
Mario Zechner [Fri, 3 May 2013 08:45:33 +0000 (01:45 -0700)]
Merge pull request #370 from xoppa/new3dapi

New3dapi: Rename JsonModelLoader to G3djModelLoader

11 years agoMerge pull request #369 from tjunnone/httpVerbs2
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

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 agoRename JsonModelLoader to G3djModelLoader
Xoppa [Sun, 28 Apr 2013 20:49:54 +0000 (22:49 +0200)]
Rename JsonModelLoader to G3djModelLoader

11 years agoAdding support for the HTTP verbs PUT and DELETE
Tomas Junnonen [Sun, 28 Apr 2013 14:10:07 +0000 (10:10 -0400)]
Adding support for the HTTP verbs PUT and DELETE

11 years agoFix for HTTP error responses being handled as failed requests
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.

11 years agoMerge pull request #367 from xoppa/new3dapi
Mario Zechner [Sat, 27 Apr 2013 22:54:05 +0000 (15:54 -0700)]
Merge pull request #367 from xoppa/new3dapi

New3dapi: Rename MeshPartMaterial to NodePart

11 years agoFix color attribute in JsonModelLoader
Xoppa [Sat, 27 Apr 2013 18:42:40 +0000 (20:42 +0200)]
Fix color attribute in JsonModelLoader

11 years agoRename MeshPartMaterial to NodePart
Xoppa [Sat, 27 Apr 2013 17:26:40 +0000 (19:26 +0200)]
Rename MeshPartMaterial to NodePart

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 agoAdd the ability to set uniform mat3 from a FloatBuffer.
Talin [Thu, 25 Apr 2013 05:44:47 +0000 (22:44 -0700)]
Add the ability to set uniform mat3 from a FloatBuffer.

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.