OSDN Git Service
badlogic [Fri, 31 May 2013 21:30:50 +0000 (23:30 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 21:30:38 +0000 (23:30 +0200)]
added diffusecolortexture sub shader
Nathan Sweet [Fri, 31 May 2013 21:28:41 +0000 (14:28 -0700)]
Merge pull request #445 from Jadems/master
GestureDetector no longer consumes events.
NathanSweet [Fri, 31 May 2013 21:05:10 +0000 (23:05 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Fri, 31 May 2013 21:02:43 +0000 (23:02 +0200)]
Removed JsonValue boxing, boolean field, and addChild. Updated JsonReader.
badlogic [Fri, 31 May 2013 20:53:04 +0000 (22:53 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 20:52:56 +0000 (22:52 +0200)]
added diffuse texture sub shader
Matthew Williamson [Fri, 31 May 2013 20:43:13 +0000 (15:43 -0500)]
GestureDetector no longer consumes any events
Reverting a previous change of mine. On closer inspection, having the
GestureDetector consume touch up or drag likely causes more trouble than
good.
NathanSweet [Fri, 31 May 2013 20:29:28 +0000 (22:29 +0200)]
Merge remote-tracking branch 'origin/master'
Nathan Sweet [Fri, 31 May 2013 20:28:14 +0000 (13:28 -0700)]
Merge pull request #444 from xoppa/3dapi2
Faster load ubjson
Xoppa [Fri, 31 May 2013 20:23:41 +0000 (22:23 +0200)]
Faster load ubjson
badlogic [Fri, 31 May 2013 20:19:57 +0000 (22:19 +0200)]
more fixes
badlogic [Fri, 31 May 2013 20:06:56 +0000 (22:06 +0200)]
more changes to composite shader
badlogic [Fri, 31 May 2013 20:02:39 +0000 (22:02 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 31 May 2013 20:02:24 +0000 (22:02 +0200)]
added initial draft of composite shader and transform subshader
NathanSweet [Fri, 31 May 2013 19:20:55 +0000 (21:20 +0200)]
Javadocs.
Mario Zechner [Fri, 31 May 2013 18:21:17 +0000 (11:21 -0700)]
Merge pull request #443 from xoppa/3dapi2
Add transform to calculateBounds, fix transform
Xoppa [Fri, 31 May 2013 17:13:17 +0000 (19:13 +0200)]
Add transform to calculateBounds, fix transform
badlogic [Fri, 31 May 2013 16:24:14 +0000 (18:24 +0200)]
fixed ios check in iosgl20.cpp
badlogic [Fri, 31 May 2013 11:55:01 +0000 (13:55 +0200)]
fixed fetch script to pull in ios robovm natives into proper location
badlogic [Fri, 31 May 2013 11:17:11 +0000 (13:17 +0200)]
added gdx-invaders robovm project
badlogic [Fri, 31 May 2013 10:58:46 +0000 (12:58 +0200)]
fixed robovm backend graphics initialization, create was called at an unfortunate time :p, super jumper et al are working
badlogic [Fri, 31 May 2013 10:28:15 +0000 (12:28 +0200)]
added vector pinball and super jumper robovm projects. not working
badlogic [Fri, 31 May 2013 02:39:39 +0000 (04:39 +0200)]
fixed more stuff, working
badlogic [Fri, 31 May 2013 02:26:33 +0000 (04:26 +0200)]
minor ios fixups
badlogic [Fri, 31 May 2013 02:07:36 +0000 (04:07 +0200)]
added robovm backend, initial commit
badlogic [Fri, 31 May 2013 00:18:58 +0000 (02:18 +0200)]
fixed a super nasty bug in AssetManager, concurrency is hard :)
Mario Zechner [Thu, 30 May 2013 23:07:48 +0000 (16:07 -0700)]
Merge pull request #441 from xoppa/3dapi2
Update ModelLoaderTest
Xoppa [Thu, 30 May 2013 18:08:56 +0000 (20:08 +0200)]
Update ModelLoaderTest
badlogic [Thu, 30 May 2013 17:26:58 +0000 (19:26 +0200)]
and one more update
badlogic [Thu, 30 May 2013 17:23:35 +0000 (19:23 +0200)]
more updates
badlogic [Thu, 30 May 2013 17:21:00 +0000 (19:21 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 17:20:51 +0000 (19:20 +0200)]
small change to model loader test
Mario Zechner [Thu, 30 May 2013 17:19:01 +0000 (10:19 -0700)]
Merge pull request #440 from xoppa/3dapi2
Add BasicScene3DTest
badlogic [Thu, 30 May 2013 17:16:02 +0000 (19:16 +0200)]
added simple cube with two textures, added ModelLoaderTest to reproduce loader issue
Xoppa [Thu, 30 May 2013 16:55:08 +0000 (18:55 +0200)]
Add BasicScene3DTest
badlogic [Thu, 30 May 2013 16:43:10 +0000 (18:43 +0200)]
fixed pax britannica, vectorpinball png crush settings et. al.
badlogic [Thu, 30 May 2013 16:25:28 +0000 (18:25 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 16:25:17 +0000 (18:25 +0200)]
updated libobjectal.dll, fixed vector-pinball png crush settings
NathanSweet [Thu, 30 May 2013 16:15:51 +0000 (18:15 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Thu, 30 May 2013 16:15:32 +0000 (18:15 +0200)]
Added clamp() to allow a min/max range outside the slider's range.
badlogic [Thu, 30 May 2013 16:10:13 +0000 (18:10 +0200)]
fixed pax-britannica png crush settings
badlogic [Thu, 30 May 2013 16:06:51 +0000 (18:06 +0200)]
fixed super jumper png crush settings
badlogic [Thu, 30 May 2013 15:34:46 +0000 (17:34 +0200)]
updated CHANGES
badlogic [Thu, 30 May 2013 15:34:10 +0000 (17:34 +0200)]
removed File#file(), removed box2d-editor
badlogic [Thu, 30 May 2013 15:18:55 +0000 (17:18 +0200)]
fixed issue 1456, Intersector#intersectRayBounds had a bug
badlogic [Thu, 30 May 2013 15:06:58 +0000 (17:06 +0200)]
fixed issue 1459, Decal#setScaleY was wrong
NathanSweet [Thu, 30 May 2013 12:31:36 +0000 (14:31 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Thu, 30 May 2013 12:31:27 +0000 (14:31 +0200)]
Added int rgba methods for easier setting using 0x11223344.
NathanSweet [Thu, 30 May 2013 12:30:53 +0000 (14:30 +0200)]
Fixed pref width.
NathanSweet [Thu, 30 May 2013 12:30:42 +0000 (14:30 +0200)]
Format.
Nathan Sweet [Thu, 30 May 2013 06:04:33 +0000 (23:04 -0700)]
Merge pull request #438 from Jadems/master
Fixed long presses being handled incorrectly.
Matthew Williamson [Thu, 30 May 2013 03:23:23 +0000 (22:23 -0500)]
Fixed long presses behaving incorrectly.
Fixed long presses causing events not to be consumed by the
GestureDetector. This issue was causing the GestureDetector to return
false in touchDragged and touchUp whenever a longPress returned true
resulting in unexpected behavior which one would likely only notice when
chaining InputProcessors in an InputMultiplexer.
badlogic [Thu, 30 May 2013 00:53:59 +0000 (02:53 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Thu, 30 May 2013 00:52:11 +0000 (02:52 +0200)]
fixed cuboc
Xoppa [Wed, 29 May 2013 21:09:50 +0000 (14:09 -0700)]
Merge pull request #437 from xoppa/3dapi2
Fix opacity on models
Xoppa [Wed, 29 May 2013 21:08:29 +0000 (23:08 +0200)]
Fix opacity on models
Mario Zechner [Wed, 29 May 2013 20:48:45 +0000 (13:48 -0700)]
Merge pull request #434 from moly/androidaudiofix
AndroidSound#play/loop now returns -1 on failure, to match other backends
Mario Zechner [Wed, 29 May 2013 20:31:40 +0000 (13:31 -0700)]
Merge pull request #436 from justinbowes/1470_osx_backspace_causes_forward_delete
Fix for Issue 1470: On OS X TextField deletes symbols from the right side
Justin Bowes [Wed, 29 May 2013 19:38:06 +0000 (15:38 -0400)]
Fix OSX backspace behaving like delete key due to bug in LWJGL Keyboard.getEventCharacter()
Mario Zechner [Wed, 29 May 2013 15:48:38 +0000 (08:48 -0700)]
Merge pull request #429 from xoppa/3dapi2
Add skeletontest and various fixes
Xoppa [Wed, 29 May 2013 15:17:17 +0000 (17:17 +0200)]
Fix GLES10 shader
NathanSweet [Wed, 29 May 2013 02:42:07 +0000 (04:42 +0200)]
Added viewport settings to Stage.
Xoppa [Tue, 28 May 2013 23:45:57 +0000 (01:45 +0200)]
Fix MeshBuilder#box
NathanSweet [Tue, 28 May 2013 22:41:41 +0000 (00:41 +0200)]
Allow nested calls to begin().
NathanSweet [Tue, 28 May 2013 21:43:24 +0000 (23:43 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Tue, 28 May 2013 21:42:25 +0000 (23:42 +0200)]
Improved generics and fixed removeAll. Thanks Javier J. <javierj@us.es>!
Nathan Sweet [Tue, 28 May 2013 21:20:25 +0000 (14:20 -0700)]
Merge pull request #433 from MoopsLC/master
draw substring of BitmapFontCache
NathanSweet [Tue, 28 May 2013 20:34:52 +0000 (22:34 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Tue, 28 May 2013 20:19:12 +0000 (22:19 +0200)]
Fixed pooling cells.
MoopsLC [Tue, 28 May 2013 17:50:38 +0000 (14:50 -0300)]
Update BitmapFontCache.java
allow for drawing a substring of the cache for letter-by-letter text scrolling
Xoppa [Tue, 28 May 2013 17:44:46 +0000 (19:44 +0200)]
Default to GL_REPEAT, add mtl shininess and opacity, fix BlendingAttribute constructor
moly [Tue, 28 May 2013 17:22:34 +0000 (18:22 +0100)]
AndroidSound#play/loop now returns -1 on failure, to match other backends
Nathan Sweet [Tue, 28 May 2013 14:54:36 +0000 (07:54 -0700)]
Merge pull request #427 from veger/master
ImageTextButtonStyle: Do not set fields twice and add constructor
NathanSweet [Tue, 28 May 2013 14:40:04 +0000 (16:40 +0200)]
Added getPressedButton.
NathanSweet [Tue, 28 May 2013 14:39:54 +0000 (16:39 +0200)]
Pooled cells.
Xoppa [Mon, 27 May 2013 22:05:46 +0000 (00:05 +0200)]
Add skeletontest
NathanSweet [Mon, 27 May 2013 20:53:43 +0000 (22:53 +0200)]
Disabled debug.
Maarten Bezemer [Mon, 27 May 2013 17:21:25 +0000 (19:21 +0200)]
Do not set ImageTextButtonStyle fields twice
Add constructor accepting TextButtonStyle objects
NathanSweet [Mon, 27 May 2013 16:57:47 +0000 (18:57 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Mon, 27 May 2013 16:45:10 +0000 (18:45 +0200)]
Remove widget from cell when removed from table.
NathanSweet [Mon, 27 May 2013 16:45:01 +0000 (18:45 +0200)]
Added sets to changes.
NathanSweet [Mon, 27 May 2013 16:44:52 +0000 (18:44 +0200)]
Fixed 1454.
NathanSweet [Mon, 27 May 2013 16:44:45 +0000 (18:44 +0200)]
Added sets!
NathanSweet [Mon, 27 May 2013 16:44:29 +0000 (18:44 +0200)]
Fixed SpriteBatch float[] method offsets.
NathanSweet [Mon, 27 May 2013 16:44:10 +0000 (18:44 +0200)]
Fixed array addAll.
badlogic [Sun, 26 May 2013 12:48:04 +0000 (14:48 +0200)]
merged with master
badlogic [Sun, 26 May 2013 12:47:04 +0000 (14:47 +0200)]
moved platform poms to gdx/jni/maven, do the same for extensions later on
NathanSweet [Sun, 26 May 2013 11:16:20 +0000 (13:16 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sun, 26 May 2013 11:16:12 +0000 (13:16 +0200)]
ScrollPane setForceOverscroll renamed to setForceScroll. ArrayMap addAll renamed to putAll.
Mario Zechner [Sun, 26 May 2013 08:42:17 +0000 (01:42 -0700)]
Merge pull request #423 from xoppa/3dapi
Add ship.obj and shadertest
Justin Shapcott [Sat, 25 May 2013 21:46:09 +0000 (14:46 -0700)]
Fix bug in ArrayMap emulation
The constructor taking the element type was not using the ReflectionCache
to instantiate the arrays, causing ClassCastException.
Xoppa [Sat, 25 May 2013 17:44:14 +0000 (19:44 +0200)]
Add ship.obj and shadertest
Justin Shapcott [Sat, 25 May 2013 16:36:24 +0000 (09:36 -0700)]
Use standard GWT Storage API
NathanSweet [Sat, 25 May 2013 16:00:31 +0000 (18:00 +0200)]
Javadoc.
NathanSweet [Sat, 25 May 2013 15:41:18 +0000 (17:41 +0200)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sat, 25 May 2013 15:14:41 +0000 (17:14 +0200)]
Don't traverse to disabled text fields.
NathanSweet [Sat, 25 May 2013 15:12:50 +0000 (17:12 +0200)]
Changed Action#setActor(null) to not call reset.
This allows non-pooled actions to be added and removed from actors, restarted, and reused.
NathanSweet [Sat, 25 May 2013 15:12:10 +0000 (17:12 +0200)]
Javadocs.
Justin Shapcott [Sat, 25 May 2013 13:44:54 +0000 (06:44 -0700)]
Fix double slash
Only append a slash if the directory name doesn't already end with a
slash.