Merge remote-tracking branch 'origin/master' into 1.8
# Conflicts: # Flax.flaxproj # Source/Editor/Cooker/Steps/DeployDataStep.cpp
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<activity android:name="com.flaxengine.GameActivity"
|
||||
android:label="@string/app_name"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
android:screenOrientation="fullSensor">
|
||||
android:screenOrientation="${DefaultOrientation}">
|
||||
<meta-data android:name="android.app.lib_name" android:value="FlaxGame" />
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
Reference in New Issue
Block a user