townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,869 Commits 3 Branches 3 Tags 168 MiB
cc-2
Commit Graph

9869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aster2013
aaa792609a Combine DrawableProxy2D and MaterialCache2D in to Renderer2D. 2014-11-24 11:42:17 +08:00
Yao Wei Tjong 姚伟忠
e7b0808b12 Misc. fixes in the build script to improve the release mechanism. 
The following changes address the shortcomings of our current release mechanism detected from our last release.
- Define and set RELEASE_TAG environment variable only when a git tag conform to a release tagging matching regex "\d+\.\d+".
- Change the logic to allow the automated rake tasks to be triggered on a 'tag' branch properly.
- Fix the 'git rebase' command to use the branch pointed by TRAVIS_BRANCH environment variable as baseline, instead of assuming it to be always 'origin/master' as before.
- Change Urho3D library versioning CMake module to omit the version patch number when there is none, i.e. 1.32 instead of 1.32.0.
 2014-11-23 20:01:32 +08:00
aster2013
ba1e0974d0 Remove COPY_BASE_ATTRIBUTES(Component); 2014-11-23 12:42:42 +08:00
urho3d-travis-ci
5c1f05ed10 Travis CI: API documentation update at 2014-11-22 15:30:34 UTC. 
[ci package]
 2014-11-22 15:30:34 +00:00
aster2013
0f1ce308e9 Merge branch 'mixed-accessor-attribute' 2014-11-22 23:12:40 +08:00
aster2013
4655ee1ee4 Submit code in LuaScript samples. 2014-11-22 16:23:17 +08:00
aster2013
f8879539fa Add space template function. 2014-11-22 16:05:29 +08:00
aster2013
09a33521aa Add space before template >, let GCC happy. 2014-11-22 15:47:21 +08:00
aster2013
c1ea1f9e06 Move attribute name as first parameter in ATTRIBUTE macro, same as other attribute macros. 2014-11-22 15:23:16 +08:00
aster2013
13d3f1c8ac Add attribute trait, treat ref attribute same with attribute. 2014-11-22 15:04:09 +08:00
aster2013
9e5172a959 Add EnumAttributeAccessorImpl class, remove all Variant::Get<> functions for enum type. 2014-11-22 13:22:37 +08:00
aster2013
cb819a5a6f Remove class name and variant type from attribute macros. 2014-11-22 12:43:23 +08:00
Yao Wei Tjong 姚伟忠
17b8150f31 For Travis CI - consider 'tag' branch as master branch. 2014-11-22 10:27:24 +08:00
Yao Wei Tjong 姚伟忠
dd01b749eb Enhance Rakefile to autoload other *.rake scripts in ".rake" directory. 
Also create symlink to Rakefile when scaffolding.
[ci skip]
 2014-11-22 01:10:24 +08:00
aster2013
d99b6e9a4e Remove type from MIXED_ACCESSOR_ATTRIBUTE macro, make it more cleaner. Other attribute macros will be modify later. 2014-11-22 00:54:28 +08:00
aster2013
5ea467ff23 Add GetVariantType functions, Fix compile warning in UI.cpp. 2014-11-22 00:44:36 +08:00
aster2013
5eed296f37 Add comment for modify third-party code. 2014-11-22 00:43:00 +08:00
Yao Wei Tjong 姚伟忠
60eeb45222 For Travis CI - skip APK test run when packaging. 
General build script cleanup:
- Constrain build option values in cmake-gui.
- Constrain build configuration for both multi-configuration and single-configuration generators.
- Mark cached variables as advanced or internal as appropriate.
 2014-11-22 00:39:48 +08:00
aster2013
605d113c9c Remove duplicated call of UpdateViewParameters.[ci skip] 2014-11-21 22:45:20 +08:00
aster2013
c7e248b13a Enable mouse visible in UIDrag sample. 2014-11-21 22:13:22 +08:00
aster2013
4058e45acb Fix compile warning in tolua. 2014-11-21 22:00:15 +08:00
aster2013
7e46f0c862 Add MIXED_ACCESSOR_ATTRIBUTE. 2014-11-21 18:26:45 +08:00
Lasse Öörni
0deb74d201 Change variable name to start with lowercase. 2014-11-21 11:19:29 +02:00
aster2013
657a7d9922 Make GetCPUData and GetAndroidCPUCount static. 2014-11-21 15:31:48 +08:00
Lasse Öörni
e6508e418b If reverse mapping of a node variable is not known, show the hexadecimal hash to allow editing the var in the editor. 2014-11-20 16:44:16 +02:00
Lasse Öörni
65ee2ca966 Add function to get CPU count on Android. For now returns the same for logical & physical. Closes #535. Update changelog. 2014-11-20 14:49:38 +02:00
urho3d-travis-ci
aa3f467da2 Travis CI: API documentation update at 2014-11-20 11:17:19 UTC. 
[ci package]
 2014-11-20 11:17:19 +00:00
aster2013
e24648ae47 remove empty line, rename variance. 2014-11-20 18:17:09 +08:00
aster2013
12aceffb82 Merge remote-tracking branch 'remotes/origin/Subscribe-to-Lua-Function' 2014-11-20 18:06:52 +08:00
Lasse Öörni
c7b07bdb10 supress -> suppress 2014-11-20 11:53:27 +02:00
Lasse Öörni
c13c9280e9 Merge remote-tracking branch 'hdunderscore/Input_MM_RELATIVE_FIX' 2014-11-20 11:43:33 +02:00
Lasse Öörni
159bda2928 Update inspector window right after creation to fix bugged layout. 2014-11-20 11:33:28 +02:00
hdunderscore
17118be70f Input::SetMouseMode and Console::SetVisible were keeping track of last mouse visible independently, which could cause mouse to become trapped in editor (eg: drag slider + open console + press escape). 
Now a unified way of hiding the mouse and recalling the 'true' visibility is provided via SetMouseVisible(bool enable, bool supressEvent) and ResetMouseVisible().
 2014-11-20 19:56:51 +11:00
aster2013
00c9316503 Fix typo. 2014-11-20 16:41:04 +08:00
aster2013
90eb670146 Remove unused code. 2014-11-20 14:20:55 +08:00
aster2013
8d067b2810 Now, we can use Lua function to handle event directly, for example: 
SubscribeToEvent(draggableFish, "DragBegin",
  function (eventType, eventData)
    dragBeginPosition = IntVector2(eventData:GetInt("ElementX"), eventData:GetInt("ElementY"))
  end)
 2014-11-20 14:17:34 +08:00
PrimitiveWaste
788badde48 Fix a bug in UIElement's CalculateLayout() that caused an infinite loop with certain flex scale values . Fixes #529 2014-11-19 12:37:25 -08:00
Yao Wei Tjong 姚伟忠
e3c1ce1f99 Add Android ABI 64-bit support into 1.32 changelog. 
Test [ci package] of new Android ABIs.
 2014-11-19 23:34:39 +08:00
Yao Wei Tjong 姚伟忠
0fb99af9e4 Misc. fixes and enhancement for Android platform. 
- Add initial support for ndk-gdb. Enable via new 'URHO3D_NDK_GDB' build option.
- Enhance rake android task: more effective loop to wait for Android device, ability to pick library to run from SampleLauncher from the adb shell.
- Fix "buildvm" tool name for Android to derive from the correct NDK ABI CMake's variable.
- Fix Android toolchain to copy shared STL library to the correct Android library output directory.
 2014-11-19 21:50:37 +08:00
Yao Wei Tjong 姚伟忠
733b0bbaeb Fix AngelScript library to support Android ABI arm64-v8a (untested). 2014-11-19 21:48:26 +08:00
Yao Wei Tjong 姚伟忠
12dd2699c5 Tighten the check to detect Android ABI x86_64 in AngelScript library. 
Related to commit b7ab0ad4f8970d52b290b2789a94aefc669b9cfb.
 2014-11-19 21:48:26 +08:00
Yao Wei Tjong 姚伟忠
e0e3b11757 Refactor build scripts to auto detect ANDROID and RASPI build options. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
dd4eadb958 Fix AngelScript library to support Android ABI x86_64. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
edc6529491 Init the URHO3D_64BIT build option to 1 when Android ABI is arm64-v8a. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
33358e9caa For Travis CI - Fallback to use Lua library for ABI arm64-v8a. 
SDK r10c does not ship with the corresponding system image for this ABI yet, so also skip the APK packaging step for now.
 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
1b95f204dc Enhance Android related tasks to work with multiple attached devices. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
c711d450ed Name Android buildvm tool for LuaJIT library differently based on ABI. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
0e9f6e9251 For Travis CI - reduce the AVD waiting time to 1 minutes instead. 
There is no point to wait for AVD to start. By the time the CI finishes the build, if the emulator is able to start the AVD then it should have been already done so.
On non-CI environment, the build time could still be much faster than the emulator starting the AVD, thus the function to wait for AVD is still useful in non-CI environment.
 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
f8a2b5e14e For Travis CI - attempt to fix failure to start emulator with API 21. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
dc1753e7f9 Fix Android toolchain so that Clang always comes after GCC. 
Merge some of the changes from one of the android-cmake's PR for NDK r10c.
 2014-11-19 21:48:25 +08:00