OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agoMerge branch 'master' into mapsapi
Mario Zechner [Fri, 22 Feb 2013 17:24:11 +0000 (18:24 +0100)]
Merge branch 'master' into mapsapi

11 years agofixed Super Koalio, changed TiledMapTileLayer API, only allocating Cells where necess...
Mario Zechner [Fri, 22 Feb 2013 17:22:44 +0000 (18:22 +0100)]
fixed Super Koalio, changed TiledMapTileLayer API, only allocating Cells where necessary, bounds checking

11 years agoChange collision detection in SuperKoalio test.
Justin Shapcott [Fri, 22 Feb 2013 13:24:25 +0000 (06:24 -0700)]
Change collision detection in SuperKoalio test.

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
badlogic [Fri, 22 Feb 2013 12:44:40 +0000 (13:44 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agoupdated IKVM build
badlogic [Fri, 22 Feb 2013 12:43:50 +0000 (13:43 +0100)]
updated IKVM build

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 22 Feb 2013 02:07:05 +0000 (03:07 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoTree, javadocs.
NathanSweet [Fri, 22 Feb 2013 02:06:57 +0000 (03:06 +0100)]
Tree, javadocs.

11 years agoMerge pull request #257 from bitiotic/update-readme-2
Mario Zechner [Thu, 21 Feb 2013 18:04:54 +0000 (10:04 -0800)]
Merge pull request #257 from bitiotic/update-readme-2

Update README.md

11 years agoUpdate README.md
bitiotic [Thu, 21 Feb 2013 17:00:03 +0000 (09:00 -0800)]
Update README.md

Update compilation instructions and point off to documentation and
wiki pages for more details.
Update top-level headers to make them a bit more verbose

11 years agoMerge branch 'master' into mapsapi
Mario Zechner [Thu, 21 Feb 2013 10:55:01 +0000 (11:55 +0100)]
Merge branch 'master' into mapsapi

11 years agoMerge pull request #256 from bitiotic/squash-vector2-tmp
Mario Zechner [Thu, 21 Feb 2013 10:53:48 +0000 (02:53 -0800)]
Merge pull request #256 from bitiotic/squash-vector2-tmp

Remove Vector2.tmp() and its variations (.tmp{1,2,3})

11 years agorenamed to GleedTest
Mario Zechner [Thu, 21 Feb 2013 10:26:23 +0000 (11:26 +0100)]
renamed to GleedTest

11 years agoand this is why you don't use all upper case in class names
Mario Zechner [Thu, 21 Feb 2013 10:25:31 +0000 (11:25 +0100)]
and this is why you don't use all upper case in class names

11 years agoadded .class to gitignore
Mario Zechner [Thu, 21 Feb 2013 10:22:51 +0000 (11:22 +0100)]
added .class to gitignore

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Thu, 21 Feb 2013 10:07:09 +0000 (11:07 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoremoved class files...
Mario Zechner [Thu, 21 Feb 2013 09:48:58 +0000 (10:48 +0100)]
removed class files...

11 years agoMerge pull request #254 from sourcecod/master
Mario Zechner [Thu, 21 Feb 2013 09:33:09 +0000 (01:33 -0800)]
Merge pull request #254 from sourcecod/master

cleanup invader example

11 years agoMerge pull request #255 from xoppa/misc
Mario Zechner [Thu, 21 Feb 2013 09:32:39 +0000 (01:32 -0800)]
Merge pull request #255 from xoppa/misc

jni-gen, Add $compilerSuffix property

11 years agoMerge pull request #253 from Thotep/master
Mario Zechner [Thu, 21 Feb 2013 09:31:34 +0000 (01:31 -0800)]
Merge pull request #253 from Thotep/master

Added Vector.limit(float maxLength) methods

11 years agoadded platformer example, not done yet, grrr collision detection
Mario Zechner [Thu, 21 Feb 2013 09:05:15 +0000 (10:05 +0100)]
added platformer example, not done yet, grrr collision detection

11 years agoRemove Vector2.tmp() and its variations (.tmp{1,2,3})
bitiotic [Thu, 7 Feb 2013 00:31:06 +0000 (16:31 -0800)]
Remove Vector2.tmp() and its variations (.tmp{1,2,3})

Down with public static mutable objects.  Up with private static mutable objects ... I guess.
Remove Vector2.tmp usage from PathTest and StageTest
Add a static scratch vector in pax-britannica's Ship.java
Replace Vector2.tmp usage with local static scratch variables throughout scene2d.

This breaks the API since Vector2.tmp* were all public.

11 years agoAdd $ndkSuffix property
Xoppa [Wed, 20 Feb 2013 22:19:04 +0000 (23:19 +0100)]
Add $ndkSuffix property

11 years agoAdd $compilerSuffix property
Xoppa [Wed, 20 Feb 2013 22:02:22 +0000 (23:02 +0100)]
Add $compilerSuffix property

11 years agoremove unused imports and resources
Pedro Veloso [Wed, 20 Feb 2013 18:49:54 +0000 (18:49 +0000)]
remove unused imports and resources

11 years agoSelectBox, pass correct coordinates.
NathanSweet [Wed, 20 Feb 2013 10:58:50 +0000 (11:58 +0100)]
SelectBox, pass correct coordinates.

11 years agoTimer, use long millis instead of float seconds.
NathanSweet [Wed, 20 Feb 2013 10:58:37 +0000 (11:58 +0100)]
Timer, use long millis instead of float seconds.

11 years agoAdded Vector.limit(float maxLength) methods
Przemek Muller [Wed, 20 Feb 2013 08:52:25 +0000 (09:52 +0100)]
Added Vector.limit(float maxLength) methods

11 years agomade MapProperties simpler through the power of generics
Mario Zechner [Wed, 20 Feb 2013 01:30:45 +0000 (02:30 +0100)]
made MapProperties simpler through the power of generics

11 years agoremoved all getters from MapProperties :D
Mario Zechner [Wed, 20 Feb 2013 01:20:21 +0000 (02:20 +0100)]
removed all getters from MapProperties :D

11 years agofixed smallish stuff
Mario Zechner [Tue, 19 Feb 2013 23:23:11 +0000 (00:23 +0100)]
fixed smallish stuff

11 years agoLwjglGraphics, never allow canvas size of 0.
NathanSweet [Tue, 19 Feb 2013 18:48:23 +0000 (19:48 +0100)]
LwjglGraphics, never allow canvas size of 0.

11 years agofixed LwjglCanvas issue, width/height of canvas was 0, minDimensions wasn't respected...
badlogic [Tue, 19 Feb 2013 18:45:26 +0000 (19:45 +0100)]
fixed LwjglCanvas issue, width/height of canvas was 0, minDimensions wasn't respected by Swing layouter. I hate Swing

11 years agoadded LwjglCanvasTest
badlogic [Tue, 19 Feb 2013 18:26:41 +0000 (19:26 +0100)]
added LwjglCanvasTest

11 years agomerged with master
Mario Zechner [Tue, 19 Feb 2013 16:18:04 +0000 (17:18 +0100)]
merged with master

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Tue, 19 Feb 2013 14:53:28 +0000 (15:53 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agoremoved tmp() from Vector interface
Mario Zechner [Tue, 19 Feb 2013 14:53:13 +0000 (15:53 +0100)]
removed tmp() from Vector interface

11 years agoTimer, better error messages.
NathanSweet [Tue, 19 Feb 2013 14:50:24 +0000 (15:50 +0100)]
Timer, better error messages.
MathUtils, PI2.
Slider, clamp, don't throw, when setValue is out of range.
LwjglGraphics, pause between create display tries.

11 years agoscene2d, changed semantics of Stage#clear() and Group#clear(), added clearChildren...
NathanSweet [Tue, 19 Feb 2013 14:49:08 +0000 (15:49 +0100)]
scene2d, changed semantics of Stage#clear() and Group#clear(), added clearChildren, clearListeners.

11 years agowhat have i done...
Mario Zechner [Tue, 19 Feb 2013 14:22:42 +0000 (15:22 +0100)]
what have i done...

11 years agofixed issue 1247, continuous rendering methods in GwtGraphics
Mario Zechner [Tue, 19 Feb 2013 14:18:02 +0000 (15:18 +0100)]
fixed issue 1247, continuous rendering methods in GwtGraphics

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Tue, 19 Feb 2013 14:02:35 +0000 (15:02 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx

11 years agofixed issue 1258, Intersector.intersectRayBounds was not public
Mario Zechner [Tue, 19 Feb 2013 13:56:14 +0000 (14:56 +0100)]
fixed issue 1258, Intersector.intersectRayBounds was not public

11 years agoMerge pull request #248 from xoppa/bullet
Mario Zechner [Tue, 19 Feb 2013 13:06:44 +0000 (05:06 -0800)]
Merge pull request #248 from xoppa/bullet

Bullet, seperate render and update, add CollisionTest

11 years agoMerge pull request #241 from xoppa/misc
Mario Zechner [Tue, 19 Feb 2013 13:04:19 +0000 (05:04 -0800)]
Merge pull request #241 from xoppa/misc

Add Vector, Path, Bezier and BSpline

11 years agoMerge pull request #250 from johlo/draganddrop
Nathan Sweet [Tue, 19 Feb 2013 13:01:16 +0000 (05:01 -0800)]
Merge pull request #250 from johlo/draganddrop

Don't allow simultaneous drags in DragAndDrop class

11 years agoMerge pull request #249 from viridia/master
Nathan Sweet [Tue, 19 Feb 2013 12:33:33 +0000 (04:33 -0800)]
Merge pull request #249 from viridia/master

Add isCurrent() method to LwjglAWTCanvas.

11 years agoadded Ellipse
Mario Zechner [Mon, 18 Feb 2013 19:54:33 +0000 (20:54 +0100)]
added Ellipse

11 years agoCleanup of DragAndDrop simultaneous drag patch
Johan Lövdahl [Mon, 18 Feb 2013 16:09:02 +0000 (17:09 +0100)]
Cleanup of DragAndDrop simultaneous drag patch

Fixes issues pointed out by @bitiotic

11 years agoOnly allow one drag action at a time
Johan Lövdahl [Mon, 18 Feb 2013 11:13:22 +0000 (12:13 +0100)]
Only allow one drag action at a time

The DragAndDrop class only manages one payload and drag actor, so we
need to stop several drag events from happening at the same time.

11 years agoAdd TideMapLoader
Justin Shapcott [Sun, 17 Feb 2013 21:58:14 +0000 (14:58 -0700)]
Add TideMapLoader

In addition to adding the loader for tide maps, added tests for the loader
and modified some classes to accomodate the Tide loader.

11 years agoMerge branch 'mapsapi' of https://github.com/libgdx/libgdx into mapsapi
Justin Shapcott [Sun, 17 Feb 2013 20:40:42 +0000 (13:40 -0700)]
Merge branch 'mapsapi' of https://github.com/libgdx/libgdx into mapsapi

Conflicts:
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapRenderer.java
tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java
tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java

11 years agoAdd TideMapLoader
Justin Shapcott [Sun, 17 Feb 2013 20:28:40 +0000 (13:28 -0700)]
Add TideMapLoader

Modified other classes as necessary to support the Tide loader.

11 years agofixed cached tiled renderer
Mario Zechner [Sun, 17 Feb 2013 18:50:59 +0000 (19:50 +0100)]
fixed cached tiled renderer

11 years agomoved tiled renderers to their own files
Mario Zechner [Sun, 17 Feb 2013 17:47:52 +0000 (18:47 +0100)]
moved tiled renderers to their own files

11 years agoMerge branch 'master', remote-tracking branch 'origin' into mapsapi
Mario Zechner [Sun, 17 Feb 2013 17:03:02 +0000 (18:03 +0100)]
Merge branch 'master', remote-tracking branch 'origin' into mapsapi

11 years agofixed MapRenderer interface, removed begin/end, added setView, fixed renderer impleme...
Mario Zechner [Sun, 17 Feb 2013 17:02:43 +0000 (18:02 +0100)]
fixed MapRenderer interface, removed begin/end, added setView, fixed renderer implementations

11 years agoProperly dispose
Xoppa [Sun, 17 Feb 2013 00:35:45 +0000 (01:35 +0100)]
Properly dispose

11 years agoCleanup a bit
Xoppa [Sun, 17 Feb 2013 00:26:51 +0000 (01:26 +0100)]
Cleanup a bit

11 years agoAdd iterating over manifolds to the test CollisionTest
Xoppa [Sun, 17 Feb 2013 00:12:51 +0000 (01:12 +0100)]
Add iterating over manifolds to the test CollisionTest

11 years agoAdd BlendMode to TiledMapTile interface.
Justin Shapcott [Sat, 16 Feb 2013 16:31:56 +0000 (09:31 -0700)]
Add BlendMode to TiledMapTile interface.

BlendMode allows the renderer to potentially optimize the rendering of
a map by batching tiles with the same BlendMode together. This will be
particularly helpful in cases where the map has a large number of
non-blended tiles.

11 years agoremoved TiledMapRenderer, renamed TiledMapRenderer2
Mario Zechner [Sat, 16 Feb 2013 15:42:35 +0000 (16:42 +0100)]
removed TiledMapRenderer, renamed TiledMapRenderer2

11 years agoChanges to TiledMapRenderer2 - still wip.
Justin Shapcott [Sat, 16 Feb 2013 15:34:32 +0000 (08:34 -0700)]
Changes to TiledMapRenderer2 - still wip.

11 years agorenamed GLEEDTest to GleedTest, prettified TiledMap tests
Mario Zechner [Sat, 16 Feb 2013 15:03:41 +0000 (16:03 +0100)]
renamed GLEEDTest to GleedTest, prettified TiledMap tests

11 years agodisposing tiledmap textures in direct loader test
Mario Zechner [Sat, 16 Feb 2013 14:53:17 +0000 (15:53 +0100)]
disposing tiledmap textures in direct loader test

11 years agofixed merge conflicts, removed evil e.printStackTrace()...
Mario Zechner [Sat, 16 Feb 2013 14:51:31 +0000 (15:51 +0100)]
fixed merge conflicts, removed evil e.printStackTrace()...

11 years agoadded direct loading capabilities to TmxMapLoader, made Map disposable, added/renamed...
Mario Zechner [Sat, 16 Feb 2013 14:47:20 +0000 (15:47 +0100)]
added direct loading capabilities to TmxMapLoader, made Map disposable, added/renamed tiled map tests, removed map loader package, moved loaders to their respective pacakge, added ImageResolver so writting common code base for AssetManager and direct loading of maps is easier

11 years agoAdd the ability to test whether the canvas context is current. This is mainly useful...
Talin [Sat, 16 Feb 2013 08:17:10 +0000 (00:17 -0800)]
Add the ability to test whether the canvas context is current. This is mainly useful for cases where you have multiple canvas contexts, and you want to know if any of them are current before loading a resource that requires an active context.

11 years agoMerge remote-tracking branch 'siondream/mapsapi' into mapsapi
Justin Shapcott [Sat, 16 Feb 2013 04:33:31 +0000 (21:33 -0700)]
Merge remote-tracking branch 'siondream/mapsapi' into mapsapi

Conflicts:
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapRenderer.java

11 years agoAdd CollisionTest
Xoppa [Fri, 15 Feb 2013 23:27:45 +0000 (00:27 +0100)]
Add CollisionTest

11 years agoSeparate render and update and return the entity on shoot.
Xoppa [Fri, 15 Feb 2013 23:25:20 +0000 (00:25 +0100)]
Separate render and update and return the entity on shoot.

11 years agoRemove SplineTest and CatmullRomSpline, rename CatmullRom to CatmullRomSpline.
Xoppa [Thu, 14 Feb 2013 17:48:22 +0000 (18:48 +0100)]
Remove SplineTest and CatmullRomSpline, rename CatmullRom to CatmullRomSpline.

11 years agoUpdate GdxTests to use PathTest
Xoppa [Thu, 14 Feb 2013 17:44:29 +0000 (18:44 +0100)]
Update GdxTests to use PathTest

11 years agoMerge branch 'master' of https://github.com/libgdx/libgdx into misc
Xoppa [Thu, 14 Feb 2013 17:33:16 +0000 (18:33 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx into misc

11 years agoRevert CatmullRomSpline
Xoppa [Thu, 14 Feb 2013 17:22:21 +0000 (18:22 +0100)]
Revert CatmullRomSpline

11 years agoRevert SplineTest to PathTest.
Xoppa [Thu, 14 Feb 2013 17:18:18 +0000 (18:18 +0100)]
Revert SplineTest to PathTest.

11 years agoReplace CatmullRomSpline, reuse SplineTest by renaming PathTest to SplineTest.
Xoppa [Thu, 14 Feb 2013 17:15:08 +0000 (18:15 +0100)]
Replace CatmullRomSpline, reuse SplineTest by renaming PathTest to SplineTest.

11 years agoRemove PathTest from the tests.
Xoppa [Thu, 14 Feb 2013 17:07:53 +0000 (18:07 +0100)]
Remove PathTest from the tests.

11 years agoMerge pull request #243 from IMakeGames/master
Mario Zechner [Thu, 14 Feb 2013 10:05:53 +0000 (02:05 -0800)]
Merge pull request #243 from IMakeGames/master

Making subclassing of Particle class feasible (by making fields protected)

11 years agoMerge pull request #242 from bitiotic/gwtcleanup
Mario Zechner [Thu, 14 Feb 2013 10:04:53 +0000 (02:04 -0800)]
Merge pull request #242 from bitiotic/gwtcleanup

GWT test cleanup

11 years agoMerge pull request #246 from bitiotic/antruntimefix3
Mario Zechner [Thu, 14 Feb 2013 10:02:48 +0000 (02:02 -0800)]
Merge pull request #246 from bitiotic/antruntimefix3

Add 'includeantruntime="false"' to javac

11 years agoMerge pull request #245 from bitiotic/javadocgen
Mario Zechner [Thu, 14 Feb 2013 10:02:31 +0000 (02:02 -0800)]
Merge pull request #245 from bitiotic/javadocgen

Improve generated javadoc and zipfile

11 years agoMerge pull request #247 from sridharsundaram/iosSocketExceptionBugfix
Mario Zechner [Thu, 14 Feb 2013 10:02:06 +0000 (02:02 -0800)]
Merge pull request #247 from sridharsundaram/iosSocketExceptionBugfix

Ios socket exception bugfix

11 years agoAdd 'includeantruntime="false"' to javac
bitiotic [Thu, 7 Feb 2013 00:59:50 +0000 (16:59 -0800)]
Add 'includeantruntime="false"' to javac

Newer versions of ANT warn about the fact that the ANT runtime is
included on a javac compile.  Since this is not generally what is
wanted (but is backwards compatible with older versions of ANT), a new
flag
includeantruntime="false"
will disable it.

This will clear up the Jenkins warnings like this:

    [javac] /var/lib/jenkins/workspace/libgdx/build-template.xml:51: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds

AFAICT, this is backwards compatible with older versions of ANT ...

11 years agoImprove generated javadoc and zipfile
bitiotic [Thu, 7 Feb 2013 00:57:14 +0000 (16:57 -0800)]
Improve generated javadoc and zipfile

Add a better copyright notice to the footer of javadoc (include the
magical © symbol, and the current year 2013).

Add the user-visible bits of the iOS and GWT backends to the javadoc
construction.

Change the version number to "0.9.9-SNAPSHOT", as I believe this is
where libGDX is.

11 years agoChanged fields of Particle class to protected, to make access in
Maximilian Csuk [Wed, 13 Feb 2013 17:30:39 +0000 (18:30 +0100)]
Changed fields of Particle class to protected, to make access in
subclass possible

11 years ago!A - Adds Javadocs for new Tiled objects, map, loader and renderer
siondream [Wed, 13 Feb 2013 08:05:17 +0000 (08:05 +0000)]
!A - Adds Javadocs for new Tiled objects, map, loader and renderer

11 years agoCleanup index.html for GWT test
bitiotic [Wed, 13 Feb 2013 07:25:45 +0000 (23:25 -0800)]
Cleanup index.html for GWT test

Move body out of <head> and into <body>.  Add a bit of text explaining
what's going on and where its from.

11 years agoStub out Thread and Texture a bit more for GWT backend
bitiotic [Tue, 12 Feb 2013 18:48:39 +0000 (10:48 -0800)]
Stub out Thread and Texture a bit more for GWT backend

Add a (working?) Thread.setUncaughtExceptionHandler.

Add a no-op setEnforcePotImages() on Texture.

11 years agoFixup GWT Test runner
bitiotic [Wed, 13 Feb 2013 07:30:05 +0000 (23:30 -0800)]
Fixup GWT Test runner

Add some logging, and enable the log console.
Only set dispose flag on ESC if a test is active.
Disable NetAPITest (it won't even compile because it abuses FileHandles).

11 years ago!T - Adds Javadocs for generic maps, layers and objects
siondream [Tue, 12 Feb 2013 23:35:05 +0000 (23:35 +0000)]
!T - Adds Javadocs for generic maps, layers and objects
!T - Improves Javadocs for Gleed module

11 years agoAdd better visual test
Xoppa [Tue, 12 Feb 2013 22:47:45 +0000 (23:47 +0100)]
Add better visual test

11 years agoRemove usage of Vector#tmp() in Bezier and BSpline
Xoppa [Tue, 12 Feb 2013 20:48:26 +0000 (21:48 +0100)]
Remove usage of Vector#tmp() in Bezier and BSpline

11 years agoAdd BSpline (only cubic for now).
Xoppa [Tue, 12 Feb 2013 20:26:15 +0000 (21:26 +0100)]
Add BSpline (only cubic for now).

11 years agoMerge branch 'mapsapi' of github.com:libgdx/libgdx into mapsapi
Mario Zechner [Tue, 12 Feb 2013 18:36:18 +0000 (19:36 +0100)]
Merge branch 'mapsapi' of github.com:libgdx/libgdx into mapsapi

11 years agomerged with master
Mario Zechner [Tue, 12 Feb 2013 18:34:43 +0000 (19:34 +0100)]
merged with master

11 years agoAdd dragging
Xoppa [Tue, 12 Feb 2013 17:40:07 +0000 (18:40 +0100)]
Add dragging

11 years agoAdd PathTest
Xoppa [Tue, 12 Feb 2013 17:01:02 +0000 (18:01 +0100)]
Add PathTest

11 years agoAdd Bezier path
Xoppa [Tue, 12 Feb 2013 17:00:23 +0000 (18:00 +0100)]
Add Bezier path

11 years agoAdd Path interface
Xoppa [Tue, 12 Feb 2013 16:58:47 +0000 (17:58 +0100)]
Add Path interface

11 years agoAdd Vector interface
Xoppa [Tue, 12 Feb 2013 16:58:10 +0000 (17:58 +0100)]
Add Vector interface