Commit Graph

9869 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
90b53f859a For CI - fix build artifact upload.
[ci package]
2016-01-27 01:32:11 +08:00
Lasse Öörni
fab515ec7c Added contributor credit. 2016-01-26 17:30:22 +02:00
Lasse Öörni
e92a5c1c5f Merge remote-tracking branch 'TheComet93/c89_sdl_msvc2012_fix' 2016-01-26 17:01:30 +02:00
urho3d-travis-ci
1c72d5b10f Travis CI: API documentation update at 2016-01-26 14:15:06 UTC.
[ci package]

Commit: c4f6f315ff

Message: Travis CI: bump copyright to 2016.
[ccache clear]
2016-01-26 14:15:06 +00:00
urho3d-travis-ci
c4f6f315ff Travis CI: bump copyright to 2016.
[ccache clear]
2016-01-26 13:55:03 +00:00
Yao Wei Tjong 姚伟忠
0e8b3cee3f For CI - automatically bump copyright when crossing a new year. 2016-01-26 21:46:59 +08:00
TheComet
180fff7011 Using whitespace instead of tabs 2016-01-26 00:15:35 +01:00
TheComet
717f0d518c Fixes code that is not compliant with the C89 standard when compiling with MSVC 2016-01-26 00:08:31 +01:00
Lasse Öörni
45dfe368a5 Allow to call AnimatedModel::UpdateBoneBoundingBox() manually. Closes #1168. 2016-01-25 18:37:17 +02:00
Lasse Öörni
a2323a63a8 Fix missing return values in D3D9 Graphics::ResolveToTexture(). 2016-01-25 18:02:10 +02:00
Lasse Öörni
6bd8229819 Tabs to spaces. Fix copy-paste error in comment. 2016-01-25 17:23:11 +02:00
Yao Wei Tjong 姚伟忠
aaf86f4bc1 For Travis CI - ensure commits arrive in the correct sequence. Take 2. 2016-01-25 19:47:07 +08:00
Yao Wei Tjong 姚伟忠
a3b575dd4e Update nanodbc version number in documentation. 2016-01-25 16:32:23 +08:00
Yao Wei Tjong 姚伟忠
2d9502496b Adapt the ODBC_LIBRARIES for Windows platform based on nanodbc. 2016-01-25 16:13:02 +08:00
SuperWangKai
f2a93f7b17 Merge pull request #2 from urho3d/master
sync with urho3d
2016-01-25 16:10:12 +08:00
Yao Wei Tjong 姚伟忠
3d5994381d Squashed 'Source/ThirdParty/nanodbc/' content from commit 2a32409
git-subtree-dir: Source/ThirdParty/nanodbc
git-subtree-split: 2a3240976f05cd8ade1010716d54a89013ec01db
2016-01-25 15:59:30 +08:00
Yao Wei Tjong 姚伟忠
41b87b3690 Merge commit '3d5994381df631739187c89bd0c2752900ae6c2a' as 'Source/ThirdParty/nanodbc' 2016-01-25 15:59:30 +08:00
Yao Wei Tjong 姚伟忠
c1ae46ec41 Replace Source/ThirdParty/nanodbc subdirectory with subtree. 2016-01-25 15:59:26 +08:00
Yao Wei Tjong 姚伟忠
ff0f2b4d61 Add rake tasks for Urho3D maintainers. 2016-01-25 15:58:29 +08:00
Yao Wei Tjong 姚伟忠
a68c36b7e5 Merge commit 'bcd587a1bef9d8ed0e37d38b0b00b4faf43cea6c' into master. 2016-01-24 13:25:41 +08:00
Yao Wei Tjong 姚伟忠
bcd587a1be Squashed 'Source/ThirdParty/LuaJIT/' changes from 45d0951..4820004
4820004 Enable LuaJIT universal binary build on iOS platform.
f9443a6 Enable LuaJIT universal binary build on OSX platform. Enable universal binary executables by default when targeting 64-bit OSX platform.
887bb47 Fix LuaJIT build for VS build to suppress unknown option warnings. [ci only: AppVeyor]
2d66752 Upgrade to LuaJIT v2.1 (unstable) branch.
2596f98 Fix a regression issue caused by external project target renaming. Close #1137.
78d396c Refactor how the EXE and SHARED linker flags are being setup.
3c64138 For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning.
d0c63d1 Attempt to use try_run logic to auto-discover build options. For AppVeyor - let URHO3D_D3D11 be auto-discovered when scaffolding. Close #1066.
25620c8 Verify found Urho3D library has matching ABI with the chosen compiler. Check the CMake minimum version before setting project name as recommended by CMake. Minor documentation update on how to setup downstream projects using Urho3D library as external library. For AppVeyor - attempt to add scaffolding test using Urho3D SDK.
bcd55a6 Fix host-tool building. [skip appveyor]
73fb665 Fix LuaJIT SSE2 detection on 32-bit MSVC build.
aa2ec7a Fix LuaJIT SSE2 detection on 32-bit MinGW build.
afd69f1 Fix Android and Rasperry-Pi cross-compiling build due to LuaJIT change. [ci only: Android, RPI]
8f810f0 Fix a typo which had caused wrong LuaJIT OS to be detected.
23a03c3 Fix URHO3D_PACKAGING build option on Windows platform with SHARED lib. [ci scan]
4d5937f Install tools to the 'bin/tool' directory. Related to commit 6b6447eb8c.
873d6fa Fix MinGW build when PackageTool is built for both host and target.
a6a543b Add flag to consider 'unresolved symbol' as an error.
bde321f Enable external project macro users to find and use PackageTool. Adjust software packaging for Emscripten.
ba12d66 Bump copyright to 2015.
ad8ce54 Refactor all the codes and scripts to use the renamed 'bin' subdir.
ceacf6f Update the comment on the build rule. [ci skip] Related to commit 8682ba781a
fdf17db Install header files for Lua/LuaJIT and tolua++ 3rd party libraries. Fixes #610.
32bfb47 Code clean up. [ci skip]
8ca851c Clean up to remove unused CMake variables. LIBS is now defunct. No more dual purpose usage. INCLUDE_DIRS_ONLY is renamed to INCLUDE_DIRS. LINK_LIBS_ONLY is renamed to LIBS.
ccfa2ba Remove existing include path abstraction. Remove engine's sub-CMakeLists.txt.
fdb19da Clean up the LuaJIT build script - use normal replace in escaping vars.
9b28722 Refactor LuaJIT build scripts - no more generated CMakeLists.txt.
9672031 Fine tune LuaJIT target arch detection logic.
01549c8 Fix 32-bit LuaJIT build for Linux&OSX. Fix host tool building for iOS.
c51f9c7 Lua/LuaJIT host tool building while cross-compiling in one go. For Travis CI - reenable CI build with Lua/LuaJIT build option turned on.
9fd3dcc Rename everything 'RASPI' to 'RPI'. [ci rebase]
9334e39 Make repo root is also CMake source tree for the Urho3D project. Build tree location is now fully user defined. The build tree location could also be the same as source tree, although it is not recommended.
4052fe2 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.
dfc3282 Name Android buildvm tool for LuaJIT library differently based on ABI.
6c0f191 Clean up build scripts to avoid code duplication.
df69cc0 Be explicit in setting the file permissions when installing. Closes #352.
5bc3aa1 Refactor build scripts to group Urho3D specific build option. Initial support of project configuration and generation via cmake-gui.
753400c Fix LuaJIT search path which was broken after v2.0.3 update.
ccfbf07 Updated to LuaJIT 2.0.3. Closes #266.
4d184e1 Add lua_getmainthread function to return main thread.
3c69397 Add new 'package' CMake built-in target for generating binary packages. This is in preparation for setting up Travis CI build to upload binary packages to a central hosting server.
be5fccf Better integration of MinGW cross-compiling build process.
ead5f4b Use CMake path instead of native path. Closes #188.
d9460ab Minor tweak to link lua/luajit tool without Urho3D dependency libs.
3ddb177 Fix Android build. Closes #181.
2f25ee0 Fix LuaJIT build script to add dependency files for luajit executable.
bbeab50 Bump the copyright for 2014.
7bce3f9 Clean up build scripts to adhere to format convention.
cc8322e Fix Mac OS X and iOS build from external CMake project.
484b385 Refactor build scripts.
eb33fc9 Fix documentation build on platforms that do not have tool targets.
ffae4f1 Build Lua and LuaJIT standalone interpreter and bytecode compiler.
040c7f9 Added license notice.
3082f12 Replaced the logic to use VARIANT variable instead.
a9fcb3b Filter target architecture information if the tool is available.
004622c Fixed LuaJIT native build on Raspberry Pi.
edf1f16 Fixed LuaJIT native build on Raspberry Pi.
1110de4 Support LuaJIT amalgamated build.
c98dc8e Rephrased instructions to overcome CMake error for LuaJIT cross-compilation build.
e360c86 Fixed 32-bit LuaJIT compilation on Linux platform.
857fb13 Workaround for VS2008 64-bit mode.
401dc11 Fixed LuaJIT CMake error on Windows platform.
381bb44 Fixed LuaJIT build on Linux, both native and cross-compiling.
57c1902 Fix minilua link error on Linux.
ec1d39d Fix LuaJIT CMakeLists.txt.
0c3d038 Set generated file to CMAKE_CURRENT_BINARY_DIR/generated folder.
2f6b296 Add proper DynASM dependency.
89982b7 FFI: Parse #line NN and #NN.
39eddd3 Always merge snapshots without instructions inbetween.
04d2806 Rollback due to HREFK + load fwd must restore guardemit state.
REVERT: 45d0951 Fix a regression issue caused by external project target renaming. Close #1137.
REVERT: 6a7e4ea Refactor how the EXE and SHARED linker flags are being setup.
REVERT: 9f5b7a0 For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning.
REVERT: 704065a Attempt to use try_run logic to auto-discover build options. For AppVeyor - let URHO3D_D3D11 be auto-discovered when scaffolding. Close #1066.
REVERT: 5a66f32 Verify found Urho3D library has matching ABI with the chosen compiler. Check the CMake minimum version before setting project name as recommended by CMake. Minor documentation update on how to setup downstream projects using Urho3D library as external library. For AppVeyor - attempt to add scaffolding test using Urho3D SDK.
REVERT: 462b81a Fix host-tool building. [skip appveyor]
REVERT: 0e825d9 Fix LuaJIT SSE2 detection on 32-bit MSVC build.
REVERT: b1389e2 Fix LuaJIT SSE2 detection on 32-bit MinGW build.
REVERT: e05baa2 Fix Android and Rasperry-Pi cross-compiling build due to LuaJIT change. [ci only: Android, RPI]
REVERT: b34d064 Fix a typo which had caused wrong LuaJIT OS to be detected.
REVERT: 2d0fd0b Fix URHO3D_PACKAGING build option on Windows platform with SHARED lib. [ci scan]
REVERT: 305b9a6 Install tools to the 'bin/tool' directory. Related to commit 6b6447eb8c.
REVERT: c134de9 Fix MinGW build when PackageTool is built for both host and target.
REVERT: ee5880f Add flag to consider 'unresolved symbol' as an error.
REVERT: ece6389 Enable external project macro users to find and use PackageTool. Adjust software packaging for Emscripten.
REVERT: f4b5fb9 Bump copyright to 2015.
REVERT: 92ecd84 Refactor all the codes and scripts to use the renamed 'bin' subdir.
REVERT: 83ab1fe Update the comment on the build rule. [ci skip] Related to commit 8682ba781a
REVERT: 8e985da Install header files for Lua/LuaJIT and tolua++ 3rd party libraries. Fixes #610.
REVERT: d9eb1e7 Code clean up. [ci skip]
REVERT: 3c2b5c3 Clean up to remove unused CMake variables. LIBS is now defunct. No more dual purpose usage. INCLUDE_DIRS_ONLY is renamed to INCLUDE_DIRS. LINK_LIBS_ONLY is renamed to LIBS.
REVERT: c536ce0 Remove existing include path abstraction. Remove engine's sub-CMakeLists.txt.
REVERT: 4bf9dff Clean up the LuaJIT build script - use normal replace in escaping vars.
REVERT: 67a5735 Refactor LuaJIT build scripts - no more generated CMakeLists.txt.
REVERT: be7c2a4 Fine tune LuaJIT target arch detection logic.
REVERT: eaa5e38 Fix 32-bit LuaJIT build for Linux&OSX. Fix host tool building for iOS.
REVERT: 0c32eb6 Lua/LuaJIT host tool building while cross-compiling in one go. For Travis CI - reenable CI build with Lua/LuaJIT build option turned on.
REVERT: b7e0498 Rename everything 'RASPI' to 'RPI'. [ci rebase]
REVERT: b30b57ed Make repo root is also CMake source tree for the Urho3D project. Build tree location is now fully user defined. The build tree location could also be the same as source tree, although it is not recommended.
REVERT: d165e58 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.
REVERT: c1eead6 Name Android buildvm tool for LuaJIT library differently based on ABI.
REVERT: e8d2889 Clean up build scripts to avoid code duplication.
REVERT: d62efe6 Be explicit in setting the file permissions when installing. Closes #352.
REVERT: 274d6b8 Refactor build scripts to group Urho3D specific build option. Initial support of project configuration and generation via cmake-gui.
REVERT: c371b6e Fix LuaJIT search path which was broken after v2.0.3 update.
REVERT: d4599ca Updated to LuaJIT 2.0.3. Closes #266.
REVERT: debef29 Add lua_getmainthread function to return main thread.
REVERT: 5659529 Add new 'package' CMake built-in target for generating binary packages. This is in preparation for setting up Travis CI build to upload binary packages to a central hosting server.
REVERT: e6d501d Better integration of MinGW cross-compiling build process.
REVERT: 60bed40 Use CMake path instead of native path. Closes #188.
REVERT: 7af2fd6 Minor tweak to link lua/luajit tool without Urho3D dependency libs.
REVERT: 2beb419 Fix Android build. Closes #181.
REVERT: 80461f5 Fix LuaJIT build script to add dependency files for luajit executable.
REVERT: 0bcfec2 Bump the copyright for 2014.
REVERT: 611eae9 Clean up build scripts to adhere to format convention.
REVERT: e98041b Fix Mac OS X and iOS build from external CMake project.
REVERT: 6d04c01 Refactor build scripts.
REVERT: 3bb116b Fix documentation build on platforms that do not have tool targets.
REVERT: 0bb2538 Build Lua and LuaJIT standalone interpreter and bytecode compiler.
REVERT: 44a0c0c Added license notice.
REVERT: 61f515f Replaced the logic to use VARIANT variable instead.
REVERT: 4fdcd97 Filter target architecture information if the tool is available.
REVERT: ecf8d56 Fixed LuaJIT native build on Raspberry Pi.
REVERT: 2609216 Fixed LuaJIT native build on Raspberry Pi.
REVERT: d0be3c4 Support LuaJIT amalgamated build.
REVERT: bcba83a Rephrased instructions to overcome CMake error for LuaJIT cross-compilation build.
REVERT: e1683db Fixed 32-bit LuaJIT compilation on Linux platform.
REVERT: 09552cc Workaround for VS2008 64-bit mode.
REVERT: 2ea953b Fixed LuaJIT CMake error on Windows platform.
REVERT: c094689 Fixed LuaJIT build on Linux, both native and cross-compiling.
REVERT: 5950944 Fix minilua link error on Linux.
REVERT: 20fb5a1 Fix LuaJIT CMakeLists.txt.
REVERT: bd83581 Set generated file to CMAKE_CURRENT_BINARY_DIR/generated folder.

git-subtree-dir: Source/ThirdParty/LuaJIT
git-subtree-split: 48200047b947746cc7de0094ab07a6b505a56c56
2016-01-24 13:25:40 +08:00
Yao Wei Tjong 姚伟忠
831da98b49 For Travis CI - ensure the commits arrive in the correct sequence. 2016-01-24 11:53:18 +08:00
Yao Wei Tjong 姚伟忠
45af671009 For Travis CI - increase the chance of successful iOS packaging build. 2016-01-24 00:51:23 +08:00
Yao Wei Tjong 姚伟忠
705e06dd1c Remove an unprintable \015 character in the cmake_codelite.sh.
The character had caused the script not operable.

For Travis CI and AppVeyor - bug fixes and improvement to make the CI builds more stable, hopefully.
2016-01-23 23:39:06 +08:00
urho3d-travis-ci
a5373fe83b Travis CI: API documentation update at 2016-01-22 17:55:28 UTC.
[ci package]

Commit: bd21208a5f

Message: Added contributor credit.
2016-01-22 17:55:28 +00:00
Lasse Öörni
bd21208a5f Added contributor credit. 2016-01-22 17:51:32 +02:00
Lasse Öörni
a3411274f3 Node tag editing. 2016-01-22 17:51:32 +02:00
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