Browse Source

Merge pull request #1598 from seanpaultaylor/next

Next
Sean Taylor 11 năm trước cách đây
mục cha
commit
5df99bb163

BIN
gameplay/res/icon_tray.png


+ 3 - 3
gameplay/src/org/gameplay3d/GameNativeActivity.java → gameplay/src/org/gameplay3d/GamePlayNativeActivity.java

@@ -14,7 +14,7 @@ import android.view.MotionEvent;
 import android.view.View;
 
 /**
- * Game extension for Android platform.
+ * GamePlay native activity extension for Android platform.
  * 
  * Handles any platform features that cannot be handled natively in PlatformAndroid.cpp 
  * 
@@ -22,14 +22,14 @@ import android.view.View;
  * that are not offered directly the gameplay3d framework such as platform events, access to 
  * android user-interface, life-cycle events for saving game state and custom plug-ins/extensions.
  */
-public class GameNativeActivity extends NativeActivity
+public class GamePlayNativeActivity extends NativeActivity
     implements InputManager.InputDeviceListener {
     
     static {
         System.loadLibrary("gameplay");
     }
     
-    private static final String TAG = "GameNativeActivity";
+    private static final String TAG = "GamePlayNativeActivity";
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {

+ 1 - 1
samples/browser/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/browser/android/res/drawable/icon.png


BIN
samples/browser/icon.png


+ 1 - 1
samples/character/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/character/android/res/drawable/icon.png


BIN
samples/character/icon.png


+ 1 - 1
samples/lua/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                 android:label="@string/app_name"
                 android:configChanges="orientation|screenSize|keyboardHidden"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/lua/android/res/drawable/icon.png


BIN
samples/lua/icon.png


+ 1 - 1
samples/mesh/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/mesh/android/res/drawable/icon.png


BIN
samples/mesh/icon.png


+ 1 - 1
samples/particles/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/particles/android/res/drawable/icon.png


BIN
samples/particles/icon.png


+ 1 - 1
samples/racer/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/racer/android/res/drawable/icon.png


BIN
samples/racer/icon.png


+ 1 - 1
samples/spaceship/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
samples/spaceship/android/res/drawable/icon.png


BIN
samples/spaceship/icon.png


+ 1 - 1
template/android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GameNativeActivity"
+        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|screenSize|keyboardHidden"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

BIN
template/android/res/drawable/icon.png


BIN
template/icon.png