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

10202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
973a6fa807 Use _WIN32 consistently in Urho3D engine code. Simplify some preprocessor conditionals. Closes #1036. 2015-11-13 10:53:36 +02:00
Lasse Öörni
5b4493f4dc Fix situation where user has MS SDK installed but chooses to use VS2010 or earlier; in this case the DirectX headers/libs from the MS SDK are not found automatically, but rather the DX SDK has to be searched for. 2015-11-12 21:30:51 +02:00
Lasse Öörni
30a26fcfc5 Code formatting. Use node pointer in compare instead of node id. 2015-11-12 12:02:55 +02:00
Lasse Öörni
f814d517a0 Merge remote-tracking branch 'cin/master' 2015-11-12 11:51:23 +02:00
Jordan Patterson
d01b7315ab Backport XRandR and memory leak fix 
https://hg.libsdl.org/SDL/rev/d3fa6d0d3793
https://hg.libsdl.org/SDL/rev/5fa8cf552d05
 2015-11-11 18:06:59 -07:00
Lasse Öörni
e4b6749880 Convert primitive type to point list regardless of draw call specified primitive type to emulate point fill mode on D3D11. Closes #1028. 2015-11-11 16:19:59 +02:00
Vladimir
bf34fc8afb Urho3D Editor: Spawn on selected node in Spawn Editor 2015-11-11 19:51:35 +10:00
Yao Wei Tjong 姚伟忠
d4c5cf1760 For AppVeyor - remove restriction to only build on master branch. 
[ci skip]
 2015-11-11 13:55:30 +08:00
aster2013
a003f68be6 Add distance to 2D, now 2D object first sort with distance from camera, then use draw order. #1003 2015-11-10 21:28:22 +08:00
Lasse Öörni
e55d989475 Zero-initialize Drawable's local bounding box to make sure it doesn't contain infinities if the Drawable subclass never defines it. Closes #1027. 2015-11-10 11:36:38 +02:00
Lasse Öörni
53a2e38445 Update changelog. 2015-11-09 21:25:05 +02:00
Lasse Öörni
2cd28f10a8 Merge remote-tracking branch 'cin/master' 2015-11-09 21:09:51 +02:00
Lasse Öörni
304c866dd0 Separate functions to toggle/show/hide editor sub-windows to prevent mistaken action e.g. when editing a material. Update changelog. 2015-11-09 21:03:01 +02:00
Lasse Öörni
b8b3183f79 Merge remote-tracking branch 'jsandusky/EditorQuickAction' 2015-11-09 20:38:16 +02:00
Yao Wei Tjong 姚伟忠
b81547d35a For AppVeyor - switch to Debug build configuration on normal CI build. 
This is in the hope that msbuild will build faster without any optimisation.
[ci only: AppVeyor]
 2015-11-09 21:34:54 +08:00
Vladimir
48e62be7ca Urho3D Editor: Local offset for Spawn Editor 2015-11-09 21:01:46 +10:00
Yao Wei Tjong 姚伟忠
c073488069 For AppVeyor - fix artifact upload to sourceforge.net. 
[ci package]
 2015-11-09 18:18:12 +08:00
urho3d-travis-ci
0cb8d93d33 Travis CI: API documentation update at 2015-11-09 10:04:59 UTC. 
[ci package]

Commit: 28acbf12b0

Message: Update changelog.
 2015-11-09 10:04:59 +00:00
Lasse Öörni
28acbf12b0 Update changelog. 2015-11-09 11:34:22 +02:00
Lasse Öörni
6b919a8fd4 Merge remote-tracking branch 'jsandusky/TileCacheLayers' 2015-11-09 10:54:29 +02:00
Lasse Öörni
aedaea7096 Update changelog. 2015-11-09 10:53:48 +02:00
Lasse Öörni
0a2cd5bbbf Merge pull request #1020 from JSandusky/ASProtected 
Add protected check to script variable population
 2015-11-09 10:44:05 +02:00
JSandusky
f0da08b140 Urho3D Editor: Correct misnaming of function call for hiding spawn editor 2015-11-08 20:18:09 -05:00
JSandusky
80ba2ed375 Urho3D Editor: Show "Window" commands now toggle visibility 
example: CTRL + I, will show the inspector if not visible and hide it if
it is visible
 2015-11-08 19:54:41 -05:00
JSandusky
ec7aebfa2d Urho3D Editor: Enter/return executes first Quick Action in the quick action results 2015-11-08 19:53:38 -05:00
JSandusky
003aedb298 Add configuration of maximum layers in DynamicNavigationMesh 
- Valid range of 3 - 255
- Angelscript + Lua bindings
- Layer maximum changes only effects nav mesh build and does not trigger
a build
 2015-11-08 19:15:56 -05:00
JSandusky
0994584506 Add protected check to script variable population 2015-11-08 14:05:18 -05:00
Lasse Öörni
96c14871db Fix ambiguous call on VS2010. 2015-11-08 16:02:14 +02:00
urho3d-travis-ci
38ba5f8557 Travis CI: API documentation update at 2015-11-08 13:01:48 UTC. 
[ci package]

Commit: 0a88fdbc21

Message: Remove workaround fix for resource prefix path in Urho3DPlayer too.
[ccache clear]
 2015-11-08 13:01:48 +00:00
Yao Wei Tjong 姚伟忠
0a88fdbc21 Remove workaround fix for resource prefix path in Urho3DPlayer too. 
[ccache clear]
 2015-11-08 20:34:04 +08:00
Lasse Öörni
8463b48e96 Remove SplitMode enum in favor of a bool to simplify script binding. Reverse the default behavior to not return empty strings to ensure correctness of existing code. Fix resource prefix path list to not require a space. Fix ResourceRefList deserialization. Closes #1014. 2015-11-08 14:14:46 +02:00
Lasse Öörni
345ec54221 Merge remote-tracking branch 'barrettcolin/stringsplit' 2015-11-08 13:39:43 +02:00
Lasse Öörni
cb0e6caa24 Apply material list in CreateModelWithStaticModel() & CreateModelWithAnimatedModel(). Closes #1018. 2015-11-08 13:12:03 +02:00
Colin Barrett
d83f9d0a41 New String::Split implementation; keeps empty splits by default, optionally omit-able using splitMode parameter 2015-11-07 13:00:50 +00:00
Yao Wei Tjong 姚伟忠
136db85ad9 For AppVeyor - ignore exit status from 'make doc' process. 
[ci package] [ci only: AppVeyor]
 2015-11-07 18:15:09 +08:00
Yao Wei Tjong 姚伟忠
a049b1360b For AppVeyor - redirect some of the output stream to null device. 
Skip *.chm generation on AppVeyor due to a similar issue reported in #910.
Test [ci package] on [ci only: AppVeyor].
 2015-11-07 09:29:37 +08:00
Yao Wei Tjong 姚伟忠
04eaf22c45 For AppVeyor - switch to use the default VM image. 
Also test [ci package].
 2015-11-07 07:28:36 +08:00
Yao Wei Tjong 姚伟忠
50a0de7172 For AppVeyor - switch off GUI test run for now. 
[ci only: AppVeyor]
 2015-11-07 07:07:55 +08:00
Yao Wei Tjong 姚伟忠
a4d151e2f5 For AppVeyor - add script for testing and packaging. 
[ci only: AppVeyor]
 2015-11-07 02:05:01 +08:00
Lasse Öörni
73d7db3342 Added inaccurate (source file size) memory use reporting to ParticleEffect & ParticleEffect2D, to avoid it being zero. 2015-11-06 12:35:42 +02:00
Lasse Öörni
fc808c670c Merge pull request #1015 from yushli/master 
Update AnimationSet2D.cpp
 2015-11-06 11:04:45 +02:00
yushli
1f8db177e7 Update AnimationSet2D.cpp 
set memory usage when loading spine animation data
 2015-11-06 10:17:10 +08:00
Yao Wei Tjong 姚伟忠
7474fe4168 For Travis CI - manually install cmake as it is being missed out again. 
Bump up the OSX deployment target all the way to El Capitan as this newer OSX image does not have the lower SDK version installed.
Attempt to fix a cp permission issue.
[ci skip appveyor] [ci only: OSX]
 2015-11-05 23:33:47 +08:00
Yao Wei Tjong 姚伟忠
d15c70cd0b For Travis CI - attempt to use the newer OSX VM image. 
[ci skip appveyor] [ci only: OSX]
 2015-11-05 23:11:09 +08:00
Lasse Öörni
c8eb116df9 Do not reset input state on subsequent screen mode changes, to allow key-ups / mouse-ups to happen naturally. Closes #1012. 2015-11-05 14:30:14 +02:00
Lasse Öörni
62c363ee90 Update changelog. 2015-11-04 22:13:22 +02:00
Lasse Öörni
92a080d68b Remove the GLES skybox fix as it was doing more harm than good. Closes #1011. 2015-11-04 22:11:59 +02:00
Lasse Öörni
898f730d9b Let go of drag UI elements when mouse button is released, even if the cursor is hidden. Closes #1010. 2015-11-04 20:51:36 +02:00
Yao Wei Tjong 姚伟忠
262e3d8423 For AppVeyor - switch to use Release configuration. 
Temporarily disable MinGW build.
 2015-11-05 01:40:59 +08:00
Yao Wei Tjong 姚伟忠
36a93d0680 Refactor URHO3D_64BIT build option handling for MSVC. 
For AppVeyor - setup both 32-bit and 64-bit builds.
 2015-11-05 00:13:37 +08:00