Merge branch 'nme-collab'

Conflicts:
	project/src/backend/sdl2/SDL2Stage.cpp
	project/src/common/Display.cpp
	project/src/common/ExternalInterface.cpp
This commit is contained in:
Joshua Granick
2014-04-15 14:33:54 -07:00
193 changed files with 1086 additions and 64235 deletions

View File

@@ -19,6 +19,7 @@ public class Lime {
public static native int onAccelerate(float x, float y, float z);
public static native int onTouch(int type, float x, float y, int id, float sizeX, float sizeY);
public static native int onResize(int width, int height);
public static native int onContextLost();
public static native int onTrackball(float x,float y);
public static native int onJoyChange(int inDeviceID, int inCode, boolean inIsDown);
public static native int onJoyMotion(int inDeviceID, int axis, float value);