OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
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 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 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 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.

11 years agoAdded a convenience method
Peter LaValle [Fri, 5 Jul 2013 13:21:01 +0000 (14:21 +0100)]
Added a convenience method

I added a method that takes two Vector3 objects, unpacks them, then calls the "real" line method

11 years agoRectangle, add getPosition returns Vector2
Alex Vega [Fri, 5 Jul 2013 09:13:50 +0000 (02:13 -0700)]
Rectangle, add getPosition returns Vector2

Created private Vector2 to avoid creating new Vector2 with each call of getPosition method.

11 years agoFix nested iterator
Xoppa [Thu, 4 Jul 2013 12:53:00 +0000 (14:53 +0200)]
Fix nested iterator

11 years agoAdd parsing of tile terrain information
Justin Shapcott [Wed, 3 Jul 2013 04:24:59 +0000 (21:24 -0700)]
Add parsing of tile terrain information

Note: At this time, the terraintypes is not parsed so the information
obtained from tiles is only informational at this time. Will add the
terraintypes parsing in another commit.

11 years agoUpdate bullet tests
Xoppa [Tue, 2 Jul 2013 18:58:46 +0000 (20:58 +0200)]
Update bullet tests

11 years agoSwig generated files
Xoppa [Tue, 2 Jul 2013 18:57:33 +0000 (20:57 +0200)]
Swig generated files

11 years agoKeep reference to MotionState and CollisionShape
Xoppa [Tue, 2 Jul 2013 18:54:50 +0000 (20:54 +0200)]
Keep reference to MotionState and CollisionShape

11 years agoMerge pull request #490 from ttencate/master
Mario Zechner [Sun, 30 Jun 2013 10:27:44 +0000 (03:27 -0700)]
Merge pull request #490 from ttencate/master

Bugfixes, simplifications and tests for EarClippingTriangulator

11 years agoRemove dead code
Thomas ten Cate [Sun, 30 Jun 2013 08:26:54 +0000 (09:26 +0100)]
Remove dead code

11 years agoFix coinciding points case, and clean up a bit
Thomas ten Cate [Sun, 30 Jun 2013 08:17:33 +0000 (09:17 +0100)]
Fix coinciding points case, and clean up a bit

11 years agoAdd more test cases, one failing
Thomas ten Cate [Sun, 30 Jun 2013 07:53:48 +0000 (08:53 +0100)]
Add more test cases, one failing

11 years agoFix bug, and add some test cases for invalid (non-simple) polygons
Thomas ten Cate [Sun, 30 Jun 2013 07:11:27 +0000 (08:11 +0100)]
Fix bug, and add some test cases for invalid (non-simple) polygons

11 years agoPre-allocate the known number of triangles
Thomas ten Cate [Sun, 30 Jun 2013 07:02:57 +0000 (08:02 +0100)]
Pre-allocate the known number of triangles

11 years agoRun the code formatter
Thomas ten Cate [Sun, 30 Jun 2013 06:58:55 +0000 (07:58 +0100)]
Run the code formatter

11 years agoImprove some comments
Thomas ten Cate [Sun, 30 Jun 2013 06:57:22 +0000 (07:57 +0100)]
Improve some comments

11 years agoOnly update type of vertices next to the clipped ear
Thomas ten Cate [Sun, 30 Jun 2013 06:41:36 +0000 (07:41 +0100)]
Only update type of vertices next to the clipped ear

11 years agoStop needlessly using doubles; it only makes the now-fixed problem less likely, not...
Thomas ten Cate [Sun, 30 Jun 2013 06:26:56 +0000 (07:26 +0100)]
Stop needlessly using doubles; it only makes the now-fixed problem less likely, not impossible

11 years agoMake some common parameters into private fields
Thomas ten Cate [Sun, 30 Jun 2013 06:23:13 +0000 (07:23 +0100)]
Make some common parameters into private fields

11 years agoRemove dodgy and now unneeded collinearity check
Thomas ten Cate [Sun, 30 Jun 2013 06:14:09 +0000 (07:14 +0100)]
Remove dodgy and now unneeded collinearity check

11 years agoFix some comments
Thomas ten Cate [Sun, 30 Jun 2013 06:13:44 +0000 (07:13 +0100)]
Fix some comments

11 years agoImplement desperate mode, preventing infinite loop from #207 and #1407
Thomas ten Cate [Sun, 30 Jun 2013 06:03:48 +0000 (07:03 +0100)]
Implement desperate mode, preventing infinite loop from #207 and #1407

11 years agoOnly correct the winding order once
Thomas ten Cate [Sun, 30 Jun 2013 05:53:50 +0000 (06:53 +0100)]
Only correct the winding order once

11 years agoSimplify, because we know winding order
Thomas ten Cate [Sun, 30 Jun 2013 05:52:42 +0000 (06:52 +0100)]
Simplify, because we know winding order

11 years agoUse left/right keys in test to cycle polygon vertex order
Thomas ten Cate [Sun, 30 Jun 2013 05:50:24 +0000 (06:50 +0100)]
Use left/right keys in test to cycle polygon vertex order

11 years agoAdd yet more test cases
Thomas ten Cate [Sun, 30 Jun 2013 05:34:12 +0000 (06:34 +0100)]
Add yet more test cases

11 years agoAdd a TODO
Thomas ten Cate [Sun, 30 Jun 2013 05:26:52 +0000 (06:26 +0100)]
Add a TODO

11 years agoAdd more test cases
Thomas ten Cate [Sun, 30 Jun 2013 05:26:42 +0000 (06:26 +0100)]
Add more test cases

11 years agoConsider points on triangle edge to be inside; fixes #815
Thomas ten Cate [Sun, 30 Jun 2013 05:17:46 +0000 (06:17 +0100)]
Consider points on triangle edge to be inside; fixes #815

11 years agoRemove Hodor code (a class saying its own name over and over again)
Thomas ten Cate [Sun, 30 Jun 2013 03:53:03 +0000 (04:53 +0100)]
Remove Hodor code (a class saying its own name over and over again)

11 years agoInline isAnyVertexInTriangle method to make it more flexible
Thomas ten Cate [Sun, 30 Jun 2013 03:50:08 +0000 (04:50 +0100)]
Inline isAnyVertexInTriangle method to make it more flexible

11 years agoPass vertices as vectors for more readable code
Thomas ten Cate [Sun, 30 Jun 2013 03:17:59 +0000 (04:17 +0100)]
Pass vertices as vectors for more readable code

11 years agoAdd a test for the triangulator (crashing cases commented out)
Thomas ten Cate [Sun, 30 Jun 2013 03:16:47 +0000 (04:16 +0100)]
Add a test for the triangulator (crashing cases commented out)

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 28 Jun 2013 23:20:31 +0000 (01:20 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoFixed JPG export.
NathanSweet [Fri, 28 Jun 2013 23:20:20 +0000 (01:20 +0200)]
Fixed JPG export.

11 years agoFix Intersector#insersectLines
Justin Shapcott [Fri, 28 Jun 2013 22:58:28 +0000 (15:58 -0700)]
Fix Intersector#insersectLines

Don't return true for parallel lines.

Note: This does not report true in the case where the two lines are
actually the same line. Not sure if it should.

11 years agomerged manually
badlogic [Fri, 28 Jun 2013 17:18:14 +0000 (19:18 +0200)]
merged manually

11 years agoi suck
badlogic [Fri, 28 Jun 2013 17:17:41 +0000 (19:17 +0200)]
i suck

11 years agoMerge pull request #489 from sinistersnare/patch-1
Mario Zechner [Fri, 28 Jun 2013 16:18:08 +0000 (09:18 -0700)]
Merge pull request #489 from sinistersnare/patch-1

Fixed a typo in GL10.java

11 years agoMerge pull request #487 from semtiko/patch-2
Mario Zechner [Fri, 28 Jun 2013 16:16:15 +0000 (09:16 -0700)]
Merge pull request #487 from semtiko/patch-2

Circle, add X/Y setters

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 28 Jun 2013 16:13:20 +0000 (18:13 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoAdd getter for Animation play mode
Justin Shapcott [Fri, 28 Jun 2013 15:13:36 +0000 (08:13 -0700)]
Add getter for Animation play mode

As requested in Issue 1538.

11 years agoConvert input images if needed.
NathanSweet [Fri, 28 Jun 2013 11:13:16 +0000 (13:13 +0200)]
Convert input images if needed.

11 years agoShould not have been committed.
NathanSweet [Fri, 28 Jun 2013 10:36:44 +0000 (12:36 +0200)]
Should not have been committed.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 28 Jun 2013 09:02:14 +0000 (11:02 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoAdded image dimensions to alias checksum.
NathanSweet [Fri, 28 Jun 2013 09:02:06 +0000 (11:02 +0200)]
Added image dimensions to alias checksum.

11 years agoFixed exception being hidden when image fails to load.
NathanSweet [Fri, 28 Jun 2013 09:01:33 +0000 (11:01 +0200)]
Fixed exception being hidden when image fails to load.

11 years agoFixed showing SelectBox.
NathanSweet [Fri, 28 Jun 2013 09:00:52 +0000 (11:00 +0200)]
Fixed showing SelectBox.

11 years agoFixed a typo in GL10.java
Davis Silverman [Fri, 28 Jun 2013 05:40:13 +0000 (01:40 -0400)]
Fixed a typo in GL10.java

I'm a pedantic.