OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
12 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 1 Oct 2012 01:57:16 +0000 (18:57 -0700)]
Merge remote-tracking branch 'origin/master'

12 years agoActor, screenToLocalCoordinates.
NathanSweet [Mon, 1 Oct 2012 01:56:17 +0000 (18:56 -0700)]
Actor, screenToLocalCoordinates.
InputEvent, reset button to -1 to reduce confusion for buttons that don't have button (touchDragged).

12 years agoBinaryHeap, fixed up so it can actually be used.
NathanSweet [Mon, 1 Oct 2012 01:55:08 +0000 (18:55 -0700)]
BinaryHeap, fixed up so it can actually be used.

12 years agomore natives...
Mario Zechner [Sun, 30 Sep 2012 17:24:40 +0000 (19:24 +0200)]
more natives...

12 years agoand reverted build script changes again...
Mario Zechner [Sun, 30 Sep 2012 16:41:34 +0000 (18:41 +0200)]
and reverted build script changes again...

12 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Sun, 30 Sep 2012 16:26:08 +0000 (18:26 +0200)]
Merge branch 'master' of github.com:libgdx/libgdx

12 years agopushing latest natives...2
Mario Zechner [Sun, 30 Sep 2012 16:25:41 +0000 (18:25 +0200)]
pushing latest natives...2

12 years agoremoved sysout from AndroidOnscreenKeyboard
Mario Zechner [Sun, 30 Sep 2012 16:13:16 +0000 (18:13 +0200)]
removed sysout from AndroidOnscreenKeyboard

12 years agofixed issue 1070, Sphere#overlaps was wrong. oops
Mario Zechner [Sun, 30 Sep 2012 16:10:14 +0000 (18:10 +0200)]
fixed issue 1070, Sphere#overlaps was wrong. oops

12 years agolinux build scripts link libgcc and libstdc++ statically
Mario Zechner [Sun, 30 Sep 2012 15:57:09 +0000 (17:57 +0200)]
linux build scripts link libgcc and libstdc++ statically

12 years agoadded preliminary networking module interfaces. Wired up all backends. We just need...
Mario Zechner [Sun, 30 Sep 2012 15:38:00 +0000 (17:38 +0200)]
added preliminary networking module interfaces. Wired up all backends. We just need to fill out the implementations per backend.

12 years agoMerge pull request #47 from noblemaster/master
Mario Zechner [Sun, 30 Sep 2012 15:17:59 +0000 (08:17 -0700)]
Merge pull request #47 from noblemaster/master

iOS Bugfixes (minor)

12 years agoScrollPane, added isDragging and methods to hook when scrolling changes.
NathanSweet [Sat, 29 Sep 2012 19:47:52 +0000 (12:47 -0700)]
ScrollPane, added isDragging and methods to hook when scrolling changes.

12 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 29 Sep 2012 04:03:36 +0000 (21:03 -0700)]
Merge remote-tracking branch 'origin/master'

12 years agoScissorStack, proper rounding in all cases (sweet baby jesus).
NathanSweet [Sat, 29 Sep 2012 04:03:24 +0000 (21:03 -0700)]
ScissorStack, proper rounding in all cases (sweet baby jesus).

12 years agoBugfix for Framebuffer on iOS: frame buffer handle is not necessarily 0 on iOS!
Christoph Aschwanden [Fri, 28 Sep 2012 18:00:34 +0000 (03:00 +0900)]
Bugfix for Framebuffer on iOS: frame buffer handle is not necessarily 0 on iOS!

12 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Christoph Aschwanden [Fri, 28 Sep 2012 16:49:03 +0000 (01:49 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx

12 years agoiOS bugfix for FileHandle.exists() ==> original method has fallback to Classpath...
Christoph Aschwanden [Fri, 28 Sep 2012 16:48:48 +0000 (01:48 +0900)]
iOS bugfix for FileHandle.exists() ==> original method has fallback to Classpath (crashes iOS)

12 years agoMerge pull request #46 from Regiden/master
Mario Zechner [Fri, 28 Sep 2012 13:25:02 +0000 (06:25 -0700)]
Merge pull request #46 from Regiden/master

Again some (hopefully) useful methods for AssetManager

12 years agoMerge pull request #45 from noblemaster/master
Mario Zechner [Fri, 28 Sep 2012 13:22:54 +0000 (06:22 -0700)]
Merge pull request #45 from noblemaster/master

Retina Support + misc. other changes

12 years agoAdded functionality to AssetManager.java:
Regiden [Thu, 27 Sep 2012 17:24:56 +0000 (19:24 +0200)]
Added functionality to AssetManager.java:

 - method to get the type of an asset
 - method to get an asset without the type parameter

12 years agoIOSGraphics returns density & PPI values now. That "completes" the Retina update...
Christoph Aschwanden [Thu, 27 Sep 2012 13:55:55 +0000 (22:55 +0900)]
IOSGraphics returns density & PPI values now. That "completes" the Retina update for now. There are actually no changes needed to get apps to work on Retina enabled devices.

NOTE: we could add a flag to IOSApplicationConfiguration in the future to allow apps to take full advantage of Retina. For now all apps will work on both Retina and non-Retina devices without code changes :)

12 years agoAll 3 Demo projects using iOS updated.
Christoph Aschwanden [Thu, 27 Sep 2012 13:04:25 +0000 (22:04 +0900)]
All 3 Demo projects using iOS updated.

NOTE: Cannot get vector pinball to work. I get the following error. Not sure how to fix!?
  "Warning: The referenced library 'gdx-backend-ios.dll' is not used from any code, skipping extraction of content resources. (gdx-vectorpinball-ios)"

12 years agoconvert.xml uses env.IKVM_HOME now!
Christoph Aschwanden [Thu, 27 Sep 2012 12:24:17 +0000 (21:24 +0900)]
convert.xml uses env.IKVM_HOME now!

12 years agoIOSApplicationConfiguration updated: landscape/portrait update.
Christoph Aschwanden [Thu, 27 Sep 2012 11:52:57 +0000 (20:52 +0900)]
IOSApplicationConfiguration updated: landscape/portrait update.

12 years agoRemoved ARM6 (not supported anymore via Xcode). Path update: "/Developer/usr/bin...
Christoph Aschwanden [Thu, 27 Sep 2012 11:50:46 +0000 (20:50 +0900)]
Removed ARM6 (not supported anymore via Xcode). Path update: "/Developer/usr/bin/xcodebuild" -> "xcodebuild"

12 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Christoph Aschwanden [Thu, 27 Sep 2012 11:28:10 +0000 (20:28 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx

12 years agoShouldAutorotateToInterfaceOrientation implemented.
Christoph Aschwanden [Thu, 27 Sep 2012 11:27:58 +0000 (20:27 +0900)]
ShouldAutorotateToInterfaceOrientation implemented.

12 years agoMerge pull request #44 from noblemaster/master
Mario Zechner [Thu, 27 Sep 2012 09:40:33 +0000 (02:40 -0700)]
Merge pull request #44 from noblemaster/master

iOS: LANDSCAPE + Sound + Music Feature Complete (/w Limitations)

12 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Christoph Aschwanden [Thu, 27 Sep 2012 09:04:02 +0000 (18:04 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx

12 years ago- Screen orientations implemented (NOTE: only works with either LANDSCAPE -or- PORTRA...
Christoph Aschwanden [Thu, 27 Sep 2012 09:03:47 +0000 (18:03 +0900)]
- Screen orientations implemented (NOTE: only works with either LANDSCAPE -or- PORTRAIT but not both at the same time.
- Invaders update (OGG -> WAV)

12 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 27 Sep 2012 08:43:29 +0000 (01:43 -0700)]
Merge remote-tracking branch 'origin/master'

12 years agoSkin, removed printlns.
NathanSweet [Thu, 27 Sep 2012 08:43:23 +0000 (01:43 -0700)]
Skin, removed printlns.

12 years agoiOS: Audio & Sound feature complete. Tested on superjumper & Tropical Stormfront...
Christoph Aschwanden [Wed, 26 Sep 2012 15:02:50 +0000 (00:02 +0900)]
iOS: Audio & Sound feature complete. Tested on superjumper & Tropical Stormfront. Need to do some testing on actual device...

12 years agosuper jumper is using WAV instead of OGG files now (iOS support).
Christoph Aschwanden [Wed, 26 Sep 2012 14:59:02 +0000 (23:59 +0900)]
super jumper is using WAV instead of OGG files now (iOS support).

12 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Christoph Aschwanden [Wed, 26 Sep 2012 14:42:18 +0000 (23:42 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx

12 years agoBugfix for FPS counter.
Christoph Aschwanden [Wed, 26 Sep 2012 14:42:04 +0000 (23:42 +0900)]
Bugfix for FPS counter.

12 years agoMerge pull request #43 from aspic/body-fixes
Mario Zechner [Wed, 26 Sep 2012 10:06:02 +0000 (03:06 -0700)]
Merge pull request #43 from aspic/body-fixes

Fixed javadoc for some methods (#982).

12 years agoFixed javadoc for some methods (#982).
aspic [Tue, 25 Sep 2012 23:08:47 +0000 (01:08 +0200)]
Fixed javadoc for some methods (#982).

12 years agoMerge pull request #42 from acoppes/vertexattributefind
Mario Zechner [Tue, 25 Sep 2012 19:56:14 +0000 (12:56 -0700)]
Merge pull request #42 from acoppes/vertexattributefind

Useful methods for VertexAttributes class

12 years agoMerge pull request #41 from noblemaster/master
Mario Zechner [Tue, 25 Sep 2012 19:53:32 +0000 (12:53 -0700)]
Merge pull request #41 from noblemaster/master

Initial version with Sound + Music

12 years agoadded useful methods to VertexAttributes class to find VertexAttribute for a specifie...
Ariel Coppes [Tue, 25 Sep 2012 18:50:58 +0000 (15:50 -0300)]
added useful methods to VertexAttributes class to find VertexAttribute for a specified usage

12 years agoMerge branch 'master' of https://github.com/libgdx/libgdx
Christoph Aschwanden [Tue, 25 Sep 2012 16:35:32 +0000 (01:35 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx

12 years agoInitial version for audio on iOS. This needs more work:
Christoph Aschwanden [Tue, 25 Sep 2012 16:35:19 +0000 (01:35 +0900)]
Initial version for audio on iOS. This needs more work:
- soundIds not implemented for IOSSound
- looping not supported
- .ogg not supported

12 years ago[fixed] Issue 1065: GWT Backend - BufferedReader handling of '\r\n' line-endings.
Justin Shapcott [Tue, 25 Sep 2012 15:36:55 +0000 (08:36 -0700)]
[fixed] Issue 1065: GWT Backend - BufferedReader handling of '\r\n' line-endings.

12 years ago[fixed] Issue 1058, MD5Loader handling of quoted strings.
Justin Shapcott [Tue, 25 Sep 2012 13:12:48 +0000 (06:12 -0700)]
[fixed] Issue 1058, MD5Loader handling of quoted strings.

12 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Tue, 25 Sep 2012 05:58:58 +0000 (22:58 -0700)]
Merge remote-tracking branch 'origin/master'

12 years agoAdded checkedOver drawable to buttons.
NathanSweet [Tue, 25 Sep 2012 05:58:42 +0000 (22:58 -0700)]
Added checkedOver drawable to buttons.
Added ImageTextButton.

12 years agoadded release build configs to monotouch projects (simulator only)
badlogic [Mon, 24 Sep 2012 22:22:25 +0000 (00:22 +0200)]
added release build configs to monotouch projects (simulator only)

12 years agofixed up all monotouch projects to reference the ikvm assemblies in the repo..
badlogic [Mon, 24 Sep 2012 21:52:14 +0000 (23:52 +0200)]
fixed up all monotouch projects to reference the ikvm assemblies in the repo..

12 years agoi hate myself
badlogic [Mon, 24 Sep 2012 21:39:54 +0000 (23:39 +0200)]
i hate myself

12 years agoMerge pull request #40 from aspic/lwjgl-refactoring
Mario Zechner [Mon, 24 Sep 2012 18:20:44 +0000 (11:20 -0700)]
Merge pull request #40 from aspic/lwjgl-refactoring

Some lwjgl refactoring

12 years agoMerge pull request #39 from Regiden/master
Mario Zechner [Mon, 24 Sep 2012 18:19:12 +0000 (11:19 -0700)]
Merge pull request #39 from Regiden/master

Methods to get all file names in the AssetManager and to get all dependencies a asset might have

12 years agoFixed code formatting, added protected for coherency and replaced
aspic [Mon, 24 Sep 2012 16:21:17 +0000 (18:21 +0200)]
Fixed code formatting, added protected for coherency and replaced
java.util.List.

12 years agoAdded the methods from the last commit to the AssetManager.java from the gwt emulation.
Regiden [Mon, 24 Sep 2012 14:14:12 +0000 (16:14 +0200)]
Added the methods from the last commit to the AssetManager.java from the gwt emulation.

12 years ago[fixed] Issue in TiledLoader where TMX files stored in CSV format and included rotate...
Justin Shapcott [Sun, 23 Sep 2012 21:54:08 +0000 (14:54 -0700)]
[fixed] Issue in TiledLoader where TMX files stored in CSV format and included rotated or flipped tiles would fail to load.

12 years ago[fixed] Issue where TiledMapPacker would strip tiles that were only used in rotated...
Justin Shapcott [Sun, 23 Sep 2012 21:51:43 +0000 (14:51 -0700)]
[fixed] Issue where TiledMapPacker would strip tiles that were only used in rotated or flipped form and the --strip-unused flag was set.

12 years agoBuild script updated to support gdx-setup-ui.
AurelienRibon [Sun, 23 Sep 2012 15:48:13 +0000 (17:48 +0200)]
Build script updated to support gdx-setup-ui.

The new ant build script of gdx-setup-ui was modified to produce a
"gdx-setup-ui.jar" file directly. Thus, the master build script of
libgdx was changed to reflect this.

12 years agoUpdated the classpath of the eclipse project.
AurelienRibon [Sun, 23 Sep 2012 15:46:10 +0000 (17:46 +0200)]
Updated the classpath of the eclipse project.

12 years agoEvery user of gdx-setup-ui will be notified.
AurelienRibon [Sun, 23 Sep 2012 15:45:43 +0000 (17:45 +0200)]
Every user of gdx-setup-ui will be notified.

The mention of the new version should come to everyone after the next
nightly build.

12 years agoHeavy! Here comes the sources of gdx-setup-ui v3
AurelienRibon [Sun, 23 Sep 2012 15:43:43 +0000 (17:43 +0200)]
Heavy! Here comes the sources of gdx-setup-ui v3

Full commit for the src and libs folders. A loooooot of things changed
since last revision. Most noticable one is the support for updating an
existing project with the latest version of libgdx and any third-party
lib.

See https://github.com/AurelienRibon/gdx-setup-ui for the list of all
the in-between commits.

12 years ago[fixed] issue in TileMapRenderer where having unitsPerTileX/Y not matching the tileWi...
Justin Shapcott [Sun, 23 Sep 2012 13:51:18 +0000 (06:51 -0700)]
[fixed] issue in TileMapRenderer where having unitsPerTileX/Y not matching the tileWidth/Height caused the tiles to be rendered in the wrong place.

12 years agoAdded methods to get file names and dependencies an asset might have
Regiden [Sun, 23 Sep 2012 13:22:37 +0000 (15:22 +0200)]
Added methods to get file names and dependencies an asset might have

12 years agoTextField, setDisabled.
NathanSweet [Fri, 21 Sep 2012 04:59:20 +0000 (21:59 -0700)]
TextField, setDisabled.

12 years agoStage, if no keyboard/scroll focus, fire event on the root.
NathanSweet [Fri, 21 Sep 2012 04:45:14 +0000 (21:45 -0700)]
Stage, if no keyboard/scroll focus, fire event on the root.

12 years agoAllow empty nodes to be expanded (eg, just before nodes are added).
NathanSweet [Fri, 21 Sep 2012 02:07:21 +0000 (19:07 -0700)]
Allow empty nodes to be expanded (eg, just before nodes are added).

12 years agoJson, support simple generic types (only single parameters and only the first level).
NathanSweet [Fri, 21 Sep 2012 02:04:32 +0000 (19:04 -0700)]
Json, support simple generic types (only single parameters and only the first level).

12 years agoTouchpad, fixed get percent methods.
NathanSweet [Wed, 19 Sep 2012 05:54:53 +0000 (22:54 -0700)]
Touchpad, fixed get percent methods.

12 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Tue, 18 Sep 2012 09:15:20 +0000 (02:15 -0700)]
Merge remote-tracking branch 'origin/master'

12 years agoFixed 1053 again, FileHandle readBytes allocation.
NathanSweet [Tue, 18 Sep 2012 09:14:44 +0000 (02:14 -0700)]
Fixed 1053 again, FileHandle readBytes allocation.

12 years agofixed all the natives, we are super up to date now. or so goes the theory
Mario Zechner [Tue, 18 Sep 2012 01:39:36 +0000 (03:39 +0200)]
fixed all the natives, we are super up to date now. or so goes the theory

12 years agoadded --static-gcc and static-stdc++ for windows 32-bit build...
Mario Zechner [Tue, 18 Sep 2012 01:15:34 +0000 (03:15 +0200)]
added --static-gcc and static-stdc++ for windows 32-bit build...

12 years agofixed android build script generation, compiler check searched for ndk_build
Mario Zechner [Tue, 18 Sep 2012 00:36:28 +0000 (02:36 +0200)]
fixed android build script generation, compiler check searched for ndk_build

12 years agofixed AudioTools, got fucked by ermagerdformattingmagic
Mario Zechner [Tue, 18 Sep 2012 00:31:14 +0000 (02:31 +0200)]
fixed AudioTools, got fucked by ermagerdformattingmagic

12 years agoregenerated all native build files, trying out the compiler check
Mario Zechner [Tue, 18 Sep 2012 00:03:12 +0000 (02:03 +0200)]
regenerated all native build files, trying out the compiler check

12 years agoshoudn't return an indirect buffer in FreeType
Mario Zechner [Mon, 17 Sep 2012 22:00:26 +0000 (00:00 +0200)]
shoudn't return an indirect buffer in FreeType

12 years agocompiled all the mac natives, oh god, we need ivy...
badlogic [Mon, 17 Sep 2012 21:21:35 +0000 (23:21 +0200)]
compiled all the mac natives, oh god, we need ivy...

12 years agoupdated freetype natives. we should seriously consider ivy...
Mario Zechner [Mon, 17 Sep 2012 21:09:02 +0000 (23:09 +0200)]
updated freetype natives. we should seriously consider ivy...

12 years agoMerge pull request #36 from kichik/master
Mario Zechner [Mon, 17 Sep 2012 16:10:10 +0000 (09:10 -0700)]
Merge pull request #36 from kichik/master

Fix FreeType crashes (issue #768)

12 years agodon't pass NULL buffer or 0 capacity to env->NewDirectByteBuffer() as CheckJNI and...
Amir Szekely [Sun, 16 Sep 2012 23:40:16 +0000 (16:40 -0700)]
don't pass NULL buffer or 0 capacity to env->NewDirectByteBuffer() as CheckJNI and maybe other parts of Dalvik crash on it

12 years agoupdate the source of all the build.xml files to freetype 2.4.10
Amir Szekely [Sun, 16 Sep 2012 18:28:55 +0000 (11:28 -0700)]
update the source of all the build.xml files to freetype 2.4.10

12 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sun, 16 Sep 2012 17:14:49 +0000 (10:14 -0700)]
Merge remote-tracking branch 'origin/master'

12 years agoscene2d, changed InputListener#scrolled() to have x/y coordinates.
NathanSweet [Sun, 16 Sep 2012 17:14:40 +0000 (10:14 -0700)]
scene2d, changed InputListener#scrolled() to have x/y coordinates.

12 years agoadded gdx-tests-iosmonotouch, not fully working yet, but it's a start
badlogic [Sun, 16 Sep 2012 17:07:27 +0000 (19:07 +0200)]
added gdx-tests-iosmonotouch, not fully working yet, but it's a start

12 years agofixed gdx-vectorpinball-ios
badlogic [Sun, 16 Sep 2012 15:51:17 +0000 (17:51 +0200)]
fixed gdx-vectorpinball-ios

12 years agofixed gdx-invaders-ios
badlogic [Sun, 16 Sep 2012 15:42:32 +0000 (17:42 +0200)]
fixed gdx-invaders-ios

12 years agofixing gdx-invaders-io
badlogic [Sun, 16 Sep 2012 15:39:21 +0000 (17:39 +0200)]
fixing gdx-invaders-io
s

12 years agoadded ios projects for invaders and vectorpinball, somethings wrong, don't know why...
badlogic [Sun, 16 Sep 2012 14:17:33 +0000 (16:17 +0200)]
added ios projects for invaders and vectorpinball, somethings wrong, don't know why stuff explodes. superjumper works, need to compare csproject files.

12 years agoMerge branch 'master' of github.com:libgdx/libgdx
badlogic [Sun, 16 Sep 2012 12:39:46 +0000 (14:39 +0200)]
Merge branch 'master' of github.com:libgdx/libgdx

12 years agofixed super jumper ios, fixed IOSInput justtouched behaviour
badlogic [Sun, 16 Sep 2012 12:39:30 +0000 (14:39 +0200)]
fixed super jumper ios, fixed IOSInput justtouched behaviour

12 years agofixed opencmt loader stuff
Mario Zechner [Sun, 16 Sep 2012 09:49:54 +0000 (11:49 +0200)]
fixed opencmt loader stuff

12 years agoMerge pull request #37 from Danny02/master
Mario Zechner [Sun, 16 Sep 2012 09:43:22 +0000 (02:43 -0700)]
Merge pull request #37 from Danny02/master

OpenCTM model loader

12 years agoMerge pull request #26 from pferreir/master
Mario Zechner [Sun, 16 Sep 2012 08:51:00 +0000 (01:51 -0700)]
Merge pull request #26 from pferreir/master

Refactored OgreXmlLoader and SubMesh

12 years agoRevert "first little refactoring - moved particle stuff in own package - instead...
Daniel Heinrich [Sun, 16 Sep 2012 05:17:33 +0000 (13:17 +0800)]
Revert "first little refactoring - moved particle stuff in own package - instead of subclassing ParticleEmitter use factorys - use BitSet instead of boolean[] for active Particles"

This reverts commit eb4407c37fc98edc9319cbd8e63b3cd4b6fe1b49.

12 years agoRevert "- implemented Cloneable instead of own methods - but particle value classes...
Daniel Heinrich [Sun, 16 Sep 2012 05:11:51 +0000 (13:11 +0800)]
Revert "- implemented Cloneable instead of own methods - but particle value classes in own files"

This reverts commit cc58ace942fb15077cd83b8b9d8e3f1959347f43.

12 years agoadded me(Daniel Heinrich) to the constributors
Daniel Heinrich [Sun, 16 Sep 2012 05:03:48 +0000 (13:03 +0800)]
added me(Daniel Heinrich) to the constributors

12 years agoadded a model loader for the OpenCTM file format using the lib JOpenCTM
Daniel Heinrich [Sun, 16 Sep 2012 05:02:29 +0000 (13:02 +0800)]
added a model loader for the OpenCTM file format using the lib JOpenCTM

12 years agoupdate freetype to version 2.4.10 to resolve issue #768
Amir Szekely [Sat, 15 Sep 2012 22:28:35 +0000 (15:28 -0700)]
update freetype to version 2.4.10 to resolve issue #768

12 years agoMerge pull request #32 from vanlim/master
Mario Zechner [Sat, 15 Sep 2012 19:47:15 +0000 (12:47 -0700)]
Merge pull request #32 from vanlim/master

Fixed Decal setRotation.

12 years agoMerge pull request #35 from StickyDroids/master
Mario Zechner [Sat, 15 Sep 2012 19:45:09 +0000 (12:45 -0700)]
Merge pull request #35 from StickyDroids/master

Added cone and filled cone to ShapeRenderer