OSDN Git Service
Christoph Aschwanden [Tue, 30 Oct 2012 09:43:56 +0000 (18:43 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
NathanSweet [Tue, 30 Oct 2012 03:45:07 +0000 (20:45 -0700)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Tue, 30 Oct 2012 03:44:52 +0000 (20:44 -0700)]
ScrollPane, added setCancelTouchFocus.
Mario Zechner [Tue, 30 Oct 2012 00:22:12 +0000 (01:22 +0100)]
Merge branch 'livewallpaper'
Mario Zechner [Tue, 30 Oct 2012 00:18:25 +0000 (01:18 +0100)]
more refucktoring of lwp stuff
Mario Zechner [Tue, 30 Oct 2012 00:17:54 +0000 (01:17 +0100)]
changes to 'old' backend files reverted and extended were necessary
Mario Zechner [Mon, 29 Oct 2012 22:48:09 +0000 (23:48 +0100)]
first clean-up pass
Mario Zechner [Mon, 29 Oct 2012 22:17:43 +0000 (23:17 +0100)]
applied livewallpaper patch, let's see...
Mario Zechner [Mon, 29 Oct 2012 21:53:55 +0000 (14:53 -0700)]
Merge pull request #94 from acoppes/iosretinawrongdpi
Fixed bug when asking for dpi on retina devices
Ariel Coppes [Mon, 29 Oct 2012 21:51:12 +0000 (19:51 -0200)]
Merge branch 'master' into iosretinawrongdpi
Ariel Coppes [Mon, 29 Oct 2012 21:46:07 +0000 (19:46 -0200)]
fixed IOSGraphics to use correct selector when asking for UIScreen.mainScreen.scale to calculate dpi for normal and retina devices, extracted IOSGraphics log tag to a private static final field to use the same tag everywhere
Mario Zechner [Mon, 29 Oct 2012 21:39:04 +0000 (14:39 -0700)]
Merge pull request #92 from frustaci/master
Issue 1103: OgreXml loader fails to create a SkeletonSubMesh
Nathan Sweet [Sun, 28 Oct 2012 21:20:21 +0000 (14:20 -0700)]
Merge pull request #93 from MoopsLC/master
SpriteBatch switchTexture method
MoopsLC [Sun, 28 Oct 2012 21:12:15 +0000 (18:12 -0300)]
Update gdx/src/com/badlogic/gdx/graphics/g2d/SpriteBatch.java
removed branch with identical bodies
frustaci [Sun, 28 Oct 2012 19:13:28 +0000 (17:13 -0200)]
Fixed OgreXmlLoader
Fixed boneAssigments per mesh.
Fixed reading multiple animation tracks.
Fixed meshName not being read.
Mario Zechner [Sun, 28 Oct 2012 11:29:36 +0000 (04:29 -0700)]
Merge pull request #83 from xoppa/bullet
BulletTest, minor changes
Mario Zechner [Sun, 28 Oct 2012 11:06:50 +0000 (12:06 +0100)]
[changed] CameraGroupStrategy takes custom comparator in second constructor
Xoppa [Sat, 27 Oct 2012 21:15:05 +0000 (23:15 +0200)]
Separate btMotionState
NathanSweet [Sat, 27 Oct 2012 06:10:14 +0000 (23:10 -0700)]
Stage, prevent triggering more than one touchUp event for the same touch focus.
NathanSweet [Sat, 27 Oct 2012 06:00:11 +0000 (23:00 -0700)]
Stage, removed commented out code. Oops.
NathanSweet [Sat, 27 Oct 2012 05:58:57 +0000 (22:58 -0700)]
Stage, fixed calling clear() from touchUp().
http://www.badlogicgames.com/forum/viewtopic.php?f=11&t=5936
NathanSweet [Sat, 27 Oct 2012 05:58:23 +0000 (22:58 -0700)]
ScrollPane, fixed scrollable area when (flickScroll && scrollbarsOnTop).
NathanSweet [Sat, 27 Oct 2012 05:57:38 +0000 (22:57 -0700)]
SnapshotArray, better javadoc.
NathanSweet [Sat, 27 Oct 2012 04:06:52 +0000 (21:06 -0700)]
1062, fixed TextField with flipped font.
NathanSweet [Sat, 27 Oct 2012 04:00:30 +0000 (21:00 -0700)]
1077, fixed TableLayout when a colspanned cell is used after uniformX cells.
NathanSweet [Sat, 27 Oct 2012 03:30:47 +0000 (20:30 -0700)]
1099, Pools free(Object) and free(Array) are easily confused when pooling Arrays. Renamed free(Array) to freeAll(Array). Unfortunately code previously using free(Array) will now be broken, since that now invokes free(Object).
NathanSweet [Sat, 27 Oct 2012 03:21:30 +0000 (20:21 -0700)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sat, 27 Oct 2012 03:21:23 +0000 (20:21 -0700)]
VerticalGroup, fixed layout when not reversed.
Mario Zechner [Fri, 26 Oct 2012 16:14:26 +0000 (18:14 +0200)]
fixed gdx-bullet build, with a nasty additional build template...
Mario Zechner [Fri, 26 Oct 2012 14:46:14 +0000 (07:46 -0700)]
Merge pull request #82 from bornskilled200/master
Issue 1091: Render on resize, half fix
Mario Zechner [Fri, 26 Oct 2012 14:45:02 +0000 (07:45 -0700)]
Merge pull request #85 from noblemaster/master
iOS: server socket bugfix!
Mario Zechner [Fri, 26 Oct 2012 13:56:39 +0000 (06:56 -0700)]
Merge pull request #89 from Seraphim6x7/issue-1092
Issue 1092: Implement PolygonRegion's constructor that takes vertices from array
Seraphim [Fri, 26 Oct 2012 13:47:47 +0000 (15:47 +0200)]
Also test the PolygonRegion (TextureRegion, float[]) constructor
Seraphim [Fri, 26 Oct 2012 13:02:00 +0000 (15:02 +0200)]
iissue 1092: implementation for PolygonRegion (TextureRegion,float[])
Nathan Sweet [Thu, 25 Oct 2012 20:29:04 +0000 (13:29 -0700)]
Merge pull request #87 from Seraphim6x7/gestures
Java 101: give boolean methods positive names
Seraphim [Thu, 25 Oct 2012 20:21:20 +0000 (22:21 +0200)]
Java 101: give boolean methods positive names
Nathan Sweet [Thu, 25 Oct 2012 20:18:16 +0000 (13:18 -0700)]
Merge pull request #86 from Seraphim6x7/gestures
slightly improved readability, plus Eclipse autoformatter
Seraphim [Thu, 25 Oct 2012 20:04:10 +0000 (22:04 +0200)]
slightly improved readability, plus Eclipse autoformatter
NathanSweet [Wed, 24 Oct 2012 23:42:58 +0000 (16:42 -0700)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Wed, 24 Oct 2012 23:42:38 +0000 (16:42 -0700)]
Array classes, added equals().
NathanSweet [Wed, 24 Oct 2012 23:22:24 +0000 (16:22 -0700)]
Table, touchable fixed.
MobiDevelop [Wed, 24 Oct 2012 14:50:51 +0000 (07:50 -0700)]
Removed package private constructor.
There's no obvious reason that the construction of a TiledLayer needs to be package private.
Christoph Aschwanden [Wed, 24 Oct 2012 09:56:48 +0000 (18:56 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Tue, 23 Oct 2012 21:13:45 +0000 (23:13 +0200)]
fixed issue 1089, added Sound#setPriority method, it's just a hint, works only on Android
Mario Zechner [Tue, 23 Oct 2012 20:52:52 +0000 (22:52 +0200)]
fixed Input#getX/getY Javadocs
Xoppa [Mon, 22 Oct 2012 22:44:17 +0000 (00:44 +0200)]
Corrected primitive type.
Christoph Aschwanden [Mon, 22 Oct 2012 05:19:23 +0000 (14:19 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Sun, 21 Oct 2012 15:20:20 +0000 (17:20 +0200)]
removed gdx-mavenizer submodule, what a pain in the ass...
Mario Zechner [Sun, 21 Oct 2012 13:23:08 +0000 (15:23 +0200)]
added gdx-mavenizer from team gemserk
Christoph Aschwanden [Sun, 21 Oct 2012 12:49:47 +0000 (21:49 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Sun, 21 Oct 2012 11:43:09 +0000 (13:43 +0200)]
added gdx-buillet/Target to ignore
Christoph Aschwanden [Sun, 21 Oct 2012 10:54:28 +0000 (19:54 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Christoph Aschwanden [Sun, 21 Oct 2012 10:34:27 +0000 (19:34 +0900)]
iOS: bugfix local IP detection (simulator vs. device different).
Christoph Aschwanden [Sun, 21 Oct 2012 07:38:57 +0000 (16:38 +0900)]
iOS: bug fix for server socket.
Xoppa [Sat, 20 Oct 2012 17:11:43 +0000 (19:11 +0200)]
Oops, forgot to rename that
Xoppa [Sat, 20 Oct 2012 17:01:52 +0000 (19:01 +0200)]
Separate the actual bullet code. This makes it easier to use it in you own test and future tests that might be added.
Xoppa [Sat, 20 Oct 2012 16:25:03 +0000 (18:25 +0200)]
Some minor changes for readability and reusability.
Xoppa [Sat, 20 Oct 2012 15:54:25 +0000 (17:54 +0200)]
Not needed anymore
bornskilled200 [Sat, 20 Oct 2012 13:39:46 +0000 (10:39 -0300)]
Update backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglGraphics.java
Half fix of Issue 1091: Render on resize.
Will now render when the window becomes dirty, usually when the window gets moved or when the window gets resized bigger.
Mario Zechner [Fri, 19 Oct 2012 21:48:22 +0000 (23:48 +0200)]
fixed gdx-tests-android classpath, added gdx-bullet
Mario Zechner [Fri, 19 Oct 2012 21:22:03 +0000 (23:22 +0200)]
fixed starter and update script
Mario Zechner [Fri, 19 Oct 2012 21:18:32 +0000 (23:18 +0200)]
updated all natives, mea culpa, we'll fix that...
Mario Zechner [Fri, 19 Oct 2012 20:09:31 +0000 (22:09 +0200)]
Merge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Fri, 19 Oct 2012 20:08:59 +0000 (22:08 +0200)]
fixed issue 1044, gl_PointSize needed to be set
Mario Zechner [Fri, 19 Oct 2012 19:45:54 +0000 (21:45 +0200)]
updated update.sh file
Mario Zechner [Fri, 19 Oct 2012 19:34:14 +0000 (21:34 +0200)]
regenerated gdx-bullet build scripts
Mario Zechner [Fri, 19 Oct 2012 19:31:49 +0000 (21:31 +0200)]
modified build script to include gdx-bullet in build
badlogic [Fri, 19 Oct 2012 18:41:41 +0000 (20:41 +0200)]
Merge branch 'master' of github.com:libgdx/libgdx
badlogic [Fri, 19 Oct 2012 18:41:24 +0000 (20:41 +0200)]
updated mac natives
Mario Zechner [Fri, 19 Oct 2012 18:11:26 +0000 (11:11 -0700)]
Merge pull request #71 from bosoni/master
Added .mtl loader to ObjLoader
Mario Zechner [Fri, 19 Oct 2012 18:07:41 +0000 (11:07 -0700)]
Merge pull request #77 from noblemaster/master
iOS: display in pixels + net sockets bugfixed/tested
Mario Zechner [Fri, 19 Oct 2012 18:06:50 +0000 (11:06 -0700)]
Merge pull request #74 from semtiko/patch-1
OrthographicCamera "fix"
Mario Zechner [Fri, 19 Oct 2012 18:06:10 +0000 (11:06 -0700)]
Merge pull request #79 from Seraphim6x7/bullet-test
moved BulletTest to GdxTests, removed old test
Mario Zechner [Fri, 19 Oct 2012 18:04:33 +0000 (11:04 -0700)]
Merge pull request #81 from Seraphim6x7/gdx-tests
Gdx tests
Mario Zechner [Fri, 19 Oct 2012 18:02:40 +0000 (11:02 -0700)]
Merge pull request #80 from Seraphim6x7/spelling
spelling error: Simultanious -> Simultaneous
bosoni [Fri, 19 Oct 2012 14:47:44 +0000 (17:47 +0300)]
using AssetManager
Seraphim [Fri, 19 Oct 2012 10:55:33 +0000 (12:55 +0200)]
rename SpritePerformanteTest2 -> SpritePerformanceTest2
Christoph Aschwanden [Fri, 19 Oct 2012 04:53:14 +0000 (13:53 +0900)]
iOS: bug fixed & tested the socket/serversocket implementation (working now).
Christoph Aschwanden [Fri, 19 Oct 2012 04:48:43 +0000 (13:48 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
MobiDevelop [Fri, 19 Oct 2012 04:28:52 +0000 (21:28 -0700)]
[fixed] Issue 1088.
Seraphim [Thu, 18 Oct 2012 16:41:51 +0000 (18:41 +0200)]
use MathUtils.random for convenience, use current screen width
Seraphim [Thu, 18 Oct 2012 16:08:44 +0000 (18:08 +0200)]
MultitouchTest didn't set a color, addded more colors (12 colors are enough for everyone)
Seraphim [Thu, 18 Oct 2012 15:57:47 +0000 (17:57 +0200)]
make GdxTests.tests a List so we can add additional GdxTests
Seraphim [Thu, 18 Oct 2012 15:37:04 +0000 (17:37 +0200)]
Make #getNames return a List, this is more convenient in use and prevents some unnecessary copying
Seraphim [Thu, 18 Oct 2012 15:27:00 +0000 (17:27 +0200)]
use array of test classes for instantiation, this removes the limitation on valid classpaths for GdxTests
Seraphim [Thu, 18 Oct 2012 13:29:38 +0000 (15:29 +0200)]
moved BulletTest to GdxTests, removed old test
Seraphim [Thu, 18 Oct 2012 12:43:50 +0000 (14:43 +0200)]
spelling error: Simultanious -> Simultaneous
Christoph Aschwanden [Thu, 18 Oct 2012 07:40:30 +0000 (16:40 +0900)]
iOS: update for screen size/scaling (everything in pixels now).
Mario Zechner [Wed, 17 Oct 2012 21:11:59 +0000 (14:11 -0700)]
Merge pull request #76 from ttencate/master
added missing SetMaxLength wrapper for b2RopeJoint
Thomas ten Cate [Wed, 17 Oct 2012 20:54:07 +0000 (21:54 +0100)]
added missing setMaxLength wrapper for b2RopeJoint
Mario Zechner [Wed, 17 Oct 2012 20:03:06 +0000 (13:03 -0700)]
Merge pull request #75 from acoppes/iospreferences
Preferences implementation for iOS backend
Ariel Coppes [Wed, 17 Oct 2012 19:49:56 +0000 (17:49 -0200)]
removed unused method from IOSApplication
Ariel Coppes [Wed, 17 Oct 2012 19:41:18 +0000 (17:41 -0200)]
implemented get(): Map of IOSPreferences by just returning a map of <string, string> since we cant know the exact type of the objects here
Ariel Coppes [Wed, 17 Oct 2012 19:02:03 +0000 (17:02 -0200)]
changed to use a path similar to IOSFiles for the IOSPreferences when creating it from the IOSApplication, modified IOSPreferences to convert the string key to NSObject and changed to use a NSMutableDictionary to modify stuff
Ariel Coppes [Wed, 17 Oct 2012 17:15:16 +0000 (15:15 -0200)]
implemented IOSpreferences using a NSDictionary reading/writing to ApplicationBundle.app/Library/preferencesName.plist, added javadocs for preferences.get() (I suppose it returns a read only map) (not implemented in IOSPreferences yet)
Mario Zechner [Wed, 17 Oct 2012 10:22:08 +0000 (03:22 -0700)]
Merge pull request #72 from noblemaster/master
iOS: retina support + option to disable screen dimming
Christoph Aschwanden [Wed, 17 Oct 2012 02:38:42 +0000 (11:38 +0900)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Conflicts:
backends/gdx-backend-iosmonotouch/src/com/badlogic/gdx/backends/ios/IOSApplication.java
Alex Vega [Wed, 17 Oct 2012 00:20:50 +0000 (04:20 +0400)]
Removed unused var
Alex Vega [Tue, 16 Oct 2012 22:16:33 +0000 (02:16 +0400)]
OrthographicCamera "fix"
I can't reproduce any problems without this changes, but i think it's right.
Mario Zechner [Tue, 16 Oct 2012 20:51:47 +0000 (22:51 +0200)]
Merge branch 'master' of github.com:libgdx/libgdx