Browse Source

Add Android ABI 64-bit support into 1.32 changelog.
Test [ci package] of new Android ABIs.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
e3c1ce1f99
3 changed files with 10 additions and 10 deletions
  1. 5 5
      Docs/Urho3D.dox
  2. 2 2
      Readme.txt
  3. 3 3
      Source/Engine/LuaScript/pkgs/UI/UIElement.pkg

+ 5 - 5
Docs/Urho3D.dox

@@ -220,7 +220,7 @@ V1.32
 - Improve terrain rendering on mobile devices
 - Improve terrain rendering on mobile devices
 - Refactoring of camera facing modes in %BillboardSet & %Text3D
 - Refactoring of camera facing modes in %BillboardSet & %Text3D
 - Additive alpha techniques for particle rendering
 - Additive alpha techniques for particle rendering
-- Possibility to use %CustomGeometry component for physics triangle mesh  collision
+- Possibility to use %CustomGeometry component for physics triangle mesh collision
 - Access to 2D node coordinates for convenience when using 2D graphics features
 - Access to 2D node coordinates for convenience when using 2D graphics features
 - Save embedded textures in AssetImporter
 - Save embedded textures in AssetImporter
 - Use best matching fullscreen resolution if no exact match
 - Use best matching fullscreen resolution if no exact match
@@ -250,7 +250,7 @@ V1.32
 - Allow to create AngelScript script objects by specifying the interface it implements
 - Allow to create AngelScript script objects by specifying the interface it implements
 - %Window position startup parameters
 - %Window position startup parameters
 - Functions to get time since epoch & modify file's last modified time
 - Functions to get time since epoch & modify file's last modified time
-- Optionally auto-disable child elements of a scroll view when touch  scrolling
+- Optionally auto-disable child elements of a scroll view when touch scrolling
 - Allocate views permanently per viewport to allow querying for drawables, lights etc. reliably
 - Allocate views permanently per viewport to allow querying for drawables, lights etc. reliably
 - Allow to specify material techniques/passes that should not be used on mobile devices
 - Allow to specify material techniques/passes that should not be used on mobile devices
 - Reduced default shadow mapping issues on mobile devices
 - Reduced default shadow mapping issues on mobile devices
@@ -258,7 +258,7 @@ V1.32
 - Build system: possibility to build Urho3D without networking or 2D graphics functionality
 - Build system: possibility to build Urho3D without networking or 2D graphics functionality
 - Build system: improved generated scripting documentation
 - Build system: improved generated scripting documentation
 - Build system: improved support for IDE's in CMake scripts
 - Build system: improved support for IDE's in CMake scripts
-- Build system: support up to Android NDK r10c
+- Build system: support up to Android NDK r10c and 64-bit ABIs
 - Build system: numerous other improvements
 - Build system: numerous other improvements
 - Editor: resource browser
 - Editor: resource browser
 - Editor: spawn window for random-generating objects
 - Editor: spawn window for random-generating objects
@@ -296,14 +296,14 @@ V1.32
 - Fix skeleton-only model not importing in AssetImporter
 - Fix skeleton-only model not importing in AssetImporter
 - Fix terrain raycast returning incorrect position/normal
 - Fix terrain raycast returning incorrect position/normal
 - Fix animation keyframe timing in AssetImporter if start time is not 0
 - Fix animation keyframe timing in AssetImporter if start time is not 0
-- Fix storing %Image resources to memory unnecessarily during cube/3D  texture loading
+- Fix storing %Image resources to memory unnecessarily during cube/3D texture loading
 - Fix to node transform dirtying mechanism and the TransformChanged() script function
 - Fix to node transform dirtying mechanism and the TransformChanged() script function
 - Fix returned documents directory not being writable on iOS
 - Fix returned documents directory not being writable on iOS
 - Fix click to emptiness not closing a menu
 - Fix click to emptiness not closing a menu
 - Fix %FileWatcher notifying when file was still being saved. By default delay notification 1 second
 - Fix %FileWatcher notifying when file was still being saved. By default delay notification 1 second
 - Fix .txml import in the editor
 - Fix .txml import in the editor
 - Fix erroneous raycast to triangles behind the ray
 - Fix erroneous raycast to triangles behind the ray
-- Fix crash when multiple AnimatedModels exist in a node and the master  model is destroyed
+- Fix crash when multiple AnimatedModels exist in a node and the master model is destroyed
 - Fix missing %Matrix4 * %Matrix3x4 operator in script
 - Fix missing %Matrix4 * %Matrix3x4 operator in script
 - Fix various compile warnings that leak to applications using Urho3D
 - Fix various compile warnings that leak to applications using Urho3D
 - Fix %DebugHud update possibly being late one frame
 - Fix %DebugHud update possibly being late one frame

+ 2 - 2
Readme.txt

@@ -287,7 +287,7 @@ Note that the native code is built by default for armeabi-v7a ABI. To make your
 program compatible also with old Android devices, build also an armeabi version
 program compatible also with old Android devices, build also an armeabi version
 by executing the CMake batch file again with the parameter -DANDROID_ABI=armeabi
 by executing the CMake batch file again with the parameter -DANDROID_ABI=armeabi
 added, then execute make again in the build directory. See "Build options" for
 added, then execute make again in the build directory. See "Build options" for
-all the possible values
+all the possible values.
 
 
 You can also build and deploy using Eclipse IDE with ADT plugin. To do that,
 You can also build and deploy using Eclipse IDE with ADT plugin. To do that,
 after setting the ANDROID_NDK environment variable then run cmake_eclipse.sh.
 after setting the ANDROID_NDK environment variable then run cmake_eclipse.sh.
@@ -669,7 +669,7 @@ V1.32   - Finalized Urho2D functionality, including 2D physics using Box2D,
           graphics functionality
           graphics functionality
         - Build system: improved generated scripting documentation
         - Build system: improved generated scripting documentation
         - Build system: improved support for IDE's in CMake scripts
         - Build system: improved support for IDE's in CMake scripts
-        - Build system: support up to Android NDK r10c
+        - Build system: support up to Android NDK r10c and 64-bit ABIs
         - Build system: numerous other improvements
         - Build system: numerous other improvements
         - Editor: resource browser
         - Editor: resource browser
         - Editor: spawn window for random-generating objects
         - Editor: spawn window for random-generating objects

+ 3 - 3
Source/Engine/LuaScript/pkgs/UI/UIElement.pkg

@@ -125,7 +125,7 @@ class UIElement : public Animatable
     void SetLayoutMode(LayoutMode mode);
     void SetLayoutMode(LayoutMode mode);
     void SetLayoutSpacing(int spacing);
     void SetLayoutSpacing(int spacing);
     void SetLayoutBorder(const IntRect& border);
     void SetLayoutBorder(const IntRect& border);
-	void SetLayoutFlexScale(const Vector2& scale);
+    void SetLayoutFlexScale(const Vector2& scale);
     void SetIndent(int indent);
     void SetIndent(int indent);
     void SetIndentSpacing(int indentSpacing);
     void SetIndentSpacing(int indentSpacing);
     void UpdateLayout();
     void UpdateLayout();
@@ -191,7 +191,7 @@ class UIElement : public Animatable
     LayoutMode GetLayoutMode() const;
     LayoutMode GetLayoutMode() const;
     int GetLayoutSpacing() const;
     int GetLayoutSpacing() const;
     const IntRect& GetLayoutBorder() const;
     const IntRect& GetLayoutBorder() const;
-	const Vector2& GetLayoutFlexScale() const;
+    const Vector2& GetLayoutFlexScale() const;
     unsigned GetNumChildren(bool recursive = false) const;
     unsigned GetNumChildren(bool recursive = false) const;
     int GetDragButtonCombo() const;
     int GetDragButtonCombo() const;
     unsigned GetDragButtonCount() const;
     unsigned GetDragButtonCount() const;
@@ -265,7 +265,7 @@ class UIElement : public Animatable
     tolua_property__get_set LayoutMode layoutMode;
     tolua_property__get_set LayoutMode layoutMode;
     tolua_property__get_set int layoutSpacing;
     tolua_property__get_set int layoutSpacing;
     tolua_property__get_set IntRect& layoutBorder;
     tolua_property__get_set IntRect& layoutBorder;
-	tolua_property__get_set Vector2& layoutFlexScale;
+    tolua_property__get_set Vector2& layoutFlexScale;
     tolua_readonly tolua_property__get_set unsigned numChildren;
     tolua_readonly tolua_property__get_set unsigned numChildren;
     tolua_property__get_set UIElement* parent;
     tolua_property__get_set UIElement* parent;
     tolua_readonly tolua_property__get_set UIElement* root;
     tolua_readonly tolua_property__get_set UIElement* root;