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
Yao Wei Tjong 姚伟忠
e1647d18dd Make Urho3D_universal custom target as one of the default target. 
Close #1111.
 2015-12-23 10:44:27 +08:00
urho3d-travis-ci
65c8125609 Travis CI: API documentation update at 2015-12-22 17:19:49 UTC. 
[ci package]

Commit: 6d2853d81d

Message: Add 32-bit integer object index attribute for custom instancing schemes. May not work on GLES2 as it's using attribute index 13. Not supported on D3D9. Closes #1108.
 2015-12-22 17:19:49 +00:00
Lasse Öörni
6d2853d81d Add 32-bit integer object index attribute for custom instancing schemes. May not work on GLES2 as it's using attribute index 13. Not supported on D3D9. Closes #1108. 2015-12-22 18:55:40 +02:00
Yao Wei Tjong 姚伟忠
df1a6d358f Prevent deploying the *.pak files to HTML5 samples directory. 
Close #1110.
[ci skip]
 2015-12-22 22:43:45 +08:00
Yao Wei Tjong 姚伟忠
a2122c3063 For downstream - fix try_compile logic on iOS build. 
[skip appveyor] [ci only: OSX]
 2015-12-22 22:15:14 +08:00
Yao Wei Tjong 姚伟忠
3732d7f341 For Travis CI - attempt to fix iOS 64-bit packaging build. 
Fix #1079.
 2015-12-22 21:35:03 +08:00
Yao Wei Tjong 姚伟忠
e616662d69 Remove code duplication and minor code formatting. 2015-12-22 21:00:46 +08:00
Lasse Öörni
b593380632 When attaching a UIElement as child, apply potentially changed style recursively. Remove default size from Button's style (generally style shouldn't change element size.) Closes #1103. 2015-12-21 15:34:30 +02:00
Lasse Öörni
0dafa13b0c Ensure CustomGeometry world bounding box gets updated on Commit(). 2015-12-21 13:55:24 +02:00
Lasse Öörni
653a0fceb1 Merge remote-tracking branch 'juj/emscripten_cpu_cores' 2015-12-21 12:35:56 +02:00
Lasse Öörni
090b6a1135 Removed dead link. 2015-12-21 12:35:29 +02:00
Yao Wei Tjong 姚伟忠
a3f24a38cb For downstream - fix try_compile logic on Android build. 
[skip appveyor] [ci only: Android, Emscripten]
 2015-12-20 23:23:59 +08:00
Yao Wei Tjong 姚伟忠
a66ad9b384 Cache the GCC c++11 standard test result. Remove redundant linker flag. 2015-12-20 13:00:22 +08:00
Jukka Jylänki
f7d5684001 Implement GetNumPhysicalCPUs() and GetNumLogicalCPUs() on Emscripten, which calls to emscripten_num_logical_cores() (navigator.hardwareConcurrency API in JS when available, or a guessed "4 cores" when not) 2015-12-19 20:22:24 +02:00
Yao Wei Tjong 姚伟忠
ed28d2b24f Attempt to fix Android build with PCH enabled targeting API >= 16. 
Fix #1100.
[skip appveyor] [ci only: Android, OSX, Emscripten]
 2015-12-19 17:37:07 +08:00
urho3d-travis-ci
d9c412f7e8 Travis CI: API documentation update at 2015-12-18 12:57:29 UTC. 
[ci package]

Commit: 6a3bbb8aab

Message: Fix D3D11 constant buffers for VSM. Fix editor shadow mode selection. Fix script API for new shadow modes. Fix debughud for new shadow modes. Edit documentation to refer to new shadow modes. Added contributor credit. Some code convention edits, e.g. VSM instead of Vsm. Dump new NinjaSnowWarShaders.xml file.
 2015-12-18 12:57:29 +00:00
Lasse Öörni
6a3bbb8aab Fix D3D11 constant buffers for VSM. Fix editor shadow mode selection. Fix script API for new shadow modes. Fix debughud for new shadow modes. Edit documentation to refer to new shadow modes. Added contributor credit. Some code convention edits, e.g. VSM instead of Vsm. Dump new NinjaSnowWarShaders.xml file. 2015-12-18 14:22:24 +02:00
Lasse Öörni
41db8dbe69 Removed test model. 2015-12-18 12:35:09 +02:00
Lasse Öörni
1103fe2f3e Merge remote-tracking branch 'darwikey/master' 2015-12-18 12:34:42 +02:00
Lasse Öörni
415b15b421 Buffer variant serialization in Material. 2015-12-18 12:10:17 +02:00
Lasse Öörni
21f896fa49 Add possibility to set buffer type Variants as a shader parameter (will be interpreted as an array of floats.) 2015-12-18 11:41:47 +02:00
Yao Wei Tjong 姚伟忠
ff1278051f Fix the problem of enabling C++11 standard for MinGW on Windows host. 2015-12-18 15:12:12 +08:00
Xavier Maupeu
dbcfc9721e merge VSM shadow 2015-12-17 23:04:48 +01:00
Xavier Maupeu
cf501d9585 add functions in Renderer to set shadow softness and VSM shadow parameters 2015-12-17 19:16:52 +01:00
Yao Wei Tjong 姚伟忠
ad170b5893 For downstream - show try_compile output in case of compilation error. 
[ci skip]
 2015-12-18 00:00:51 +08:00
Yao Wei Tjong 姚伟忠
6e50708301 Modify the try_compile syntax to the one that CMake 2.8.7 supports. 
Temporarily still exclude iOS and Android.
 2015-12-17 22:27:03 +08:00
Xavier Maupeu
4dffd9d9ca minor stylistic modifications 2015-12-17 12:22:06 +01:00
Xavier Maupeu
583542bb19 SHADOWCMP must only be define when direct3d is used and Graphics::GetHardwareShadowSupport() returns false 2015-12-17 12:06:34 +01:00
Xavier Maupeu
b1beaf4ad1 VSM works with point light and spot light in openGL 2015-12-16 23:58:13 +01:00
Xavier Maupeu
33a278449b VSM works with point light and spot light in direct3d9 2015-12-16 22:53:18 +01:00
Lasse Öörni
01857f5149 If sprite texture has the default wrap address mode, set to clamp. It's also possible to configure the texture to border address mode (via the XML parameters file), but that requires choosing a good border color. Closes #1096. 2015-12-16 19:31:35 +02:00
Yao Wei Tjong 姚伟忠
df18e41ee6 Fix try_compile execution for MinGW STATIC build and 32-bit build. 
[ccache clear]
 2015-12-16 23:37:57 +08:00
Yao Wei Tjong 姚伟忠
f471dd66dd Refactor installation structure for Windows platform. 
Attempt to reenable the try_compile logic to verify if the found Urho3D
library is ABI-compatible with the chosen compiler toolchain.
 2015-12-16 22:21:24 +08:00
Yao Wei Tjong 姚伟忠
b3628625c9 For Travis CI - attempt to upgrade to CMake 3.2.3 across the board. 
[skip appveyor]
 2015-12-16 13:28:32 +08:00
Lasse Öörni
95f3cecc30 Add the NOUV mechanism for Depth & Shadow HLSL shaders. Document the significance of providing all vertex attributes expected by shader on D3D11. Tabs to spaces in Reference.dox. 2015-12-15 11:01:10 +02:00
Lasse Öörni
0fa75740a6 Remove contributor from contributor list by request. 2015-12-15 10:54:10 +02:00
Yao Wei Tjong 姚伟忠
4014a8c074 Temporarily disable try_compile as it does not work on older CMake. 2015-12-15 00:38:04 +08:00
Yao Wei Tjong 姚伟忠
20ed4836cd Use try_compile construct that is recognized by older CMake version. 
Temporarily exclude the ABI check for MSVC as well. Sorry.
 2015-12-15 00:12:40 +08:00
Yao Wei Tjong 姚伟忠
1b9b928de0 Temporarily exclude try_compile check for iOS build. 2015-12-14 23:47:55 +08:00
Lasse Öörni
b49837f462 Added note of library modification. 2015-12-14 17:27:29 +02:00
Lasse Öörni
564d473b5a Added contributor credit. 2015-12-14 17:27:28 +02:00
Pranjal Raihan
b03a89c0e7 Fix narrowing conversion from int to unsigned char in jo_jpeg 2015-12-14 17:27:27 +02:00
urho3d-travis-ci
bbe8e77462 Travis CI: API documentation update at 2015-12-14 15:26:56 UTC. 
[ci package]

Commit: b110b4e51b

Message: Tabs to spaces. Add Lua API for RaycastSingleSegmented().
 2015-12-14 15:26:56 +00:00
Lasse Öörni
b110b4e51b Tabs to spaces. Add Lua API for RaycastSingleSegmented(). 2015-12-14 17:03:35 +02:00
Enhex
e57cc88020 Added PhysicsWorld::RaycastSingleSegmented(). It's much more efficient for big scenes with many bodies in them. 2015-12-14 17:03:33 +02:00
Yao Wei Tjong 姚伟忠
1cd242273e 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.
 2015-12-14 22:43:00 +08:00
Lasse Öörni
e95feb9d7e Add URHO3D_API specifier. 2015-12-14 14:41:05 +02:00
Lasse Öörni
f41f1f2b10 Squashed commit of the following: 
commit 8b26bb3353730a831952e30a91f0da43d98d5a69
Merge: dc248ce 746a57b
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 12:23:36 2015 -0600

    Merge remote-tracking branch 'refs/remotes/origin/master' into PathTools

    Conflicts:
    	Source/Urho3D/Navigation/NavigationMesh.cpp
    	Source/Urho3D/Navigation/NavigationMesh.h

commit dc248ce4e03c789f5417af00567b4c3915542d63
Merge: aa7e0e4 a2ba148
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 12:16:57 2015 -0600

    Merge branch 'refs/heads/urho3d-master' into PathTools

commit a2ba1482af2927f3e7349e65ac266cac414c5f3d
Merge: 90ab5ae aa7e0e4
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 12:15:00 2015 -0600

    Merge branch 'PathTools' into urho3d-master

    Removing conflicts

commit aa7e0e40a611c10cc4b5aa36829d958ca847e23d
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 12:07:55 2015 -0600

    Resolving conflicts for NavigationPathPoint

commit 90ab5aeaf0f5f657115e30f702bb7aaa3027f3db
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 11:59:43 2015 -0600

    Added documentation on the NavigationPathPoint struct.

commit 459e79f9ccda38d07be142aa0056def5fcb85ce8
Merge: 1ae5838 0302040
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 11:54:44 2015 -0600

    Merge remote-tracking branch 'refs/remotes/origin/master' into PathTools

commit 1ae5838d07ea01f8442b92aad1e6d9f22d886719
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Thu Dec 10 11:48:09 2015 -0600

    Altered the NavigationPathPoint structure to use predefined flags.

commit 7acba3bcd67bfc12fe5f9d33f1587c8bd60da13e
Author: NickRoyer <hjmediastudios@gmail.com>
Date:   Wed Dec 9 14:48:51 2015 -0600

    Update NavigationMesh.h

    Removed extra `_`'s from navigation point flags.

commit 9db9444ca8a5f8ba831d430acfc4e0032ff7e337
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Wed Dec 9 14:42:58 2015 -0600

    Added extra options for retreiving a path from a NavigationMesh.

commit af6080d8c9fd78978153f5efd69b8be8ec0ab999
Author: Nick Royer <hjmediastudios@gmail.com>
Date:   Wed Dec 9 13:11:59 2015 -0600

    Added expanded navigation path point structure.
 2015-12-14 14:37:57 +02:00
Lasse Öörni
675aa9c94c Since it was encountered in the wild (#1092), make failure to create the read-only depth stencil view only result in a warning instead of error, and fallback to the normal view if read-only view is not available. It is only needed when sampling and depth-testing the same texture in the HWDepth renderpaths. 2015-12-14 12:28:35 +02:00
Yao Wei Tjong 姚伟忠
94469e689e Fix RPI static build. 2015-12-13 22:36:57 +08:00