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

9886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nick Royer
fe408e4910 Added AngelScript Serializable API JSON functions 2015-12-09 11:22:13 -06:00
Nick Royer
318e0f6552 Added node-specific CrowdAgent events 2015-12-09 11:17:12 -06:00
Lasse Öörni
bd6845d50e Fix off by one error in mipmap data size counting. Image code cleanup. Closes #1072. 2015-12-09 17:52:57 +02:00
Nick Royer
4ce3eeeb69 Merge branch 'NavEventsChange' of https://github.com/hjmediastudios/Urho3D into NavEventsChange 2015-12-09 07:28:37 -06:00
Nick Royer
bab7daa211 Added expanded structure for path calculation and appropriate FindPath 
method.
 2015-12-09 07:27:50 -06:00
Yao Wei Tjong 姚伟忠
b7e777d707 Enhance FindUrho3D module to auto-reconfigure when URHO3D_HOME changes. 2015-12-09 16:01:56 +08:00
Nick Royer
a3326e086a Made CrowdAgent emit events from the attached Node as well as the 
associated CrowdManager, to allow for simpler reaction of other
components on the same Node to crowd agent events.
 2015-12-08 20:12:06 -06:00
Nick Royer
35ee321408 Made CrowdAgent emit events from the attached Node as well as the 
associated CrowdManager, to allow for simpler reaction of other
components on the same Node to crowd agent events.
 2015-12-08 20:10:13 -06:00
Nick Royer
ecdb9f84c4 Added JSON loading support for materials. 2015-12-08 13:08:24 -06:00
Nick Royer
79bc4feb1e Updated Lua API with scene and node JSON load/save capabilities. 2015-12-08 12:15:48 -06:00
Nick Royer
44bdb94047 Updated Scene and Node AngelScript APIs to reflect JSON scene and node 
save/load features.
 2015-12-08 12:09:37 -06:00
Nick Royer
379860e543 Added functions for scenes, nodes, etc. to be saved/loaded to JSON data 
as well as XML.
 2015-12-08 11:56:40 -06:00
Yao Wei Tjong 姚伟忠
3229bcbfe1 Fix bug in FindUrho3D module to prevent issue when being invoked twice. 
Fix evaluation of compiler support for gnu++11/gnu++0x standard.
Fix space-in-path support for URHO3D_HOME environment variable.
 2015-12-08 22:38:42 +08:00
urho3d-travis-ci
c0c149dfa5 Travis CI: API documentation update at 2015-12-08 12:08:06 UTC. 
[ci package]

Commit: 310c32db9e

Message: Adapt PhysicsWorld::GetRigidBodies() to use Nick Royer's immediate contact test code to work with static bodies properly. (https://github.com/urho3d/Urho3D/pull/1077) Exposed PhysicsWorld::GetCollidingBodies() for the previous behavior, similar to RigidBody::GetCollidingBodies().
 2015-12-08 12:08:06 +00:00
Lasse Öörni
310c32db9e Adapt PhysicsWorld::GetRigidBodies() to use Nick Royer's immediate contact test code to work with static bodies properly. (https://github.com/urho3d/Urho3D/pull/1077) Exposed PhysicsWorld::GetCollidingBodies() for the previous behavior, similar to RigidBody::GetCollidingBodies(). 2015-12-08 13:58:20 +02:00
Lasse Öörni
45c11acd6c Create a read-only depth stencil view and use it when depth write is disabled to allow simultaneous sampling of the depth buffer in pixel shader. Closes #1076. 2015-12-07 15:55:55 +02:00
Lasse Öörni
85697abb4b Clear also stencil. 2015-12-07 11:02:38 +02:00
Lasse Öörni
66bc72a76f In ForwardDepth renderpath, clear depth two times as on OpenGL it can't be guaranteed that the proper rendering pass depth buffer is same as in the linear depth pass. Closes #1073. 2015-12-07 11:00:47 +02:00
Lasse Öörni
2265f3d609 Merge pull request #1074 from 1vanK/master 
Editor: set RenderPath for particle editor
 2015-12-07 10:46:00 +02:00
Ivan K
21d8906e7c Editor: set RenderPath for particle editor 2015-12-07 02:09:31 +04:00
Xavier Maupeu
fc41f4bfa6 fix bug with simple shadow and pcf shadow in direct3d9 2015-12-05 19:09:49 +01:00
Xavier Maupeu
9b48314d99 update glsl lighting 2015-12-05 17:12:28 +01:00
Xavier Maupeu
e636d44df9 vsm implementaion for hlsl shaders 2015-12-05 15:45:07 +01:00
Xavier Maupeu
45aa12c496 VSM shadow map can be blurred 2015-12-05 13:26:38 +01:00
Lasse Öörni
e9cf66b992 Marked todo related to child priority sorting. 2015-12-04 12:44:51 +02:00
Lasse Öörni
3c792eb2cd Merge remote-tracking branch '1vanK/master' 2015-12-04 12:34:06 +02:00