OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge pull request #511 from methius/bug-1581-jsonTypeNPE
MobiDevelop [Thu, 18 Jul 2013 19:41:23 +0000 (12:41 -0700)]
Merge pull request #511 from methius/bug-1581-jsonTypeNPE

Fixes Issue #1581; caused by assumption that type is null.

11 years agoFixes Issue #1581; caused by assumption that type is null.
GJ Roelofs [Wed, 17 Jul 2013 21:21:55 +0000 (23:21 +0200)]
Fixes Issue #1581; caused by assumption that type is null.

11 years agoMerge pull request #510 from xoppa/3dapi
Xoppa [Tue, 16 Jul 2013 16:58:20 +0000 (09:58 -0700)]
Merge pull request #510 from xoppa/3dapi

DefaultTextureBinder: Reset texture descriptor at begin

11 years agoDefaultTextureBinder: Reset texture descriptor at begin
Xoppa [Tue, 16 Jul 2013 16:55:11 +0000 (18:55 +0200)]
DefaultTextureBinder: Reset texture descriptor at begin

11 years agoAdd Enum to list of classes included in reflection
Justin Shapcott [Tue, 16 Jul 2013 13:43:56 +0000 (06:43 -0700)]
Add Enum to list of classes included in reflection

11 years agoFix getKey in ArrayMap to do proper comparison
Justin Shapcott [Mon, 15 Jul 2013 22:02:07 +0000 (15:02 -0700)]
Fix getKey in ArrayMap to do proper comparison

11 years agoChange setupLoop to default access
Justin Shapcott [Mon, 15 Jul 2013 17:09:30 +0000 (10:09 -0700)]
Change setupLoop to default access

Subclasses should not have access to this method.

11 years agoMerge pull request #498 from moly/gwtsound
MobiDevelop [Mon, 15 Jul 2013 17:08:57 +0000 (10:08 -0700)]
Merge pull request #498 from moly/gwtsound

Implemented missing sound functionality in GWT backend

11 years agoadjusted access modifiers in GwtApplication
moly [Mon, 15 Jul 2013 12:56:41 +0000 (13:56 +0100)]
adjusted access modifiers in GwtApplication

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx into gwtsound
moly [Mon, 15 Jul 2013 12:32:33 +0000 (13:32 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx into gwtsound

11 years agoMerge pull request #491 from regnarock/master
MobiDevelop [Sun, 14 Jul 2013 17:35:51 +0000 (10:35 -0700)]
Merge pull request #491 from regnarock/master

Issue 1451 Patch - Indexes and aliases can now work together

11 years agoupdated robovm binaries...
badlogic [Sat, 13 Jul 2013 15:54:06 +0000 (17:54 +0200)]
updated robovm binaries...

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sat, 13 Jul 2013 15:03:35 +0000 (17:03 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agofixed android native build
badlogic [Sat, 13 Jul 2013 15:03:27 +0000 (17:03 +0200)]
fixed android native build

11 years agoAdd tiled-preprocessor to build.
Justin Shapcott [Sat, 13 Jul 2013 14:28:43 +0000 (07:28 -0700)]
Add tiled-preprocessor to build.

11 years agoMerge pull request #509 from ntherning/master
Mario Zechner [Sat, 13 Jul 2013 14:23:35 +0000 (07:23 -0700)]
Merge pull request #509 from ntherning/master

accelerometer fix

11 years agomodified CHANGES
badlogic [Sat, 13 Jul 2013 11:41:46 +0000 (13:41 +0200)]
modified CHANGES

11 years agoadded GridPoint2, GridPoint3, for integer positions
badlogic [Sat, 13 Jul 2013 11:36:16 +0000 (13:36 +0200)]
added GridPoint2, GridPoint3, for integer positions

11 years agoAdded accelerometer support to IOSInput in RoboVM backend.
Niklas Therning [Sat, 13 Jul 2013 11:34:46 +0000 (13:34 +0200)]
Added accelerometer support to IOSInput in RoboVM backend.

11 years agomerged master
badlogic [Sat, 13 Jul 2013 11:17:38 +0000 (13:17 +0200)]
merged master

11 years agoadded Bresenham for 2D
badlogic [Sat, 13 Jul 2013 11:14:00 +0000 (13:14 +0200)]
added Bresenham for 2D

11 years agoFix Issue 1543
Justin Shapcott [Fri, 12 Jul 2013 22:07:06 +0000 (15:07 -0700)]
Fix Issue 1543

Write class information for enums when the type is not known.

11 years agofixed issue 1515, contactlistener isn't called on destroyBody/Joing
badlogic [Fri, 12 Jul 2013 12:47:33 +0000 (14:47 +0200)]
fixed issue 1515, contactlistener isn't called on destroyBody/Joing

11 years agofirst shader graph editor commit
badlogic [Fri, 12 Jul 2013 12:43:54 +0000 (13:43 +0100)]
first shader graph editor commit

11 years agoFix Issue 1570
MobiDevelop [Fri, 12 Jul 2013 04:17:57 +0000 (21:17 -0700)]
Fix Issue 1570

11 years agoMerge pull request #506 from VinceAngel/master
Mario Zechner [Thu, 11 Jul 2013 22:52:12 +0000 (15:52 -0700)]
Merge pull request #506 from VinceAngel/master

getScale on Matrix4

11 years agoFix Issue 1561
Justin Shapcott [Thu, 11 Jul 2013 22:46:16 +0000 (15:46 -0700)]
Fix Issue 1561

11 years agofixed up stuff
badlogic [Thu, 11 Jul 2013 22:48:55 +0000 (23:48 +0100)]
fixed up stuff

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 11 Jul 2013 22:36:59 +0000 (23:36 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoye ol' cpu burner
badlogic [Thu, 11 Jul 2013 22:36:48 +0000 (23:36 +0100)]
ye ol' cpu burner

11 years agoFix Issue 1567
Justin Shapcott [Thu, 11 Jul 2013 22:05:55 +0000 (15:05 -0700)]
Fix Issue 1567

Use the same FileType as the font file provided in the BitmapFontData, and
fall back to internal if we don't have a font file.

11 years agoAdd key mapping for numpad numbers
Justin Shapcott [Thu, 11 Jul 2013 19:17:18 +0000 (12:17 -0700)]
Add key mapping for numpad numbers

11 years agoMusic completion listener uses postRunnable on mobile
moly [Thu, 11 Jul 2013 16:04:32 +0000 (17:04 +0100)]
Music completion listener uses postRunnable on mobile

11 years agofixed completion listener firing when looping in gwt
moly [Thu, 11 Jul 2013 15:43:26 +0000 (16:43 +0100)]
fixed completion listener firing when looping in gwt

11 years agoupdated CHANGES
badlogic [Tue, 9 Jul 2013 16:23:20 +0000 (17:23 +0100)]
updated CHANGES

11 years agoMerge pull request #502 from xoppa/misc
Mario Zechner [Tue, 9 Jul 2013 16:20:54 +0000 (09:20 -0700)]
Merge pull request #502 from xoppa/misc

Mesh cache attribute locations

11 years agoUse int[] instead of IntIntMap
Xoppa [Tue, 9 Jul 2013 15:35:48 +0000 (17:35 +0200)]
Use int[] instead of IntIntMap

11 years agoFix for getScale
VinceAngel [Mon, 8 Jul 2013 16:21:53 +0000 (18:21 +0200)]
Fix for getScale

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Mon, 8 Jul 2013 14:12:00 +0000 (15:12 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agorenamed nodes -> graphs
badlogic [Mon, 8 Jul 2013 14:11:45 +0000 (15:11 +0100)]
renamed nodes -> graphs

11 years agoAdded getScale method
VinceAngel [Mon, 8 Jul 2013 12:35:13 +0000 (14:35 +0200)]
Added getScale method

11 years agoMerge pull request #503 from loadstar81/master
MobiDevelop [Mon, 8 Jul 2013 04:26:39 +0000 (21:26 -0700)]
Merge pull request #503 from loadstar81/master

Fixed typo of canvasId in the gwt configuration.

11 years agoFixed simple typo in gwt config
Tom Mast [Mon, 8 Jul 2013 02:28:24 +0000 (22:28 -0400)]
Fixed simple typo in gwt config

11 years agofixed up CHANGES
badlogic [Sun, 7 Jul 2013 21:28:02 +0000 (23:28 +0200)]
fixed up CHANGES

11 years agoMove location!=null check
Xoppa [Sun, 7 Jul 2013 21:04:26 +0000 (23:04 +0200)]
Move location!=null check

11 years agoMesh cache attribute locations
Xoppa [Sun, 7 Jul 2013 16:26:33 +0000 (18:26 +0200)]
Mesh cache attribute locations

11 years agoSet succeed when skipping already preloaded asset
Justin Shapcott [Sun, 7 Jul 2013 15:29:20 +0000 (08:29 -0700)]
Set succeed when skipping already preloaded asset

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sat, 6 Jul 2013 23:24:32 +0000 (01:24 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agofixed maven platform poms
badlogic [Sat, 6 Jul 2013 23:24:24 +0000 (01:24 +0200)]
fixed maven platform poms

11 years agoups, loaded wrong shared lib...
badlogic [Sat, 6 Jul 2013 23:20:33 +0000 (01:20 +0200)]
ups, loaded wrong shared lib...

11 years agoMerge pull request #501 from xoppa/bullet
Xoppa [Sat, 6 Jul 2013 22:39:32 +0000 (15:39 -0700)]
Merge pull request #501 from xoppa/bullet

various MeshBuilder, ModelInstance, BoundingBox

11 years agoremove double slashes...
badlogic [Sat, 6 Jul 2013 22:28:06 +0000 (00:28 +0200)]
remove double slashes...

11 years agoremove double slashes...
badlogic [Sat, 6 Jul 2013 22:26:54 +0000 (00:26 +0200)]
remove double slashes...

11 years agoUpdated contributors file :D
badlogic [Sat, 6 Jul 2013 22:24:35 +0000 (00:24 +0200)]
Updated contributors file :D

11 years agovarious MeshBuilder, ModelInstance, BoundingBox
Xoppa [Sat, 6 Jul 2013 22:24:34 +0000 (00:24 +0200)]
various MeshBuilder, ModelInstance, BoundingBox

11 years agofixed up LICENSE etc. files
badlogic [Sat, 6 Jul 2013 22:00:53 +0000 (00:00 +0200)]
fixed up LICENSE etc. files

11 years agofiles, need to update contributors
badlogic [Sat, 6 Jul 2013 22:00:03 +0000 (00:00 +0200)]
files, need to update contributors

11 years agofixed up build-template.xml, didn't copy x86 natives
badlogic [Sat, 6 Jul 2013 21:55:54 +0000 (23:55 +0200)]
fixed up build-template.xml, didn't copy x86 natives

11 years agofixed up fetch script and setup-ui config
badlogic [Sat, 6 Jul 2013 21:50:59 +0000 (23:50 +0200)]
fixed up fetch script and setup-ui config

11 years agoremoved dist stuff from build.xml, gles bindings are build into libgdx.so now
badlogic [Sat, 6 Jul 2013 21:41:41 +0000 (23:41 +0200)]
removed dist stuff from build.xml, gles bindings are build into libgdx.so now

11 years agomoved android gl20 into gdx core, unifying it with ios eventually and making it suppo...
badlogic [Sat, 6 Jul 2013 21:38:54 +0000 (23:38 +0200)]
moved android gl20 into gdx core, unifying it with ios eventually and making it support x86 more easily

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sat, 6 Jul 2013 20:41:01 +0000 (22:41 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agofixed audio extension Android build, we don't support x86
badlogic [Sat, 6 Jul 2013 20:40:52 +0000 (22:40 +0200)]
fixed audio extension Android build, we don't support x86

11 years agoMerge pull request #499 from jericbryledy/master
MobiDevelop [Sat, 6 Jul 2013 19:11:07 +0000 (12:11 -0700)]
Merge pull request #499 from jericbryledy/master

updates the pom.xml

11 years agoMerge pull request #500 from xoppa/bullet
Xoppa [Sat, 6 Jul 2013 18:30:39 +0000 (11:30 -0700)]
Merge pull request #500 from xoppa/bullet

Bullet & 3D: small changes

11 years agoAdd softbody normal support
Xoppa [Sat, 6 Jul 2013 18:14:42 +0000 (20:14 +0200)]
Add softbody normal support

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx into 3dapi
Xoppa [Sat, 6 Jul 2013 16:30:46 +0000 (18:30 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi

11 years agoAdd check to ensure assets are only loaded once
Justin Shapcott [Sat, 6 Jul 2013 15:54:25 +0000 (08:54 -0700)]
Add check to ensure assets are only loaded once

11 years agoAdd ability to define multiple preloader bundles
Justin Shapcott [Sat, 6 Jul 2013 15:46:07 +0000 (08:46 -0700)]
Add ability to define multiple preloader bundles

Allows to defer preloading of assets until just before they are needed.

11 years agojni module wasn't working correctly without the includes (.mk.template, .h, .c, etc)
Jeric Bryle Sy Dy [Sat, 6 Jul 2013 09:32:32 +0000 (17:32 +0800)]
jni module wasn't working correctly without the includes (.mk.template, .h, .c, etc)
-included everything in packages except for .java

11 years agochanged gdx-core to include everything (but .java) instead of just including .glsl...
Jeric Bryle Sy Dy [Sat, 6 Jul 2013 09:28:09 +0000 (17:28 +0800)]
changed gdx-core to include everything (but .java) instead of just including .glsl, .fnt, and .png

11 years agoAdd arc drawing to ShapeRenderer
Justin Shapcott [Fri, 5 Jul 2013 22:10:20 +0000 (15:10 -0700)]
Add arc drawing to ShapeRenderer

11 years agoProperly dispose completion listener in openal
moly [Fri, 5 Jul 2013 20:54:08 +0000 (21:54 +0100)]
Properly dispose completion listener in openal

11 years agoreuse IOSSounds, similar to Android's SoundPool
moly [Fri, 5 Jul 2013 20:48:01 +0000 (21:48 +0100)]
reuse IOSSounds, similar to Android's SoundPool

11 years agoreduce completion listener code in AndroidMusic
moly [Fri, 5 Jul 2013 20:38:01 +0000 (21:38 +0100)]
reduce completion listener code in AndroidMusic

11 years agoimplement missing sound functions in gwt backend
moly [Fri, 5 Jul 2013 20:32:59 +0000 (21:32 +0100)]
implement missing sound functions in gwt backend

11 years agoMerge pull request #496 from g-pechorin/patch-1
MobiDevelop [Fri, 5 Jul 2013 20:31:22 +0000 (13:31 -0700)]
Merge pull request #496 from g-pechorin/patch-1

Added a convenience method

11 years agoMerge pull request #495 from semtiko/patch-2
Xoppa [Fri, 5 Jul 2013 20:25:50 +0000 (13:25 -0700)]
Merge pull request #495 from semtiko/patch-2

Rectangle, add getPosition returns Vector2

11 years agoJavaDoc fixed
Alex Vega [Fri, 5 Jul 2013 18:47:51 +0000 (11:47 -0700)]
JavaDoc fixed

11 years agoUpdate Rectangle.java
Alex Vega [Fri, 5 Jul 2013 18:45:34 +0000 (11:45 -0700)]
Update Rectangle.java

11 years agoChanges to Box2d World
Justin Shapcott [Fri, 5 Jul 2013 18:32:17 +0000 (11:32 -0700)]
Changes to Box2d World

Fill a user supplied Array for #getJoints() and #getBodies().

11 years agoMerge pull request #493 from xoppa/bullet
Mario Zechner [Fri, 5 Jul 2013 18:31:09 +0000 (11:31 -0700)]
Merge pull request #493 from xoppa/bullet

Bullet: keep reference to MotionState and CollisionShape

11 years agoMerge pull request #497 from jericbryledy/master
Mario Zechner [Fri, 5 Jul 2013 18:26:25 +0000 (11:26 -0700)]
Merge pull request #497 from jericbryledy/master

maven includes

11 years agoincluded default .fnt and .png as requested in issue #1500 comment #5 (https://code...
Jeric Bryle Sy Dy [Fri, 5 Jul 2013 18:18:56 +0000 (02:18 +0800)]
included default .fnt and .png as requested in issue #1500 comment #5 (https://code.google.com/p/libgdx/issues/detail?id=1500#c5)
-included all .fnt and .png in the resource node

11 years agoMerge branch 'master' of github.com:jericbryledy/libgdx
Jeric Bryle Sy Dy [Fri, 5 Jul 2013 18:10:06 +0000 (02:10 +0800)]
Merge branch 'master' of github.com:jericbryledy/libgdx

11 years agofixed issue #1500 (https://code.google.com/p/libgdx/issues/detail?id=1500)
Jeric Bryle Sy Dy [Fri, 5 Jul 2013 18:07:41 +0000 (02:07 +0800)]
fixed issue #1500 (https://code.google.com/p/libgdx/issues/detail?id=1500)
-fixed by adding a resource node in the pom of libGDX Core (artifactId: gdx) which includes all *.glsl files

11 years agoadded super simple TimerTest...
badlogic [Fri, 5 Jul 2013 18:01:13 +0000 (20:01 +0200)]
added super simple TimerTest...

11 years agofixed issue 1241, resize is called properly on iOS
badlogic [Fri, 5 Jul 2013 17:55:26 +0000 (19:55 +0200)]
fixed issue 1241, resize is called properly on iOS

11 years agofixed issue 1415, resume on iOS works as intended
badlogic [Fri, 5 Jul 2013 17:36:54 +0000 (19:36 +0200)]
fixed issue 1415, resume on iOS works as intended

11 years agoremoved assertions from `line()` methods
Peter LaValle [Fri, 5 Jul 2013 17:08:02 +0000 (18:08 +0100)]
removed assertions from `line()` methods

11 years agoremoved glShaderSource from GL20, added methods to ShaderProgram to retrieve source
badlogic [Fri, 5 Jul 2013 17:01:04 +0000 (19:01 +0200)]
removed glShaderSource from GL20, added methods to ShaderProgram to retrieve source

11 years agofixed issue 1509, deadlock in AndroidGraphics when executing runnables
badlogic [Fri, 5 Jul 2013 16:54:45 +0000 (18:54 +0200)]
fixed issue 1509, deadlock in AndroidGraphics when executing runnables

11 years agofixed issue 1524, Animation#getKeyFrame set the play mode...
badlogic [Fri, 5 Jul 2013 16:31:42 +0000 (18:31 +0200)]
fixed issue 1524, Animation#getKeyFrame set the play mode...

11 years agofixed issue 1544, glGetActiveUniform/Attribute didn't work correctly in LWJGL backend
badlogic [Fri, 5 Jul 2013 16:23:52 +0000 (18:23 +0200)]
fixed issue 1544, glGetActiveUniform/Attribute didn't work correctly in LWJGL backend

11 years agoline convenience method
Peter LaValle [Fri, 5 Jul 2013 16:09:48 +0000 (17:09 +0100)]
line convenience method

- added a Vector2 line convenience method
- added a 3D line method that takes colors
- all `line()` methods are now final (since they're "just" wrappers) and now feed into 3D w/Color method

11 years agofixed issue 1547, added x86 Android support. You'll have to copy the android binaries...
badlogic [Fri, 5 Jul 2013 16:03:30 +0000 (18:03 +0200)]
fixed issue 1547, added x86 Android support. You'll have to copy the android binaries yourself

11 years agofixed issue 1553, missing RevoluteJoint methods
badlogic [Fri, 5 Jul 2013 15:41:01 +0000 (17:41 +0200)]
fixed issue 1553, missing RevoluteJoint methods

11 years agoRectangle, add getSize and small changes
Alex Vega [Fri, 5 Jul 2013 14:36:19 +0000 (07:36 -0700)]
Rectangle, add getSize and small changes

11 years agoAdd ability to provide a custom Preloader
Justin Shapcott [Fri, 5 Jul 2013 13:56:23 +0000 (06:56 -0700)]
Add ability to provide a custom Preloader

11 years agoAdd new classes to GWT module def.
Justin Shapcott [Fri, 5 Jul 2013 13:54:32 +0000 (06:54 -0700)]
Add new classes to GWT module def.