OSDN Git Service
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
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 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
hneuer [Fri, 13 Sep 2013 13:28:15 +0000 (15:28 +0200)]
Fixed StringBuilder.insert
Test code:
StringBuilder b = new StringBuilder("test123");
int offset = 2;
char[] str = "ABCD".toCharArray();
b.insert(offset, str, 1, 2);
System.out.println("b: " + b);
System.out.println("str: " + new String(str));
// wrong:
// b: tesest1
// str: ABBC
// right:
// b: teBCst123
// str: ABCD
Justin Shapcott [Fri, 13 Sep 2013 13:23:54 +0000 (06:23 -0700)]
Add changes from PR #567 to GWT module def
Adds new classes and classpath files.
NathanSweet [Fri, 13 Sep 2013 12:19:47 +0000 (14:19 +0200)]
Formatted, fixed getRotation being commented out.
e10d5cc09d113ec71c1a67af84b8a273f073272d
NathanSweet [Fri, 13 Sep 2013 12:17:58 +0000 (14:17 +0200)]
Merge branch 'origin/master'
NathanSweet [Fri, 13 Sep 2013 12:17:50 +0000 (14:17 +0200)]
Added getColor.
Mario Zechner [Fri, 13 Sep 2013 11:31:55 +0000 (04:31 -0700)]
Merge pull request #565 from hneuer/effectbounds
Added bounding box for particle effects.
badlogic [Fri, 13 Sep 2013 11:07:44 +0000 (13:07 +0200)]
who killed Sprite#getRotation?
badlogic [Fri, 13 Sep 2013 11:00:14 +0000 (13:00 +0200)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 13 Sep 2013 11:00:06 +0000 (13:00 +0200)]
added todos.txt for robovm backend, cleaned up files a little
hneuer [Fri, 13 Sep 2013 10:39:15 +0000 (12:39 +0200)]
Deleted leftover from merge.
hneuer [Fri, 13 Sep 2013 10:36:02 +0000 (12:36 +0200)]
Merge branch 'master' into effectbounds
Conflicts:
CHANGES
Nathan Sweet [Fri, 13 Sep 2013 10:19:29 +0000 (03:19 -0700)]
Merge pull request #570 from jrenner/master
more docs for Sprite.java
Mario Zechner [Fri, 13 Sep 2013 10:15:09 +0000 (03:15 -0700)]
Merge pull request #135 from junkdog/master
ParticleEditor: delta multiplier and simpler new emitters.
Mario Zechner [Fri, 13 Sep 2013 10:12:44 +0000 (03:12 -0700)]
Merge pull request #564 from hneuer/pool
ParticleEmitter now resets the active particles too.
Mario Zechner [Fri, 13 Sep 2013 10:12:02 +0000 (03:12 -0700)]
Merge pull request #567 from xoppa/3dapi
3dapi: add basic shadow mapping
Mario Zechner [Fri, 13 Sep 2013 10:08:29 +0000 (03:08 -0700)]
Merge pull request #577 from hneuer/tmxloader
AtlasTmxMapLoader small fixes
Mario Zechner [Fri, 13 Sep 2013 10:07:42 +0000 (03:07 -0700)]
Merge pull request #581 from ntherning/superjumper-app-store-ready
Added icons and splash screens and changed app id and name for SuperJumper to make it ready for App Store
badlogic [Fri, 13 Sep 2013 09:59:36 +0000 (11:59 +0200)]
minor changes to setVertices docs
Nathan Sweet [Fri, 13 Sep 2013 09:41:47 +0000 (02:41 -0700)]
Merge pull request #580 from hneuer/pecond
Removed repeated conditional check
Nathan Sweet [Fri, 13 Sep 2013 09:40:52 +0000 (02:40 -0700)]
Merge pull request #579 from hneuer/coll2
Fixed capacity check in collection classes
Niklas Therning [Fri, 13 Sep 2013 09:17:22 +0000 (11:17 +0200)]
Added icons and splash screens and changed app id and name for SuperJumper to make it ready for App Store.
hneuer [Fri, 13 Sep 2013 08:55:31 +0000 (10:55 +0200)]
Removed repeated conditional check
hneuer [Fri, 13 Sep 2013 08:51:48 +0000 (10:51 +0200)]
Fixed capacity check in collection classes
omartin [Fri, 13 Sep 2013 06:58:47 +0000 (08:58 +0200)]
Remove old method isPointInPolygon(List<Vector2>, Vector2)
NathanSweet [Fri, 13 Sep 2013 00:24:30 +0000 (02:24 +0200)]
Merge branch 'origin/master'
NathanSweet [Fri, 13 Sep 2013 00:24:23 +0000 (02:24 +0200)]
Better error message.
NathanSweet [Fri, 13 Sep 2013 00:24:15 +0000 (02:24 +0200)]
Removed two uniforms.
SpriteBatch didn't have them.
NathanSweet [Fri, 13 Sep 2013 00:23:52 +0000 (02:23 +0200)]
Throw exception if not enough points.
NathanSweet [Fri, 13 Sep 2013 00:23:38 +0000 (02:23 +0200)]
Copy the points if not sorted.
Nathan Sweet [Thu, 12 Sep 2013 21:50:18 +0000 (14:50 -0700)]
Merge pull request #578 from hneuer/ui
Fixed Attribute.equals
hneuer [Thu, 12 Sep 2013 21:45:27 +0000 (23:45 +0200)]
Fixed Attribute.equals
hneuer [Thu, 12 Sep 2013 20:37:09 +0000 (22:37 +0200)]
- Avoid NPE if atlas property is not set and throw gdx exception with error message instead
- removed unnecessary object creation
hneuer [Thu, 12 Sep 2013 20:31:53 +0000 (22:31 +0200)]
- Avoid NPE if atlas property is not set and throw gdx exception with error message instead
- removed unnecessary object creation
Nathan Sweet [Thu, 12 Sep 2013 20:29:43 +0000 (13:29 -0700)]
Merge pull request #576 from hneuer/tablelayout
Removed erroneous private method from TableLayout
hneuer [Thu, 12 Sep 2013 20:14:35 +0000 (22:14 +0200)]
Removed erroneous private method
Justin Shapcott [Thu, 12 Sep 2013 14:13:08 +0000 (07:13 -0700)]
Fix files for RoboVM
NathanSweet [Thu, 12 Sep 2013 13:31:08 +0000 (15:31 +0200)]
remove private, fixed remove crash, better toString. #574
NathanSweet [Thu, 12 Sep 2013 13:19:55 +0000 (15:19 +0200)]
Merge branch 'origin/master'
NathanSweet [Thu, 12 Sep 2013 13:19:47 +0000 (15:19 +0200)]
Minor updates.
Nathan Sweet [Thu, 12 Sep 2013 13:19:37 +0000 (06:19 -0700)]
Merge pull request #574 from hneuer/binaryheap
Added add(T, float), remove(int), remove(T) and clear() to BinaryHeap
hneuer [Thu, 12 Sep 2013 11:25:39 +0000 (13:25 +0200)]
Added add(T, float), remove(int), remove(T) and clear() methods to BinaryHeap.
omartin [Thu, 12 Sep 2013 06:34:29 +0000 (08:34 +0200)]
Add a method isPointInPolygon() with vertices passed trough Array<Vector2> instead of List<Vector2>. Mark old method as deprecated and use an auxiliary method for the main code for both functions.
Justin Shapcott [Wed, 11 Sep 2013 21:43:10 +0000 (14:43 -0700)]
Fix getFileHandle for Internal files in RoboVM
NathanSweet [Wed, 11 Sep 2013 20:54:07 +0000 (22:54 +0200)]
Comments.
NathanSweet [Wed, 11 Sep 2013 20:48:54 +0000 (22:48 +0200)]
Moar javadocs.
NathanSweet [Wed, 11 Sep 2013 19:48:00 +0000 (21:48 +0200)]
Javadocs, organization/cleanup.
NathanSweet [Wed, 11 Sep 2013 17:32:21 +0000 (19:32 +0200)]
Javadocs.
NathanSweet [Wed, 11 Sep 2013 17:30:49 +0000 (19:30 +0200)]
git sucks
NathanSweet [Wed, 11 Sep 2013 17:29:43 +0000 (19:29 +0200)]
Merge branch 'origin/master'
Conflicts:
gdx/src/com/badlogic/gdx/graphics/g2d/PolygonSpriteBatch.java
NathanSweet [Wed, 11 Sep 2013 17:24:17 +0000 (19:24 +0200)]
Javadocs.
Nathan Sweet [Wed, 11 Sep 2013 17:21:46 +0000 (10:21 -0700)]
Merge pull request #572 from jrenner/patch-1
Update PolygonSpriteBatch.java
Jon Renner [Wed, 11 Sep 2013 16:25:51 +0000 (00:25 +0800)]
Update PolygonSpriteBatch.java
Docs wtf
NathanSweet [Wed, 11 Sep 2013 14:35:22 +0000 (16:35 +0200)]
Fixed up PolygonSprite.
NathanSweet [Wed, 11 Sep 2013 13:56:44 +0000 (15:56 +0200)]
Forgot zee credits!
NathanSweet [Wed, 11 Sep 2013 13:54:58 +0000 (15:54 +0200)]
Merge branch 'origin/master'
NathanSweet [Wed, 11 Sep 2013 13:54:45 +0000 (15:54 +0200)]
Moar utils.
NathanSweet [Wed, 11 Sep 2013 13:53:55 +0000 (15:53 +0200)]
Triangulators changed to return triangle indicies. PolygonSpriteBatch refactored.
NathanSweet [Wed, 11 Sep 2013 13:52:59 +0000 (15:52 +0200)]
add method that casts to short.
Bloody annoying otherwise.
NathanSweet [Wed, 11 Sep 2013 13:52:32 +0000 (15:52 +0200)]
A little clean up.
badlogic [Tue, 10 Sep 2013 22:21:33 +0000 (00:21 +0200)]
fixed my stupid brain
badlogic [Tue, 10 Sep 2013 22:19:43 +0000 (00:19 +0200)]
fixed Texture emulation, gdx.gwt.xml