Commit Graph

10192 Commits

Author SHA1 Message Date
Lasse Öörni
474276fc17 Code convention & minor logic edits. Unify tag API between UIElement & Node. Use ; as the default tag separator to match the editor. Do not allow adding empty tags. 2016-01-22 17:51:31 +02:00
svifylabs
4297cdedd2 Added Simple String Multitag System
removed old implementation, no optimisation, scene caches tagged nodes
2016-01-22 17:51:31 +02:00
svifylabs
9bb980b8a1 Revert "multitag test"
This reverts commit 754210898c524c4d4275ef0ae1ccb0471f6c606c.
2016-01-22 17:51:30 +02:00
svifylabs
fd8b760330 multitag test 2016-01-22 17:51:30 +02:00
svifylabs
997906d55e added tag as a string for easy editing 2016-01-22 17:51:30 +02:00
svifylabs
41f5ff1a51 added node tags 2016-01-22 17:51:29 +02:00
urho3d-travis-ci
5e0701ad42 Travis CI: API documentation update at 2016-01-22 13:48:39 UTC.
[ci package]

Commit: a9e62241a7

Message: Unify fixed update source handling in ScriptInstance, LuaScriptInstance & LogicComponent. It can now be either PhysicsWorld or PhysicsWorld2D. Remove auto-creation of PhysicsWorld from ScriptInstance, as LogicComponent or LuaScriptInstance don't do that either, and the ScriptInstance can not known whether PhysicsWorld or PhysicsWorld2D should be created.
2016-01-22 13:48:39 +00:00
Lasse Öörni
a9e62241a7 Unify fixed update source handling in ScriptInstance, LuaScriptInstance & LogicComponent. It can now be either PhysicsWorld or PhysicsWorld2D. Remove auto-creation of PhysicsWorld from ScriptInstance, as LogicComponent or LuaScriptInstance don't do that either, and the ScriptInstance can not known whether PhysicsWorld or PhysicsWorld2D should be created. 2016-01-22 14:59:08 +02:00
Lasse Öörni
2eca6bf91f Use the OUTPOSITION convention in HLSL skydome shader. 2016-01-22 13:56:30 +02:00
Lasse Öörni
934de0f75d Merge remote-tracking branch 'rasteron/master' 2016-01-22 13:55:12 +02:00
Lasse Öörni
99c731db19 Merge remote-tracking branch 'ucupumar/particle-direction-fix' 2016-01-22 13:41:23 +02:00
Lasse Öörni
5ff88b8e3a Merge pull request #1162 from 1vanK/master
Add comments about tags to samples
2016-01-22 13:35:29 +02:00
Lasse Öörni
0a1497f856 Added Codelite CMake shell script files contributed by thebluefish. Closes #1158. 2016-01-22 13:34:31 +02:00
Yao Wei Tjong 姚伟忠
90c97b95c4 Fix try_run logic in FindUrho3D module to support MSVC static runtime.
Close #1140.
2016-01-22 19:13:51 +08:00
Yao Wei Tjong 姚伟忠
91eb9861dc For Travis CI - install 32-bit readline software package. 2016-01-22 13:46:26 +08:00
Yao Wei Tjong 姚伟忠
d267c5ee3c Fix build system to find 32-bit readline package correctly on Debian. 2016-01-22 13:41:29 +08:00
Yao Wei Tjong 姚伟忠
1066c52fb6 Fix build system to find 32-bit packages correctly on Linux. 2016-01-22 12:01:23 +08:00
Ivan K
3774bef4f7 Add comments about tags to samples 2016-01-22 02:38:37 +04:00
urho3d-travis-ci
cc6f1a3d81 Travis CI: API documentation update at 2016-01-21 19:58:41 UTC.
[ci package]

Commit: ff42717419

Message: Rename IsTagged -> HasTag. Pass tag scripts in Lua by value to match the other API bindings.
2016-01-21 19:58:41 +00:00
Lasse Öörni
ff42717419 Rename IsTagged -> HasTag. Pass tag scripts in Lua by value to match the other API bindings. 2016-01-21 21:42:18 +02:00
Ivan K
68668266d2 Add tags to UIElement 2016-01-21 21:42:17 +02:00
Yao Wei Tjong 姚伟忠
105aa2699e Use Readline library when it is found for Lua and isql. 2016-01-22 02:05:30 +08:00
Lasse Öörni
cd2c720352 Fix uniform type in D3D11 constant buffer. 2016-01-21 19:00:35 +02:00
Lasse Öörni
ca3f3ced4f Prefer to use camera's EffectiveWorldTransform for view inverse to avoid double inversing. 2016-01-21 18:44:02 +02:00
Lasse Öörni
1e8335d5a4 Merge remote-tracking branch 'hjmediastudios/AddViewMatrix' 2016-01-21 18:38:36 +02:00
Yao Wei Tjong 姚伟忠
295c4c6a05 For Travis CI - new commit msg pattern to trigger 64-bit only build. 2016-01-22 00:15:45 +08:00
Yusuf Umar
aa16b5003a Fixing some Coverity scan bug. 2016-01-21 22:49:08 +07:00
Yao Wei Tjong 姚伟忠
cff5fe2d3d For Travis CI - enable URHO3D_LUAJIT build option on iOS CI builds.
Upgrade to CMake 3.4.1 for OSX CI build jobs.
Close #1146
2016-01-21 19:28:02 +08:00
rasteron
6789580e18 Added Skydome Shaders and Technique 2016-01-21 16:52:25 +08:00
Yao Wei Tjong 姚伟忠
17734a1b77 Enable LuaJIT universal binary build on iOS platform. 2016-01-21 10:56:58 +08:00
Yao Wei Tjong 姚伟忠
44e7322e4e Enable LuaJIT universal binary build on OSX platform.
Enable universal binary executables by default when targeting 64-bit OSX platform.
2016-01-21 10:56:58 +08:00
Yao Wei Tjong 姚伟忠
50f64a88a1 Minor formatting correction. 2016-01-21 10:55:44 +08:00
Yao Wei Tjong 姚伟忠
da3a82979b Bake URHO3D_TESTING to ensure downstreams get consistent struct size. 2016-01-21 00:01:28 +08:00
Lasse Öörni
f721aea1d3 On D3D11, force dynamic textures to use 1 mip level, as more is not supported. Closes #1153. 2016-01-19 22:43:07 +02:00
Nick Royer
150ddf86ca Added uniforms to shader 2016-01-18 14:34:05 -06:00
Nick Royer
360328d2d1 Added inverse view matrix 2016-01-18 14:30:54 -06:00
SuperWangKai
321a92a794 Merge pull request #1 from urho3d/master
merge with urho3d
2016-01-18 10:35:43 +08:00
Yao Wei Tjong 姚伟忠
0906da48ba Fix LuaJIT build for VS build to suppress unknown option warnings.
[ci only: AppVeyor]
2016-01-15 21:02:56 +08:00
Yao Wei Tjong 姚伟忠
bdcf7b242c For AppVeyor - attempt to auto RDP so that make test can be run.
Also fix the package upload problem for AppVeyor CI jobs.
2016-01-15 20:29:59 +08:00
Lasse Öörni
c46f414034 Reset SDL's internal in_title_click variable whenever a normal mouse up/down event is received. Fixes #1151. 2016-01-14 22:52:20 +02:00
urho3d-travis-ci
c3f336829e Travis CI: API documentation update at 2016-01-14 19:58:13 UTC.
[ci package]

Commit: 25ed4020a0

Message: Match the enum order in EmitterType edit field.
2016-01-14 19:58:13 +00:00
Lasse Öörni
25ed4020a0 Match the enum order in EmitterType edit field. 2016-01-14 21:14:43 +02:00
Lasse Öörni
e18f801103 Use GetStringListIndex() also for the emitter type. 2016-01-14 21:07:53 +02:00
Lasse Öörni
79f32fad0a Shorter name for the directional mode in XML serialization. Eliminate duplicate code from ParticleEffect. Eliminate manual string compare in favor of GetStringListIndex(). 2016-01-14 21:04:55 +02:00
Lasse Öörni
f5cee983f1 Code convention minor edits. Expose the new enum value to Lua. 2016-01-14 20:43:20 +02:00
Lasse Öörni
925b69ef4c Merge remote-tracking branch 'ucupumar/particle-editor' 2016-01-14 20:11:22 +02:00
Yao Wei Tjong 姚伟忠
7051e07110 For Travis CI - enable LuaJIT for Android 64-bit (arm64-v8a).
[ci skip]
2016-01-13 22:17:17 +08:00
Lasse Öörni
c04aadec58 Apply component ID save fix from vivienneanthony. Also verify that JSON save works similarly. Closes #1150. 2016-01-13 11:42:26 +02:00
Yao Wei Tjong 姚伟忠
f140bae2e3 For Travis CI - revert back to disable LuaJIT on ARM64 for the moment.
[skip appveyor] [ci only: Android]
2016-01-13 10:20:02 +08:00
Yao Wei Tjong 姚伟忠
71a3679d3c Update the documentation for LuaJIT 2.1 upgrade.
For Travis CI - attempt to enable LuaJIT for Android 64-bit (arm64-v8a).
[skip appveyor] [ci only: Android]
2016-01-13 01:35:36 +08:00