townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,192 Commits 3 Branches 3 Tags 168 MiB
wtest
Commit Graph

10192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yao Wei Tjong 姚伟忠
b0b8b58f6d For Travis CI - double the time to wait for AVD to start. 
AVD with API level 21 seems to take longer to start. Also when the AVD failed to start in time, CI now skips the APK installation/launching test and considers the whole build as passed.
 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
eda52984ac Add initial support for 64-bit Android ABIs. 2014-11-19 21:48:25 +08:00
Lasse Öörni
fbe7108de8 Check node_ being non-null in RigidBody::ApplyWorldTransform(). 2014-11-19 15:45:03 +02:00
Lasse Öörni
4f8bc4a9f2 Revert "Allow UIElements to keep their current size if greater than the calculated size during layout updates." 
This reverts commit b97c8d4712.

FileSelector or the editor's hierarchy window would not resize to smaller properly if the amount of items in the list was being reduced. The MinSize attribute should be used to absolutely prevent layouting making an element smaller.
 2014-11-19 14:59:06 +02:00
Lasse Öörni
4c6bce8174 Make a backup (filename.old) in editor when saving XML format scenes, layouts or materials, delete after successful save. This prevents losing the file if XML save crashes. Closes #530. 2014-11-19 14:50:11 +02:00
Lasse Öörni
d63cc4c625 Initial V1.32 changelog. 2014-11-17 23:58:04 +02:00
urho3d-travis-ci
26ebc5f780 Travis CI: API documentation update at 2014-11-17 21:35:01 UTC. 
[ci package]
 2014-11-17 21:35:01 +00:00
PrimitiveWaste
283d0d196b Add layout flex scale to UIElement. Prevent layout updates while loading attributes. 2014-11-17 12:14:03 -08:00
PrimitiveWaste
b97c8d4712 Allow UIElements to keep their current size if greater than the calculated size during layout updates. 2014-11-17 12:14:02 -08:00
PrimitiveWaste
11cb6e05b6 Prevent UI Window from drifting when resizing from top right. 2014-11-17 12:14:02 -08:00
Lasse Öörni
8557571cb4 More robust check for OcclusionBuffer culling mode. Now also CULL_NONE mode should detect triangle facing correctly. 2014-11-17 21:33:26 +02:00
Lasse Öörni
b325ba5195 Support excluding 2D functionality from the build (CMake option URHO3D_URHO2D=0). Removed empty scene creation from the UIDrag example. Make compiling Civetweb conditional of URHO3D_NETWORK. Exclude samples depending on the Controls structure when URHO3D_NETWORK is disabled. 2014-11-17 21:00:02 +02:00
Lasse Öörni
16c05ee6cf Fix occlusion rendering to work with reverse triangle winding. Fix MultipleViewports C++ example using depth test in debug geometry. 2014-11-17 18:04:32 +02:00
Lasse Öörni
a5049d423f Avoid looping through geometries just before render just to find out their geometry update type. Removed the now unnecessary shadowGeometries_ vector. Thanks to OvermindDL1 for bringing this to attention. 2014-11-17 16:02:51 +02:00
urho3d-travis-ci
5f4f6870d9 Travis CI: API documentation update at 2014-11-17 12:11:52 UTC. 
[ci package]
 2014-11-17 12:11:52 +00:00
Lasse Öörni
3969b69b0d Refactor material shader parameter animations so that they happen in response to update events, the same as component/node attribute animations. This fixes material animations depending on visibility and therefore possibly going out of sync from other updates. Add possibility to associate material with scene to make it use the scene attribute update event instead of the global update event. 2014-11-17 14:00:45 +02:00
urho3d-travis-ci
fa4b96895a Travis CI: API documentation update at 2014-11-15 18:43:15 UTC. 
[ci package]
 2014-11-15 18:43:15 +00:00
Lasse Öörni
8b22c32f4c Copy the Input::SetMouseMode() documentation also on the Input documentation page. 2014-11-15 20:32:09 +02:00
Lasse Öörni
7a55b3b977 Merge remote-tracking branch 'hdunderscore/Input_MouseCursorRecall' 2014-11-15 18:57:03 +02:00
Lasse Öörni
c7b7d9fd9f Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-11-15 18:44:01 +02:00
Lasse Öörni
50eb143319 Fix consistency in touch hover touch ID. Fix returning touch IDs as available. When resetting touches, reset the touch ID mapping also. In UIDrag example, show the actual touch ID's instead of indices, to verify that the ID's stay consistent. Fix UIDrag Lua example erroneously modifying the TouchState's position. 2014-11-15 18:42:28 +02:00
Lasse Öörni
8225d68fdc Merge pull request #528 from OvermindDL1/gitignore_additions 
Added KDevelop and GCC PCH files to the .gitignore file.
 2014-11-15 17:52:24 +02:00
Lasse Öörni
0821dd482f Merge remote-tracking branch 'hdunderscore/UIDrag_Bugfix' 2014-11-15 17:22:06 +02:00
hdunderscore
55921e14fd - Updated documentation for Input mouse modes. 
- Change so that Input::GainFocus restores previous mouse mode.
- Fixed a bug where setting mouse mode in Input::LoseFocus was concealing the mouse visibility.
- Change so that SetMouseVisible tracks the intended visibility when MM_RELATIVE forces it off. This information is used to correctly set mouse visibility when changing mouse modes.
- Updated editor drag editing so that the cursor position is always at 0.
 2014-11-16 01:05:28 +11:00
OvermindDL1
009b0d5371 Added KDevelop and GCC PCH files to the .gitignore file. 2014-11-15 00:28:30 -07:00
hdunderscore
b49e0c2a5d Moved the SDL touch ID -> Urho touch ID logic from UI to Input, so that querying Input/TouchState should give you a touch index that will always be consistent (between TouchDown and TouchUp events) and start from 1. 2014-11-15 13:22:38 +11:00
Lasse Öörni
edf9f03366 Fix possibility of degenerate OcclusionBuffer triangle edges causing a floating point division by zero. Thanks to nemerle for noticing this. 2014-11-14 10:52:47 +02:00