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

9612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yao Wei Tjong 姚伟忠
df5a09a722 For AppVeyor - fix new project scaffolding test. 
[ci only: AppVeyor]
 2015-12-13 21:53:35 +08:00
Yao Wei Tjong 姚伟忠
55286eb820 Fix host-tool building. 
[skip appveyor]
 2015-12-13 17:43:54 +08:00
Yao Wei Tjong 姚伟忠
72f954dad0 Enhance Urho3D-CMake-common module to auto find Urho3D library. 2015-12-13 17:13:07 +08:00
Yao Wei Tjong 姚伟忠
552ff29418 For AppVeyor - add rudimentary retry when installing packages. 
Close #1078.
[ci only: AppVeyor] [ci package]
 2015-12-13 13:26:20 +08:00
urho3d-travis-ci
0d5a38540f Travis CI: API documentation update at 2015-12-11 22:33:24 UTC. 
[ci package]

Commit: 42ba4f9824

Message: Fix material JSON save in editor. Fix AngelScript API bindings where XMLElement or JSONValue is passed as reference and should be modified (needs to be unsafe inout reference.)
 2015-12-11 22:33:24 +00:00
Lasse Öörni
42ba4f9824 Fix material JSON save in editor. Fix AngelScript API bindings where XMLElement or JSONValue is passed as reference and should be modified (needs to be unsafe inout reference.) 2015-12-12 00:08:38 +02:00
Lasse Öörni
5165aa91fb Remove GetJsonType() function from editor resource browser code since JSON files don't have a similar root element name, and it was causing the editor not to compile. Fix save of ResourceRef / ResourceRefList in JSON. Fix missing child nodes in JSON scenes. Fix editor to use the correct function to save / load JSON nodes. Fix number of attempts in finding the attribute matching JSON data. 2015-12-11 22:57:33 +02:00
Lasse Öörni
2d7ab2080f Merge remote-tracking branch 'hjmediastudios/master' 2015-12-11 21:36:30 +02:00
Yao Wei Tjong 姚伟忠
32b0b9de1c Fix OSX build for shared library type. 
Documentation clean up. Do not need to remind on the URHO3D_STATIC_DEFINE anymore for downstream projects as it is now baked into the export header.
 2015-12-12 00:27:16 +08:00
Yao Wei Tjong 姚伟忠
b90c3ba444 For downstream - fix macro redefinition warning on VS static build. 
[ci only: AppVeyor]
 2015-12-11 23:04:52 +08:00
Yao Wei Tjong 姚伟忠
13e4cc332e For downstream - auto detect Urho3D lib type from build artifact. 2015-12-11 22:54:30 +08:00
Lasse Öörni
5acb70802c Re-enable OpenGL depth test in the beginning of frame in case of third party overlay programs such MSI Afterburner having modified it. Closes #1089. 2015-12-11 11:47:31 +02:00
Nick Royer
fdb14bf0d7 Merge branch 'master' of https://github.com/hjmediastudios/Urho3D 2015-12-10 14:31:52 -06:00
Nick Royer
10bad1e36a Added JSON animation triggers as well as a few quick file filter 
settings for the editor and documentation changes.
 2015-12-10 14:31:05 -06:00
NickRoyer
746a57bbd4 Merge pull request #3 from urho3d/master 
Updating from main repository
 2015-12-10 12:01:06 -06:00
urho3d-travis-ci
8eaa00c4aa Travis CI: API documentation update at 2015-12-10 12:50:54 UTC. 
[ci package]

Commit: e09413bec8

Message: Merge remote-tracking branch 'hjmediastudios/NavEventsChange'
 2015-12-10 12:50:54 +00:00
Lasse Öörni
e09413bec8 Merge remote-tracking branch 'hjmediastudios/NavEventsChange' 2015-12-10 13:59:24 +02:00
Lasse Öörni
2b25100ef6 Fix writing to the inverse size uniforms as if they were Vector4's. Closes #1087. 2015-12-10 13:42:19 +02:00
Nick Royer
6ce8cc0f62 Merge branch 'master' of https://github.com/hjmediastudios/Urho3D 2015-12-09 12:41:46 -06:00
NickRoyer
0302040389 Merge pull request #1 from urho3d/master 
Updating dev fork
 2015-12-09 12:41:30 -06:00
Nick Royer
ff0d4ac5be Merge branch 'master' of https://github.com/hjmediastudios/Urho3D 2015-12-09 12:39:32 -06:00
Nick Royer
6dc3051702 Added SpriteSheet2D JSON loading capability. 2015-12-09 11:52:35 -06:00
Nick Royer
2b2408118b Added SpriteSheet2D JSON loading capability. 2015-12-09 11:45:58 -06:00
Nick Royer
295adceef6 Added material load type selection (JSON/XML) by file extension. 2015-12-09 11:32:25 -06:00