Lasse Öörni
48ab1f3bda
Squashed commit of the following:
...
commit b21e10951ff9535e80f2b222336c5f88e11e63af
Author: Nick Royer <hjmediastudios@gmail.com>
Date: Tue Dec 22 22:00:14 2015 -0600
Added Context parameter in JSONValue::SetVariantVector to fix
ResourceRef bug
commit 297f8bcde3e24ad67e5fce56b7d0bab6fb616432
Merge: 5a150b2 2802146
Author: Nick Royer <hjmediastudios@gmail.com>
Date: Tue Dec 22 21:35:50 2015 -0600
Merge branch 'JSONValueFix' of https://github.com/hjmediastudios/Urho3D into JSONValueFix
commit 5a150b298e860c81fa17e9f0c6906b493477f97b
Author: Nick Royer <hjmediastudios@gmail.com>
Date: Tue Dec 22 21:35:23 2015 -0600
Fixed bug caused by attempting to set a JSONValue to a VariantVector;
previous behavior attempted to assign values to indices beyond the size
of the JSONValue's array storage.
commit 2802146005849314d8d3662468ec324ae8b321b3
Merge: 65c8125e1647d1#2 from urho3d/master
Make Urho3D_universal custom target as one of the default target.
2015-12-23 11:23:02 +02:00
Yao Wei Tjong 姚伟忠
668d89eca5
For Travis CI - skip appveyor when test building clang-tool branch.
...
[ci skip]
2015-12-23 17:17:50 +08:00
Lasse Öörni
b2958df94b
Merge pull request #1114 from 1vanK/master
...
Editor: fix sharp edges, when UI opacity == 1.0
2015-12-23 11:00:17 +02:00
Ivan K
645f4b7685
Remove OldUI
2015-12-23 07:55:30 +04:00
Ivan K
368d880c2b
Editor: fix sharp edges, when UI opacity < 1.0
2015-12-23 07:50:30 +04:00
NickRoyer
db801b264a
Merge pull request #1 from urho3d/master
...
Make Urho3D_universal custom target as one of the default target.
2015-12-22 21:26:10 -06:00
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: 6d2853d81dCloses #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
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
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
