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
nemerle
e89184b38c Rename texture_uv_ to textureUV_ 2015-06-15 20:15:28 +02:00
nemerle
8bad584cb4 Match project's coding conventions and expose the new functionality to angelscript and lua 
Remove debugging code from Decals example.
 2015-06-15 19:06:05 +02:00
nemerle
c479fd72d5 Convert back from c++11 2015-06-15 17:20:39 +02:00
nemerle
16006239c1 Add support for retrieving UV coordinates of successful Ray query. 
Conflicts:
	Source/Samples/08_Decals/Decals.cpp
	Source/Urho3D/Graphics/Geometry.cpp
	Source/Urho3D/Graphics/Geometry.h
	Source/Urho3D/Graphics/OctreeQuery.h
	Source/Urho3D/Graphics/StaticModel.cpp
	Source/Urho3D/Math/Ray.cpp
	Source/Urho3D/Math/Ray.h
 2015-06-15 17:05:50 +02:00
David Feltell
a8afde31b2 Fix tab indent to space indent. 2015-06-14 20:28:04 +01:00
David Feltell
67b6f0d533 Add luaL_loadfile support, with CMake option to prefer this strategy. 
* Added `LuaScript::LoadRawFile` and `LuaScript::ExecuteRawFile` to load
files using `luaL_loadfile` rather than via the resource cache
(`luaL_loadbuffer`).  This strategy makes the source available to Lua
debuggers (e.g. eclipse LDT) for setting breakpoints, etc.
* Added a CMake option `URHO3D_LUA_RAW_SCRIPT_LOADER` to make
`luaL_loadfile` the default script loading strategy.
  - `LuaScript::ExecuteFile` will thus prefer the `luaL_loadfile`
strategy, aiding in debugging as above, but without needing to change
method calls.
  -  `LuaScript::Loader` will also prefer the `luaL_loadfile` strategy,
so that scripts `require`d in the main script are also amenable to
debugging.
  - If a script file cannot be loaded from the file system, then it will
fall back on the default resource cache `luaL_loadbuffer` strategy (e.g.
for packaged scripts).
 2015-06-14 20:13:03 +01:00
urho3d-travis-ci
92075c6b43 Travis CI: API documentation update at 2015-06-14 12:28:34 UTC. 
[ci package]

Commit: 476c4f25c8

Message: Allow GetChildrenWithClassName() in AngelScript API to return derived classes. Thanks to JSandusky for the original forum post on which the code is based.
 2015-06-14 12:28:34 +00:00
Lasse Öörni
476c4f25c8 Allow GetChildrenWithClassName() in AngelScript API to return derived classes. Thanks to JSandusky for the original forum post on which the code is based. 2015-06-14 15:20:06 +03:00
Lasse Öörni
368cd56955 Fix FXAA3 shader on OpenGL 3. Add non-deprecated aliases for texture2DLod in Samplers.glsl. Thanks to Gunnar Kriik. 2015-06-14 01:55:55 +03:00
Yao Wei Tjong 姚伟忠
11ae5e0602 Another attempt to workaround #743 by keeping the preinstalled version. 
[ci only: Android]
 2015-06-12 19:05:16 +08:00
Yao Wei Tjong 姚伟忠
6bd02fe805 Attempt fo fix #743 by pairing latest SDK tools /w latest build tools. 
[ci only: Android]
 2015-06-12 17:01:46 +08:00
Yao Wei Tjong 姚伟忠
99a6ef3a68 Fix a typo. Sorry. 
Related to commit 0d3de0117e.
 2015-06-12 01:06:34 +08:00
Lasse Öörni
e142319eb0 Only perform animation length fixing for non-looped 2D animations. Fixes incorrect looping in animations where the start & end keyframes don't match. 2015-06-11 17:16:31 +03:00
Yao Wei Tjong 姚伟忠
62aeb13cf2 Rectify the comment in the FindDirect3D CMake module. 
The purpose of the module is to find the Direct3D installation (not the DirectX itself).
[ci skip]
 2015-06-11 21:14:56 +08:00
Lasse Öörni
bb17ef1570 Blit to backbuffer before debug geometry if used resolve from backbuffer to acquire the scene initially for postprocessing. Closes #741. 2015-06-11 11:45:30 +03:00
Yao Wei Tjong 姚伟忠
0d3de0117e Fix MinGW STATIC Direct3D build in a newly scaffolded project. 
[ci only: master]
 2015-06-11 16:12:58 +08:00
Yao Wei Tjong 姚伟忠
a7c1dae794 Minor clean up to avoid redundant code. Also copy DLL to build tree. 
Related to commit 58332565ea.
 2015-06-11 14:26:26 +08:00
Yao Wei Tjong 姚伟忠
1829e1e81d Fix MinGW Direct3D build. 
Related to commit 58332565ea.
[ci only: master]
 2015-06-10 20:56:31 +08:00
Yao Wei Tjong 姚伟忠
6923bd0736 Install tools to the 'bin/tool' directory. 
Related to commit 6b6447eb8c.
 2015-06-10 18:39:39 +08:00
Yao Wei Tjong 姚伟忠
58332565ea Install d3dcompiler_xx.dll to the runtime bin directory on MSVC build. 
Close #738.
 2015-06-10 18:39:38 +08:00
urho3d-travis-ci
f0999ad2ff Travis CI: API documentation update at 2015-06-10 10:22:01 UTC. 
[ci package]

Commit: 3e930c5a6f

Message: Added IsAtEnd() function to AnimationController.
 2015-06-10 10:22:01 +00:00
Lasse Öörni
3e930c5a6f Added IsAtEnd() function to AnimationController. 2015-06-10 13:13:00 +03:00
Lasse Öörni
6b6447eb8c Detect presence of AssetImporter in either tool subdirectory or in the executable directory. 2015-06-09 21:23:04 +03:00
Lasse Öörni
932ed33e34 Merge pull request #737 from nemerle/master 
Fix lightmap texture imports - likely copy-paste error
 2015-06-07 18:01:42 +03:00
nemerle
a779d56c82 Fix lightmap texture imports - likely copy-paste error 2015-06-06 21:11:01 +02:00
Lasse Öörni
d3e28ce1e9 Minor edits to the build instructions. 2015-06-04 11:41:38 +03:00
urho3d-travis-ci
b3fda4de9c Travis CI: API documentation update at 2015-05-31 17:31:20 UTC. 
[ci package]

Commit: 46ebfb4b22

Message: Fix GetData() from rendertarget textures on D3D9. Thanks for JSandusky for bringing into attention. Added GetComponents() to Texture to easily determine which kind of Image needs to be created to receive the texture data.
 2015-05-31 17:31:20 +00:00
Lasse Öörni
46ebfb4b22 Fix GetData() from rendertarget textures on D3D9. Thanks for JSandusky for bringing into attention. Added GetComponents() to Texture to easily determine which kind of Image needs to be created to receive the texture data. 2015-05-31 20:16:28 +03:00
Lasse Öörni
e4480d4ef4 Merge pull request #734 from ninjastone/master 
AssetImporter was not importing single keyframe animation correctly
 2015-05-31 18:52:42 +03:00
ninjastone
c984c18a8b removed unused lines 2015-06-01 00:32:02 +09:00
ninjastone
d0fea4abd3 Fixed: AssetImporter was not importing single keyframe animation correctly. 2015-05-31 23:37:14 +09:00
Lasse Öörni
1c4e6f43ff Added the AMD equivalent for NvOptimusEnablement. 2015-05-30 23:31:40 +03:00
Yao Wei Tjong 姚伟忠
ae59d55580 Fix Emscripten toolchain file for determining EMCC version in Windows. 2015-05-30 00:42:57 +08:00
urho3d-travis-ci
4e27d96482 Travis CI: API documentation update at 2015-05-28 14:10:58 UTC. 
[ci package]

Commit: d090b0be56

Message: Added blendmode to renderpath commands (only used by QUAD commands.)
 2015-05-28 14:10:58 +00:00
Lasse Öörni
d090b0be56 Added blendmode to renderpath commands (only used by QUAD commands.) 2015-05-28 17:00:00 +03:00
Lasse Öörni
6a21873824 Fix over-long time in 2D animations which would cause sprite flashing or sprites vanishing in clamp mode (for example the included "attack" animation) 2015-05-28 16:06:58 +03:00
urho3d-travis-ci
12f220618c Travis CI: API documentation update at 2015-05-28 10:02:09 UTC. 
[ci package]

Commit: 88d86548a4

Message: Further minor clean up the CrowdAgent class.
Revise the sample so Jack walk and turn more naturally.
 2015-05-28 10:02:09 +00:00
Yao Wei Tjong 姚伟忠
88d86548a4 Further minor clean up the CrowdAgent class. 
Revise the sample so Jack walk and turn more naturally.
 2015-05-28 17:52:12 +08:00
urho3d-travis-ci
fd386c8bcd Travis CI: API documentation update at 2015-05-27 13:59:39 UTC. 
[ci package]

Commit: 6b72c4412a

Message: Minor code clean up and bug fixes for DetourCrowd implementation.
Avoid using multiple vectors to hold the same set of objects in the DetourCrowd sample.
 2015-05-27 13:59:39 +00:00
Yao Wei Tjong 姚伟忠
6b72c4412a Minor code clean up and bug fixes for DetourCrowd implementation. 
Avoid using multiple vectors to hold the same set of objects in the DetourCrowd sample.
 2015-05-27 21:51:10 +08:00
Lasse Öörni
c94bd4310b Fix incorrect viewport size when mixing rendering to backbuffer and to other textures in the renderpath. 2015-05-26 01:32:24 +03:00
Yao Wei Tjong 姚伟忠
3b099a149b For Travis CI - all bar none for Emscripten samples. 
Adjust log messages for consistency sake.
 2015-05-23 21:53:55 +08:00
Yao Wei Tjong 姚伟忠
5fd01b739e For Travis CI - add some of the excluded samples back to Emscripten CI. 
Fix package upload rake task failed to skip cleanly for MinGW CI build for D3D9.
Test [ci package] for [ci only: Emscripten] again.
 2015-05-23 20:37:37 +08:00
Mike3D
e166e7a84d Added moving obstacles and teleportation to sample 39. Also various behavior tweaks and ground texture modified to break monotony and discriminate with sample 15. If something doesn't appeal it can be reverted. 
Also set default mask and areaID at OffMeshConnection initialization.
 2015-05-23 09:27:39 +02:00
Yao Wei Tjong 姚伟忠
bee87b25a9 Minor code comment. Test [ci package] [ci only: Emscripten]. 2015-05-22 21:45:23 +08:00
Yao Wei Tjong 姚伟忠
89ff346a2e Prefer class forward than full header include. 2015-05-22 18:56:48 +08:00
Yao Wei Tjong 姚伟忠
cfdd7902e8 Fix URHO3D_PACKAGING option to ensure bash subshell is being used. 
[ci only: Emscripten, OSX]
 2015-05-22 18:51:07 +08:00
Yao Wei Tjong 姚伟忠
2b3a2aabd2 For Travis CI - remove Emscripten CI checkpoints. 2015-05-22 18:51:07 +08:00
Yao Wei Tjong 姚伟忠
0627d83f3a For Travis CI - attempt to migrate Emscripten CI build to new infra. 
[ci only: Emscripten]
 2015-05-22 18:51:07 +08:00
urho3d-travis-ci
96e9e87e35 Travis CI: API documentation update at 2015-05-22 08:30:22 UTC. 
[ci package]

Commit: 4fab742e50

Message: Added accessors for navMesh debug geometry
 2015-05-22 08:30:22 +00:00