OSDN Git Service
badlogic [Tue, 17 Sep 2013 08:28:50 +0000 (10:28 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Tue, 17 Sep 2013 08:28:42 +0000 (10:28 +0200)]
fixed FileHandle#read
Justin Shapcott [Tue, 17 Sep 2013 04:31:10 +0000 (21:31 -0700)]
Fix bug in calculation of ppcY (RoboVM)
Manual merge of PR #741
Xoppa [Mon, 16 Sep 2013 22:48:37 +0000 (15:48 -0700)]
Merge pull request #740 from xoppa/3dapi
Fix other test shaders
Xoppa [Mon, 16 Sep 2013 22:47:37 +0000 (00:47 +0200)]
Fix other test shaders
Xoppa [Mon, 16 Sep 2013 21:57:29 +0000 (14:57 -0700)]
Merge pull request #739 from xoppa/3dapi
Test shader: dont assume varying is removed
Xoppa [Mon, 16 Sep 2013 21:56:31 +0000 (23:56 +0200)]
Test shader: dont assume varying is removed
Justin Shapcott [Mon, 16 Sep 2013 19:46:12 +0000 (12:46 -0700)]
Force RoboVM to keep all Scene2d UI classes
Because skins are loaded by reflection, some classes may not be
linked in the RoboVM binary (RoboVM only includes classes explicitly
used). This forces them to be linked.
Justin Shapcott [Mon, 16 Sep 2013 14:49:44 +0000 (07:49 -0700)]
Fix pax-britannica
Changed ArrayList to Array per changes in PR #573.
Xoppa [Mon, 16 Sep 2013 14:30:18 +0000 (07:30 -0700)]
Merge pull request #736 from jrenner/fast-vector-dist
Fast vector dist
MobiDevelop [Mon, 16 Sep 2013 14:29:02 +0000 (07:29 -0700)]
Merge pull request #737 from semtiko/master
Tiled map renderers. Added license info and small cleanup
Jon Renner [Mon, 16 Sep 2013 14:19:14 +0000 (22:19 +0800)]
delete trash
Alex Vega [Mon, 16 Sep 2013 14:16:09 +0000 (18:16 +0400)]
OrthogonalTiledMapRenderer. Added license info, small cleanup
Alex Vega [Mon, 16 Sep 2013 14:15:33 +0000 (18:15 +0400)]
IsometricTiledMapRenderer. Added license info, small cleanup
Jon Renner [Mon, 16 Sep 2013 14:12:58 +0000 (22:12 +0800)]
Vector doc clarification - a.k.a. I learned what dst2 is for
Alex Vega [Mon, 16 Sep 2013 14:07:11 +0000 (18:07 +0400)]
IsometricStaggeredTiledMapRenderer. Removed useless var
Alex Vega [Mon, 16 Sep 2013 14:05:19 +0000 (18:05 +0400)]
IsometricStaggeredTiledMapRenderer. Added license info, small cleanup
Alex Vega [Mon, 16 Sep 2013 14:02:20 +0000 (18:02 +0400)]
HexagonalTiledMapRenderer. Cleanup
Alex Vega [Mon, 16 Sep 2013 14:00:06 +0000 (18:00 +0400)]
HexagonalTiledMapRenderer. Cleanup imports
Alex Vega [Mon, 16 Sep 2013 13:58:30 +0000 (17:58 +0400)]
BatchTiledMapRenderer. Added license info
MobiDevelop [Mon, 16 Sep 2013 13:24:27 +0000 (06:24 -0700)]
Merge pull request #732 from hneuer/tiled
added setSpriteBatchBeginEnd to BatchTiledMapRenderer to make the sprite...
hneuer [Mon, 16 Sep 2013 13:20:29 +0000 (15:20 +0200)]
Moved AnimatedTiledMapTile.updateAnimationBaseTime(); into render-hook.
hneuer [Mon, 16 Sep 2013 13:18:15 +0000 (15:18 +0200)]
Added render hooks.
Xoppa [Mon, 16 Sep 2013 12:35:58 +0000 (05:35 -0700)]
Merge pull request #735 from xoppa/3dapi
Fix test shaders
Xoppa [Mon, 16 Sep 2013 12:33:25 +0000 (14:33 +0200)]
Fix test shaders
Xoppa [Mon, 16 Sep 2013 11:52:54 +0000 (04:52 -0700)]
Merge pull request #734 from xoppa/3dapi
Fix default shader
Xoppa [Mon, 16 Sep 2013 11:50:52 +0000 (13:50 +0200)]
Fix default shader
hneuer [Mon, 16 Sep 2013 09:03:08 +0000 (11:03 +0200)]
added setSpriteBatchBeginEnd to BatchTiledMapRenderer to make the spriteBatch begin/end calls inside the render method optional
NathanSweet [Mon, 16 Sep 2013 05:32:07 +0000 (07:32 +0200)]
Javadoc.
Nathan Sweet [Mon, 16 Sep 2013 05:29:44 +0000 (22:29 -0700)]
Merge pull request #566 from mattdesl/multipage-fonts
Multi-Page Fonts & Tightly Packed FreeType Glyphs
mattdesl [Mon, 16 Sep 2013 01:07:34 +0000 (21:07 -0400)]
Merge branch 'master' of https://github.com/mattdesl/libgdx into multipage-fonts
Conflicts:
CHANGES
mattdesl [Mon, 16 Sep 2013 01:04:12 +0000 (21:04 -0400)]
applied formatting, ignored draw() when idx is <= 0, used better naming convention
MobiDevelop [Sun, 15 Sep 2013 22:23:50 +0000 (15:23 -0700)]
Merge pull request #729 from semtiko/master
Added IsometricStaggeredTiledMapRenderer
Alex Vega [Sun, 15 Sep 2013 22:14:36 +0000 (02:14 +0400)]
Added IsometricStaggeredTiledMapRenderer
Based of IsometricTiledMapRenderer.
For more info see:
http://gamedev.stackexchange.com/a/49848
http://legendofmazzeroth.wikidot.com/staggered-isometric-maps
Alex Vega [Sun, 15 Sep 2013 22:11:21 +0000 (02:11 +0400)]
Added IsometricStaggeredTiledMapRenderer for GWT
NathanSweet [Sun, 15 Sep 2013 13:38:49 +0000 (15:38 +0200)]
Javadocs.
NathanSweet [Sun, 15 Sep 2013 13:37:58 +0000 (15:37 +0200)]
Merge branch 'origin/master'
NathanSweet [Sun, 15 Sep 2013 13:37:45 +0000 (15:37 +0200)]
Javadocs.
NathanSweet [Sun, 15 Sep 2013 13:37:38 +0000 (15:37 +0200)]
Fixed array[] constructors backing array size.
Nathan Sweet [Sun, 15 Sep 2013 10:46:58 +0000 (03:46 -0700)]
Merge pull request #727 from hneuer/drawable
Fixed Skin.getTiledDrawable
hneuer [Sun, 15 Sep 2013 10:43:26 +0000 (12:43 +0200)]
Fixed Skin.getTiledDrawable
Mario Zechner [Sun, 15 Sep 2013 10:05:49 +0000 (03:05 -0700)]
Merge pull request #589 from jrenner/graphics-array-refactor
refactor gdx.graphics to use Array instead of ArrayList
Mario Zechner [Sun, 15 Sep 2013 10:00:12 +0000 (03:00 -0700)]
Merge pull request #726 from hneuer/netjava
Some tweaks in NetJavaImpl
hneuer [Sun, 15 Sep 2013 09:48:52 +0000 (11:48 +0200)]
Some tweaks in NetJavaImpl
Mario Zechner [Sun, 15 Sep 2013 00:11:39 +0000 (02:11 +0200)]
Update README.md
Xoppa [Sun, 15 Sep 2013 00:06:29 +0000 (17:06 -0700)]
Merge pull request #722 from xoppa/3dapi
3dapi test various
Xoppa [Sun, 15 Sep 2013 00:05:11 +0000 (02:05 +0200)]
Fix shadercollectiontest
Xoppa [Sun, 15 Sep 2013 00:00:16 +0000 (02:00 +0200)]
fix g3d tests
Xoppa [Sat, 14 Sep 2013 23:53:00 +0000 (16:53 -0700)]
Merge pull request #721 from xoppa/3dapi
Add g3d materials
Xoppa [Sat, 14 Sep 2013 23:51:25 +0000 (01:51 +0200)]
Add g3d materials
Xoppa [Sat, 14 Sep 2013 23:44:23 +0000 (16:44 -0700)]
Merge pull request #720 from xoppa/3dapi
Add ShaderCollectionTest
Xoppa [Sat, 14 Sep 2013 23:21:30 +0000 (01:21 +0200)]
Add ShaderCollectionTest
Xoppa [Sat, 14 Sep 2013 23:11:53 +0000 (16:11 -0700)]
Merge pull request #719 from xoppa/3dapi
Add environment cubemap to lights
Xoppa [Sat, 14 Sep 2013 23:10:19 +0000 (01:10 +0200)]
Add environment cubemap to lights
Mario Zechner [Sat, 14 Sep 2013 22:11:50 +0000 (00:11 +0200)]
Update README.md
Mario Zechner [Sat, 14 Sep 2013 22:10:57 +0000 (00:10 +0200)]
Update README.md
Mario Zechner [Sat, 14 Sep 2013 22:10:47 +0000 (00:10 +0200)]
Update README.md
badlogic [Sat, 14 Sep 2013 19:52:08 +0000 (21:52 +0200)]
fixed GTW emulation of box2d to use Array instead of ArrayList
badlogic [Sat, 14 Sep 2013 19:47:07 +0000 (21:47 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
Mario Zechner [Sat, 14 Sep 2013 19:43:53 +0000 (12:43 -0700)]
Merge pull request #588 from jrenner/box2d-array-refactor
all box2d classes refactored from java.util.ArrayList to badlogic Array class
Mario Zechner [Sat, 14 Sep 2013 19:42:22 +0000 (12:42 -0700)]
Merge pull request #587 from jameslfc19/master
Made Setup-UI compatible with the iPhone 5 (Retina 4-inch) and added ico...
Mario Zechner [Sat, 14 Sep 2013 19:39:51 +0000 (12:39 -0700)]
Merge pull request #476 from semtiko/master
Create ScreenAdapter for more flexibility
badlogic [Sat, 14 Sep 2013 18:32:31 +0000 (20:32 +0200)]
setup ui now points to libgdx.badlogicgames.com for release builds
Xoppa [Sat, 14 Sep 2013 17:20:27 +0000 (10:20 -0700)]
Merge pull request #591 from xoppa/3dapi
3dapi various small changes
Xoppa [Sat, 14 Sep 2013 17:13:36 +0000 (19:13 +0200)]
CameraInputController add pinch zoom
Xoppa [Sat, 14 Sep 2013 17:12:16 +0000 (19:12 +0200)]
BaseShader update for GLTexture
Xoppa [Sat, 14 Sep 2013 17:11:57 +0000 (19:11 +0200)]
Add reflection color
Xoppa [Sat, 14 Sep 2013 17:03:25 +0000 (10:03 -0700)]
Merge pull request #590 from xoppa/3dapi
Cubemap add javadocs
Xoppa [Sat, 14 Sep 2013 17:01:42 +0000 (19:01 +0200)]
Cubemap add javadocs
Mario Zechner [Sat, 14 Sep 2013 14:26:24 +0000 (16:26 +0200)]
Update README.md
Mario Zechner [Sat, 14 Sep 2013 14:25:41 +0000 (16:25 +0200)]
Update README.md
Mario Zechner [Sat, 14 Sep 2013 14:24:58 +0000 (16:24 +0200)]
Update README.md
badlogic [Sat, 14 Sep 2013 12:13:04 +0000 (14:13 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sat, 14 Sep 2013 12:12:57 +0000 (14:12 +0200)]
fixed pixmap disposing in texture data upload
Jon Renner [Sat, 14 Sep 2013 05:48:31 +0000 (13:48 +0800)]
refactor gdx.graphics to use Array instead of ArrayList
Jon Renner [Sat, 14 Sep 2013 04:42:46 +0000 (12:42 +0800)]
all box2d classes refactored to use badlogic Array instead of java.util.ArrayList - does change API a little
jameslfc19 [Fri, 13 Sep 2013 23:28:50 +0000 (00:28 +0100)]
Made Setup-UI compatible with the iPhone 5 (Retina 4-inch) and added icons ready for the app store.
-Added splash screens that Apple use to detect whether the app is compatible with the iPhone 5 (Retina 4-inch)
-Added iPhone and iPad icons so that the App will be ready for the App Store.
-Icons and splash screens are located in ios-robovm/data (This keeps it separate from the other projects, for instance if the user doesn't want to include the ios-robovm project.
Signed-off-by: jameslfc19 <jameslfc19@gmail.com>
MobiDevelop [Fri, 13 Sep 2013 22:56:32 +0000 (15:56 -0700)]
Fix Label docs
Doc stated a Label would honor actor rotation/scaling but that functionality was removed long ago.
badlogic [Fri, 13 Sep 2013 22:20:22 +0000 (00:20 +0200)]
removed texture emu, replaced with ETC1TextureData emu, nice :)
badlogic [Fri, 13 Sep 2013 22:11:16 +0000 (00:11 +0200)]
added notes about texture changes
badlogic [Fri, 13 Sep 2013 22:08:20 +0000 (00:08 +0200)]
fixed texture emu in gwt
badlogic [Fri, 13 Sep 2013 21:47:09 +0000 (23:47 +0200)]
made GLTexture abstract, fixed up a few minor things
Mario Zechner [Fri, 13 Sep 2013 21:28:18 +0000 (14:28 -0700)]
Merge pull request #586 from xoppa/3dapi
Add GLTexture and Cubemap
Xoppa [Fri, 13 Sep 2013 20:14:18 +0000 (22:14 +0200)]
TextureBinder use GLTexture
Xoppa [Fri, 13 Sep 2013 20:12:34 +0000 (22:12 +0200)]
Add texture to gwt
Xoppa [Fri, 13 Sep 2013 20:11:07 +0000 (22:11 +0200)]
Texture extend GLTexture
Xoppa [Fri, 13 Sep 2013 20:07:35 +0000 (22:07 +0200)]
Add GLTexture
Nathan Sweet [Fri, 13 Sep 2013 19:17:17 +0000 (12:17 -0700)]
Merge pull request #585 from hneuer/actor
Fix possible NPE in AddListenerAction
hneuer [Fri, 13 Sep 2013 19:14:36 +0000 (21:14 +0200)]
Fix possible NPE in AddListenerAction
NathanSweet [Fri, 13 Sep 2013 19:09:49 +0000 (21:09 +0200)]
ellipse off by default.
NathanSweet [Fri, 13 Sep 2013 18:54:39 +0000 (20:54 +0200)]
Merge branch 'origin/master'
NathanSweet [Fri, 13 Sep 2013 18:54:23 +0000 (20:54 +0200)]
Nathan Sweet [Fri, 13 Sep 2013 18:50:37 +0000 (11:50 -0700)]
Merge pull request #573 from PixelDuck/master
Add a method isPointInPolygon() with vertices passed trough Array<Vector...
omartin [Fri, 13 Sep 2013 18:43:20 +0000 (20:43 +0200)]
rename isPointInPolygonAux() to isPointInPolygon()
badlogic [Fri, 13 Sep 2013 17:11:28 +0000 (19:11 +0200)]
merged ios preferences fix, updated robovm todos
Nathan Sweet [Fri, 13 Sep 2013 17:08:39 +0000 (10:08 -0700)]
Merge pull request #584 from ttencate/master
Clarify some Javadoc and rename some parameters to be more self-documenting
Thomas ten Cate [Fri, 13 Sep 2013 17:04:40 +0000 (18:04 +0100)]
Clarify some Javadoc and rename some parameters to be more self-documenting
Mario Zechner [Fri, 13 Sep 2013 17:02:05 +0000 (10:02 -0700)]
Merge pull request #583 from ntherning/ios-preferences-fix
Fix for bug in RoboVM which may cause ClassCastException in IOSPreferences
Niklas Therning [Fri, 13 Sep 2013 16:13:04 +0000 (18:13 +0200)]
Added work around for bug 155 in RoboVM which may cause ClassCastExceptions to be thrown by the get-methods in IOSPreferences.
Nathan Sweet [Fri, 13 Sep 2013 13:39:31 +0000 (06:39 -0700)]
Merge pull request #582 from hneuer/str
Fixed StringBuilder.insert