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

9836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
5e780d9e8b Allow configurable minidump write location via ProcessUtils.h functions. Closes #1142. 2016-01-11 17:06:38 +02:00
Lasse Öörni
4a6d39beee Implement missing applying of basepath to package file entries. Closes #1147. 2016-01-11 16:23:21 +02:00
Yao Wei Tjong 姚伟忠
5a97c68a49 Fix a regression issue caused by external project target renaming. 
Close #1137.
 2016-01-09 19:25:44 +08:00
Lasse Öörni
eea117ef5d Better SharedPtr ownership examples. 2016-01-08 13:43:38 +02:00
Yao Wei Tjong 姚伟忠
68be709e44 Squashed 'Source/ThirdParty/LuaJIT/' content from commit d327520 
git-subtree-dir: Source/ThirdParty/LuaJIT
git-subtree-split: d3275205d21dd84758e05e58b297974e7c4cc656
 2016-01-08 18:14:37 +08:00
Yao Wei Tjong 姚伟忠
d01bdbf2df Merge commit '68be709e44b87216b5c41a626571d8a8f44938e9' as 'Source/ThirdParty/LuaJIT' 2016-01-08 18:14:37 +08:00
Yao Wei Tjong 姚伟忠
7d65d52455 Remove LuaJIT subdirectory. It will be added back as subtree. 2016-01-08 18:13:52 +08:00
Yao Wei Tjong 姚伟忠
df2e152a6c Fix 64-bit ABI detection on iOS platform again. 
Older Xcode/lipo tool may not recognize 64-bit ARM arch as 'arm64' yet, so use 'x86_64' as the grep keyword instead.
[skip appveyor] [ci only: OSX]
 2016-01-07 16:16:12 +08:00
Yao Wei Tjong 姚伟忠
d7fdd033c2 For Travis CI - rename the web samples json data file correctly. 
[ci skip]
 2016-01-07 09:33:56 +08:00
Yao Wei Tjong 姚伟忠
e9570d33b4 Enable color diagnostics for GCC 4.9.1+. 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
21b01fcd5b Refactor how the EXE and SHARED linker flags are being setup. 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
bc64b053a3 Bake URHO3D_LUAJIT as downstream project needs extra linker flags. 
Without these extra linker flags the executable would most likely get a runtime error, especially when targeting 64-bit OSX platform.
 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
3c7b37c972 For Travis CI & AppVeyor - simplify SDK installation process. 
The wait_for_block() was originally needed for iOS platform as it used to install very slowly (exceeds 10 minutes) due to configuration mistake. It should install just in a few minutes now.
 2016-01-06 16:38:58 +08:00
Yao Wei Tjong 姚伟忠
f2e7eec61a Fix compiler ABI detection for iOS platform. 2016-01-06 16:38:58 +08:00
Yao Wei Tjong 姚伟忠
730d1fc0af Ensure the 'generic' script/batch file propagates CMake exit code. 2016-01-06 16:38:58 +08:00
Yao Wei Tjong 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +08:00
Yao Wei Tjong 姚伟忠
7252327e70 Minor code formatting on Variant.h file. 
[ci skip]
 2016-01-06 08:44:16 +08:00
Lasse Öörni
87a5e4fcb3 Simplify RigidBody code. Allow kinematic rigid body to set its initial transform in OnMarkedDirty() so that e.g. loaded prefabs in the editor don't appear to have their body in the wrong place initially. 2016-01-05 22:37:05 +02:00
Lasse Öörni
bdadb1b116 Fix missing export specifier for the specializations of Variant::Get<T>(). Closes #1138. 2016-01-05 22:20:44 +02:00
Lasse Öörni
087772c539 If AnimatedModel is temporary, make the bone nodes it creates temporary too. Closes #1135. 2016-01-05 11:27:56 +02:00
Lasse Öörni
dce2345b8a Disable BT_USE_SSE_IN_API in OSX debug mode. Closes #1132. 2016-01-04 22:07:18 +02:00
Lasse Öörni
05cd6f4346 Before rigidbody has simulated at least once, allow also setting the interpolation transform. Possible fix for #1128. 2016-01-04 15:57:23 +02:00
urho3d-travis-ci
4a0e883d7d Travis CI: API documentation update at 2015-12-28 18:44:03 UTC. 
[ci package]

Commit: 7afc3cd9ce

Message: HasSubscribedToEvent() exposed to scripting. Closes #1122.
 2015-12-28 18:44:03 +00:00
Lasse Öörni
7afc3cd9ce HasSubscribedToEvent() exposed to scripting. Closes #1122. 2015-12-28 20:32:52 +02:00
Yao Wei Tjong 姚伟忠
891bde9325 Fix try_run() logic on WIN32 platform with both Release and Debug libs. 2015-12-28 17:01:35 +08:00
Yao Wei Tjong 姚伟忠
aca142e51d For Travis CI - fix out-of-space issue for iOS 64-bit packaging build. 
[ci package] [skip appveyor] [ci only: OSX]
 2015-12-27 16:20:00 +08:00
Yao Wei Tjong 姚伟忠
bf50a58a0a Fix clang-tools build. 
[skip appveyor] [ci only: Annotate]
 2015-12-27 15:51:28 +08:00
urho3d-travis-ci
e0d3b2339e Travis CI: API documentation update at 2015-12-26 21:42:23 UTC. 
[ci package]

Commit: 9fccfe5417

Message: Fix error when serializing DropDownList. Fix scroll snap epsilon attribute default value. Closes #1121.
 2015-12-26 21:42:23 +00:00
Lasse Öörni
9fccfe5417 Fix error when serializing DropDownList. Fix scroll snap epsilon attribute default value. Closes #1121. 2015-12-26 23:33:51 +02:00
Lasse Öörni
d2c47a14c4 Add hit fraction to PhysicsRaycastResult and set it for all physics cast tests. Similar to ConvexCast, set SphereCast result distance based on hit fraction. Closes #1120. 2015-12-26 22:03:53 +02:00
Yao Wei Tjong 姚伟忠
108705d0e2 Bake compiler defines used by the database subsystem. 
The auto-discovered variables are removed as build options from cmake-gui when it is invoked by Urho3D downstream projects.
Still, ensure the auto-discovered variables prevail over conflicting values potentially specified by user manually or via CLI.
 2015-12-26 19:38:17 +08:00
Lasse Öörni
afd95f09d3 Do not copy shader compiler DLL in OpenGL build. 2015-12-25 16:17:14 +02:00
Lasse Öörni
564647df8a Fix SDL compilation missing DX includes when using OpenGL and DirectX SDK. 2015-12-25 16:17:13 +02:00
Yao Wei Tjong 姚伟忠
1c640da5d4 Document all the possible output variables. 
[ci skip]
 2015-12-25 22:22:40 +08:00
Lasse Öörni
1f4793031c Fix forced one-sample shadowing when hardware compare not supported (instead should be forced four-sample shadowing) 2015-12-25 15:24:54 +02:00
Yao Wei Tjong 姚伟忠
60b3d8af40 Fix GetCompilerDefines() for possibility of returning empty string. 
[skip appveyor] [ci only: master, Emscripten]
 2015-12-25 18:48:06 +08:00
Yao Wei Tjong 姚伟忠
5af983234f Check the compiler defines at the time when the lib is built instead. 2015-12-25 17:55:17 +08:00
Yao Wei Tjong 姚伟忠
68e2813298 Attempt to use try_run logic to auto-discover build options. 
For AppVeyor - let URHO3D_D3D11 be auto-discovered when scaffolding.
Close #1066.
 2015-12-25 10:37:56 +08:00
Lasse Öörni
b218aececc Sync AssetImporter documentation with the program's actual command line options. Simplify D3D9 uninitialization code with SAFE_RELEASE. Minor code convention edit. 2015-12-24 13:16:17 +02:00
Lasse Öörni
65c6529f7f Merge pull request #1116 from yushli/master 
add save as JSON option
 2015-12-24 12:46:56 +02:00
yushli
86825b2ee8 add save as JSON option 2015-12-24 11:36:25 +08:00
urho3d-travis-ci
f4edf3fc15 Travis CI: API documentation update at 2015-12-23 14:52:21 UTC. 
[ci package]

Commit: a3ba4d8ff6

Message: Check HRESULT and log error with it included in case of failure in D3D9/D3D11 code. Clean up releasing GPU objects. Clean up Texture3D to not have a RenderSurface, since it can't be rendered to. Fixed missing Lua Texture3D binding. Fixed binding of Texture3D SetSize() in AngelScript. Added checks to Texture2D/3D SetSize() that zero or negative size is not specified. Closes #1092.
 2015-12-23 14:52:21 +00:00
Lasse Öörni
a3ba4d8ff6 Check HRESULT and log error with it included in case of failure in D3D9/D3D11 code. Clean up releasing GPU objects. Clean up Texture3D to not have a RenderSurface, since it can't be rendered to. Fixed missing Lua Texture3D binding. Fixed binding of Texture3D SetSize() in AngelScript. Added checks to Texture2D/3D SetSize() that zero or negative size is not specified. Closes #1092. 2015-12-23 16:43:43 +02:00
Lasse Öörni
04f46f9abc Fix bug in String::DecodeUTF16. Thanks graveman! 2015-12-23 11:41:02 +02:00
Lasse Öörni
48ab1f3bda Squashed commit of the following: 
commit b21e10951ff9535e80f2b222336c5f88e11e63af
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Tue Dec 22 22:00:14 2015 -0600

    Added Context parameter in JSONValue::SetVariantVector to fix
    ResourceRef bug

commit 297f8bcde3e24ad67e5fce56b7d0bab6fb616432
Merge: 5a150b2 2802146
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Tue Dec 22 21:35:50 2015 -0600

    Merge branch 'JSONValueFix' of https://github.com/hjmediastudios/Urho3D into JSONValueFix

commit 5a150b298e860c81fa17e9f0c6906b493477f97b
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Tue Dec 22 21:35:23 2015 -0600

    Fixed bug caused by attempting to set a JSONValue to a VariantVector;
    previous behavior attempted to assign values to indices beyond the size
    of the JSONValue's array storage.

commit 2802146005849314d8d3662468ec324ae8b321b3
Merge: 65c8125 e1647d1
Author: NickRoyer <hjmediastudios@gmail.com>
Date:   Tue Dec 22 21:29:06 2015 -0600

    Merge pull request #2 from urho3d/master

    Make Urho3D_universal custom target as one of the default target.
 2015-12-23 11:23:02 +02:00
Yao Wei Tjong 姚伟忠
668d89eca5 For Travis CI - skip appveyor when test building clang-tool branch. 
[ci skip]
 2015-12-23 17:17:50 +08:00
Lasse Öörni
b2958df94b Merge pull request #1114 from 1vanK/master 
Editor: fix sharp edges, when UI opacity == 1.0
 2015-12-23 11:00:17 +02:00
Ivan K
645f4b7685 Remove OldUI 2015-12-23 07:55:30 +04:00
Ivan K
368d880c2b Editor: fix sharp edges, when UI opacity < 1.0 2015-12-23 07:50:30 +04:00
NickRoyer
db801b264a Merge pull request #1 from urho3d/master 
Make Urho3D_universal custom target as one of the default target.
 2015-12-22 21:26:10 -06:00