Commit Graph

5243 Commits

Author SHA1 Message Date
Lasse Öörni
a5ff4f43c6 Avoid calling asGetActiveContext() in template functions, as it might result in undefined symbol when used in application code with shared library Urho3D build. Make GetScriptContext() safe to call when it would return null. Provide function GetActiveASContext() (in ScriptInstance.h) as a wrapper. 2017-03-15 17:37:07 +02:00
Lasse Öörni
eccf7cef88 Added documentation chapter on scene graph events, and that individual component removals are not signaled when node is removed. Closes #1864. 2017-03-15 12:12:06 +02:00
Enhex
516fcf18e5 Updated sound effects sample to use SetAutoRemoveMode() instead of nodes. 2017-03-14 23:58:59 +02:00
Lasse Öörni
8561254832 Remove no longer used function declaration. Closes #1861. 2017-03-14 11:34:11 +02:00
Rokas Kupstys
c92d668940 Fix jumping slider knob when it's size is fixed. 2017-03-11 17:34:01 +02:00
Lasse Öörni
5f0b5a6211 Fix ParticleEmitter finish event not working when emission is explicitly disabled with SetEmitting(false). Cleanup ParticleEmitter code. Closes #1854. 2017-03-11 16:25:17 +02:00
Lasse Öörni
d27da7d81c Fix call to Vector & PODVector::EraseSwap(). Closes #1855. 2017-03-11 00:58:05 +02:00
Yao Wei Tjong
106bfcb919 Merge pull request #1849 from iSLC/master
Remove duplicate macro in SDL windows joystick implementation.
2017-03-08 21:42:11 +08:00
Lasse Öörni
48a1f3dcdd Take fix from AngelScript WIP version to fix temp variable corruption. Remove now unnecessary fix from Editor script code. Closes #1850. 2017-03-08 14:26:52 +02:00
Sandu Liviu Catalin
d94a10f488 Remove duplicate macro in SDL windows joystick implementation. 2017-03-07 21:38:50 +02:00
Lasse Öörni
1b725367fc Place proper type check for StaticModel vs. AnimatedModel SetModel() into AngelScript API instead of StaticModel C++ code logging a warning and redirecting. Add a porting note related to this. 2017-03-07 17:36:58 +02:00
Yao Wei Tjong 姚伟忠
5579d1cca8 Prevent unnecessary incremental build due to git branch switching. 2017-03-06 23:09:50 +08:00
Yao Wei Tjong 姚伟忠
ff85c9522a Rename the module and toolchain names to follow new naming convention. 2017-03-06 22:12:27 +08:00
Yao Wei Tjong 姚伟忠
d7eded9178 Add new build option to enable WASM support.
Remove redundant Emscripten build option for pre-generating the system libraries because newer Emscripten version has fixed the cache lock issue.
2017-03-05 08:46:29 +08:00
Yao Wei Tjong 姚伟忠
0c88c99112 Allow possibility of building Urho3D without C++ exceptions feature.
Disallow Android build to turn off C++ RTTI feature.
2017-03-05 08:46:22 +08:00
Yao Wei Tjong 姚伟忠
2f8a80def4 Rewrite from scratch a new Android toolchain file.
The new toolchain file requires Android NDK r12b and above. Default to use 'arm-linux-androideabi-clang' toolchain and LLVM libc++ STL runtime.
Align all the compiler and linker flags according to new ndk-build configuration in Android NDK r12b, i.e. no more '-f[no-]strict-aliasing' and '-f[no-]omit-frame-pointer', but more stringent warnings check.
Improve over the old toolchain file where most of the options are now changeable after the initial configuration. The exceptions are ANDROID_NDK and ANDROID_TOOLCHAIN_NAME due to limitation of CMake.
Close #1441.
Other changes in this commit includes:
- Fix Android sample launcher app to support shared C++ STL runtime library.
- Remove temporary fix in FindUrho3D module as it is not required anymore with our new toolchain file.
- Fix Log::WriteRaw() method to pass the parameters correctly to __android_log_print() function.
- Fix enable_pch() macro to emit -fPIC compiler flags correctly based on target's POSITION_INDEPENDENT_CODE property.
- Fix linker flags for ld.bfd where it needs help to find the location of the rooted shared libraries. The flags are not required for ld.gold but they do no harm for gold linker.
- Enhance the CheckCompilerToolchain module to auto-detect if the NEON SIMD is enabled or not for Android build (based on the chosen ANDROID_ABI).
2017-03-05 08:45:40 +08:00
Yao Wei Tjong 姚伟忠
f32cbb72b0 Rename Urho3D-CMake-common.cmake module to UrhoCommon.cmake.
To be consistent with the other modules. Drop the '3D' simply because it sticks out in 'Urho3DCommon'.
2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
ffd24cafa1 Take advantage of CMAKE_SYSROOT available in the newer CMake.
Use CMAKE_SYSROOT to manage the sysroot automatically when cross-compiling instead of adding the '--sysroot' flag manually everywhere. We only need to add it manually in places where CMake does not, like in our custom GCC/Clang response file for PCH.
Differentiate between setting up header search path for system headers and for application headers so that GCC/Clang may suppress compilation warnings from the former, if any.
2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
3b02eeb5eb For CI - suppress all the 3rd-party libraries' warnings.
Somehow after bumping up the CMake minimum version, CMake configures Xcode to work "better" with xcpretty that now the warnings are piping through the xcpretty's filter. Unfortunately when performing CI build, this is undesirable because not only now the log size is swelling, the build is slower too.
2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
73c97d9f64 Only add defines at the scope they are actually required. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
3d9eb3f694 Bake CC and CXX env-vars in case they are short lived in init process. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
bbbbdb0108 Check native compiler toolchain is available before proceeding.
Some cross-compiling build tree configuration needs native compiler toolchain for host tool building via ExternalProject_Add(). This additional check ensures the native compiler toolchain is available up front before the build tree is even generated. Close #1300.
2017-03-05 08:45:21 +08:00
Yao Wei Tjong 姚伟忠
9f19d51c08 Remove older constructs that have been earmarked previously. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
3475afba54 Bump the CMake minimum version in the CMakeLists.txt files. 2017-03-05 08:34:41 +08:00
urho3d-travis-ci
e63db60b9a Travis CI: API documentation update at 2017-03-04 18:23:30 UTC.
[ci package]

Commit: c9331a6cc9

Message: Merge pull request #1832 from eugeneko/master

Extract some code to increase reusability.
2017-03-04 18:23:30 +00:00
Eugene Kozlov
d60e96c866 Add script binding for Node::IsChildOf. 2017-03-04 19:13:20 +03:00
Eugene Kozlov
0c400e3d9d Split Engine::Initialize 2017-03-04 19:13:20 +03:00
Eugene Kozlov
94bf1f3a85 Prepare to extract code from Engine::Initialize. 2017-03-04 19:13:20 +03:00
Eugene Kozlov
76ddec737e Add Node::IsChildOf member function. 2017-03-04 19:13:20 +03:00
Eugene Kozlov
042efb8943 Add [POD]Vector::IndexOf function. 2017-03-04 19:13:20 +03:00
urho3d-travis-ci
f219fb5d23 Travis CI: API documentation update at 2017-03-04 14:22:17 UTC.
[ci package]

Commit: 07da64de58

Message: Fix registration of NamedPipe to AngelScript API to use the proper class.
2017-03-04 14:22:17 +00:00
Lasse Öörni
07da64de58 Fix registration of NamedPipe to AngelScript API to use the proper class. 2017-03-04 15:59:03 +02:00
Lasse Öörni
fbe80c964e Merge remote-tracking branch 'rokups/AbstractFile' 2017-03-04 15:23:05 +02:00
1vanK
658baf4f3a Add info about shapes to PhysicsEvents2D 2017-03-04 14:00:07 +02:00
Yao Wei Tjong 姚伟忠
e45275e689 Add conditional compiler define for MSVC compiler.
Fix #1845 [skip travis]
2017-03-04 13:13:08 +08:00
urho3d-travis-ci
8230d0bb99 Travis CI: API documentation update at 2017-03-02 20:19:12 UTC.
[ci package]

Commit: 08fd3b7690

Message: Minor documentation expansion on use of std::bind() for events.

commit 873adf5565f8537f9d06f69a649c57635ab1c2de
Merge: 0a19418 f75a784
Author: carnalis <carnalis.j@gmail.com>
Date:   Thu Mar 2 14:25:42 2017 -0500

    Merge branch 'master' of github.com:carnalis/Urho3D

commit 0a1941814ec656d31bb5399c919ba516a2cda7cb
Author: carnalis <carnalis.j@gmail.com>
Date:   Fri Jan 13 21:24:53 2017 -0500

    Minor documentation expansion on use of std::bind() for events.

commit f75a784102708998841302c70736be39eeb2300d
Merge: 84a1f82 06d2100
Author: carnalis <carnalis.j@gmail.com>
Date:   Thu Mar 2 04:42:56 2017 -0500

    Merge branch 'master' of github.com:carnalis/Urho3D

commit 84a1f827752335260b7a5bd6a180613bd018af7e
Author: carnalis <carnalis.j@gmail.com>
Date:   Fri Jan 13 21:24:53 2017 -0500

    Minor documentation expansion on use of std::bind() for events.

commit 06d210045af24646a6161daeaff28fd9828dccfd
Merge: 20877d0 71e9501
Author: carnalis <carnalis.j@gmail.com>
Date:   Fri Jan 20 09:59:31 2017 -0500

    Merge branch 'master' of github.com:carnalis/Urho3D

commit 20877d01c805f58234798f6a0b1baeeee1e1628e
Author: carnalis <carnalis.j@gmail.com>
Date:   Fri Jan 13 21:24:53 2017 -0500

    Minor documentation expansion on use of std::bind() for events.

commit 71e9501934cc9a67eeae1d0c524dbc11a1bd96db
Author: carnalis <carnalis.j@gmail.com>
Date:   Fri Jan 13 21:24:53 2017 -0500

    Minor documentation expansion on use of std::bind() for events.
2017-03-02 20:19:12 +00:00
Lasse Öörni
874f853c1f Change Quaternion Slerp & Nlerp parameters to use a const reference by using a sign variable instead. Closes #1835. 2017-03-02 21:52:05 +02:00
urho3d-travis-ci
70186e700e Travis CI: API documentation update at 2017-03-01 19:27:37 UTC.
[ci package]

Commit: 00816efec2

Message: Add XMLElement::GetInt64 & GetUInt64 for completeness.
2017-03-01 19:27:37 +00:00
Lasse Öörni
00816efec2 Add XMLElement::GetInt64 & GetUInt64 for completeness. 2017-03-01 21:13:42 +02:00
Lasse Öörni
39c41dc6a6 Shorten long long int to long long. 2017-03-01 20:29:18 +02:00
Rokas Kupstys
ea655297dc Added AbstractFile class. It is used as parent class for classes that implement both Serializer and Deserialized. 2017-03-01 12:44:30 +02:00
Rokas Kupstys
6a7a57eace More 64bit variant work, lua and angelscript bindings. 2017-03-01 12:42:27 +02:00
Rokas Kupstys
f90dde08fe 64bit integer variant 2017-02-28 17:21:19 +02:00
1vanK
779d2835be Rename CheckDrawableVisibility() to CheckDrawableVisibilityWork() to match common style 2017-02-26 02:14:14 +03:00
urho3d-travis-ci
1760b0fa7c Travis CI: API documentation update at 2017-02-25 12:46:18 UTC.
[ci package]

Commit: e1202b725a

Message: Add other body nodeID attribute to Constraint2D for proper body connection serialization. Closes #1825.
2017-02-25 12:46:18 +00:00
Lasse Öörni
e1202b725a Add other body nodeID attribute to Constraint2D for proper body connection serialization. Closes #1825. 2017-02-25 14:37:07 +02:00
urho3d-travis-ci
af1aba2011 Travis CI: API documentation update at 2017-02-20 19:27:37 UTC.
[ci package]

Commit: 7451d6fece

Message: Add EndAllViewsRender event, emitted when Renderer::Render() is finished. Closes #1830.
2017-02-20 19:27:37 +00:00
Lasse Öörni
7451d6fece Add EndAllViewsRender event, emitted when Renderer::Render() is finished. Closes #1830. 2017-02-20 21:18:01 +02:00
Yao Wei Tjong 姚伟忠
cdbb694c2a Bake 'SDL_USE_IME' compiler define into SDL config header. 2017-02-19 12:34:55 +08:00
Lasse Öörni
540404bee2 Minor refactor for .ies extension detection. 2017-02-18 22:42:07 +02:00
Yao Wei Tjong 姚伟忠
45b1d173cf Realign SDL's CMakeLists.txt with the cherry-picked SDL commits.
Those commits are mainly for fixing the keyboard input handling on RPI platform.
2017-02-18 01:21:57 +08:00
Yao Wei Tjong 姚伟忠
4a738662ee Merge commit 'c109e4b51d143493be185f0e74ba7ba2a1411d6e' into cherry-picked-SDL-keyboard-fix 2017-02-18 00:54:58 +08:00
Lasse Öörni
011a8f9ad6 Merge remote-tracking branch 'Florastamine/master' into update-assimp 2017-02-17 11:11:18 +02:00
urho3d-travis-ci
7c1af59287 Travis CI: API documentation update at 2017-02-16 11:56:12 UTC.
[ci package]

Commit: 472d0dc549

Message: Merge remote-tracking branch '1vanK/master'
2017-02-16 11:56:12 +00:00
Lasse Öörni
472d0dc549 Merge remote-tracking branch '1vanK/master' 2017-02-16 12:16:38 +02:00
1vanK
93b880d7d2 Workaround for resetting mass in CreateFixture() and DestroyFixture() 2017-02-15 16:15:43 +03:00
1vanK
c5014a8399 Update Box2D lib, add RigidBody2D::ApplyLinearImpulseToCenter()
Avoid requirement C++11 by Box2D lib
2017-02-15 14:50:27 +03:00
Lasse Öörni
bc7d96d434 Merge branch 'update-libcpuid' 2017-02-14 19:55:53 +02:00
Lasse Öörni
6a490f05f2 Update LibCpuId to 0.4.0. Closes #1819. 2017-02-13 22:20:48 +02:00
1vanK
9263d1c7da Allow access to PhysicsWorld2D members from chield classes 2017-02-13 22:06:42 +03:00
1vanK
07df060f1f GetDerivedComponent for Physics2D to allow using custom PhysicsWorld2D 2017-02-13 18:24:06 +03:00
Florastamine
74e234a63d Updated Assimp to v3.2 2017-02-12 14:10:43 +07:00
Lasse Öörni
2821837f2a Remove zero damping from Urho2DConstraints sample to eliminate jittering behavior. Closes #1816. 2017-02-11 15:33:09 +02:00
Lasse Öörni
131e87e91f Merge remote-tracking branch 'JSandusky/master' 2017-02-11 13:00:15 +02:00
urho3d-travis-ci
15c2da904e Travis CI: API documentation update at 2017-02-10 10:18:17 UTC.
[ci package]

Commit: 26574dcc27

Message: Add explicit Vector2 & Vector3 constructors taking IntVector2 & IntVector3. Add Graphics::GetSize(). Closes #1814.
2017-02-10 10:18:17 +00:00
Lasse Öörni
26574dcc27 Add explicit Vector2 & Vector3 constructors taking IntVector2 & IntVector3. Add Graphics::GetSize(). Closes #1814. 2017-02-10 11:58:42 +02:00
JSandusky
306daeded5 Change sigma table naming to fit conventions 2017-02-09 13:16:42 -05:00
JSandusky
7a3ddb11ee JS: Add IES cookie generation to RampGenerator 2017-02-09 00:48:19 -05:00
Lasse Öörni
b167cc1640 Merge pull request #1800 from cosmy1/update-sqlite
Update sqlite
2017-02-07 11:01:37 +02:00
cosmy1
bf64ce42f2 Update SQLite to 3.16.2. 2017-02-05 21:22:12 +01:00
Mateus Vendramini
78b77ed48f Fixing small typos in comments 2017-02-05 17:33:01 -02:00
Lasse Öörni
ebdf905538 Always recalculate scale factor for fixed size billboards. Does not dirty the buffer unless actually changed. Closes #1790. 2017-02-04 01:23:52 +02:00
Lasse Öörni
0cc2bf595e Fix multisample quality handling on D3D11 feature level 10.0. Closes #1792. 2017-02-02 22:01:30 +02:00
urho3d-travis-ci
638398faa8 Travis CI: API documentation update at 2017-02-02 16:55:43 UTC.
[ci package]

Commit: 4dce27a248

Message: Add missing IntVector3 global functions to Angelscript.
2017-02-02 16:55:43 +00:00
Lasse Öörni
4dce27a248 Add missing IntVector3 global functions to Angelscript. 2017-02-02 18:40:51 +02:00
Lasse Öörni
8e8bf35378 Add contributor. Fix missing script expose in ConstraintDistance2D. 2017-02-02 18:40:35 +02:00
Lasse Öörni
cb59f60be2 Merge remote-tracking branch 'barograf/fix/joints-handling' 2017-02-02 18:15:33 +02:00
Lasse Öörni
22c421989f Merge remote-tracking branch 'henu/intvector3' 2017-02-02 18:14:19 +02:00
Mariusz Richtscheid
f0eda3dfd6 Improve Box2D joints handling, fixes #1787 2017-02-02 08:31:05 +01:00
Lasse Öörni
97b594de36 Fix assigning of global animation start/end time variables which would have unintended consequences when saving multiple animations. Closes #1789. 2017-02-01 13:59:42 +02:00
Lasse Öörni
b8ee493454 Restore FreeType gzip debug build fix. 2017-01-31 14:29:12 +02:00
Lasse Öörni
858786f9af Remove old unneeded input code brought back by merge. 2017-01-31 11:34:16 +02:00
Lasse Öörni
be9257a3fd Add MINI_URHO guards to Context for SDL init / uninit. No-op when MINI_URHO defined. Minor code style edits. 2017-01-30 18:41:59 +02:00
urho3d-travis-ci
a926e43496 Travis CI: API documentation update at 2017-01-30 14:19:08 UTC.
[ci package]

Commit: 32310a2c12

Message: Rename FONT_TYPE enum to FontType and expose it to Font public API. Closes #1786.
2017-01-30 14:19:08 +00:00
Lasse Öörni
32310a2c12 Rename FONT_TYPE enum to FontType and expose it to Font public API. Closes #1786. 2017-01-30 16:03:45 +02:00
Henrik Heino
2d8c0cf247 IntVector2 bindings, conversions, serialization, etc.
Also two typos "Intvector2" and "Intrect" fixed.
2017-01-29 17:57:16 +02:00
TheComet
be4dc04f9a Removing SDL_INIT_NOPARACHUTE, it does nothing in SDL 2.x 2017-01-29 13:33:24 +01:00
TheComet
92d50f025a Fix coding conventions 2017-01-29 13:33:24 +01:00
TheComet
10c878b42b fixes #1781 - Moved SDL_Init() into Context class 2017-01-29 13:33:24 +01:00
Lasse Öörni
b8c03fb7ec Fix ifdef. 2017-01-28 20:29:36 +02:00
Lasse Öörni
dd32227ed7 Implement Graphics::GetMultiSampleLevels() on OpenGL by querying GL_MAX_SAMPLES. Closes #1774. 2017-01-28 18:12:33 +02:00
Henrik Heino
37cf41de42 IntVector3 2017-01-27 23:04:36 +02:00
Lasse Öörni
23c5dd19e8 Merge pull request #1777 from urho3d/update-freetype
Update FreeType to 2.7.1.
2017-01-27 12:16:03 +02:00
Gauthier Billot
0073217862 Fix crash related to TileMap2D and StaticSprite2D 2017-01-26 16:24:47 +01:00
Lasse Öörni
a8b58c0c28 Merge pull request #1771 from urho3d/update-angelscript
Update AngelScript
2017-01-24 12:33:01 +02:00
Lasse Öörni
0640c2075d Clarify GeometryType enum, according to suggestion from eugeneko. Closes #1778. 2017-01-24 12:18:13 +02:00
Lasse Öörni
2ebbbd477b Update FreeType to 2.7.1. 2017-01-21 13:21:43 +02:00
Lasse Öörni
da8a39cf5a Unconditionally disable the x86 syscall prologs / epilogs on GCC, since the assembler error related to cfi instructions could also happen on newer versions. 2017-01-18 19:57:16 +02:00
Lasse Öörni
459923949c Old GCC version check in as_callfunc_x86.cpp for CI. 2017-01-17 17:29:34 +02:00
Konstant
2e38a651c7 Fix another typo in Serializable macro docs. 2017-01-15 14:43:02 +02:00
Konstant
ff12f61382 Fix small error in Serializable.h in URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE docs. 2017-01-15 14:33:43 +02:00
Lasse Öörni
a4d2c052ec Fix Text3D not showing other batches correctly, than the first. Closes #1758. 2017-01-14 22:36:50 +02:00
urho3d-travis-ci
cc2e166157 Travis CI: API documentation update at 2017-01-12 16:29:43 UTC.
[ci package]

Commit: f20475161f

Message: Add XMLFile::GetOrCreateRoot() & XMLElement::GetOrCreateChild(). Closes #1756.
2017-01-12 16:29:43 +00:00
Lasse Öörni
f20475161f Add XMLFile::GetOrCreateRoot() & XMLElement::GetOrCreateChild(). Closes #1756. 2017-01-12 18:15:36 +02:00
Lasse Öörni
bd95787c1a Fix Web build Urho3DPlayer not reading script file name from Module.arguments. Make sure the error exit due to no script name happens. 2017-01-11 14:56:54 +02:00
Lasse Öörni
0e1e46fbb9 Refactor Urho3DPlayer to attempt reading CommandLine.txt from the resource system later on all platforms, if reading from the filesystem fails. Closes #1754. 2017-01-10 20:13:59 +02:00
Yao Wei Tjong 姚伟忠
d42723a45e Enable high DPI on Apple retina display device by default.
High DPI mode can still be programmatically disabled via Engine parameter only.
2017-01-10 23:43:03 +08:00
urho3d-travis-ci
9fb189a51c Travis CI: API documentation update at 2017-01-10 08:03:34 UTC.
[ci package]

Commit: d229db148c

Message: When Input detects screen mode change (initial or otherwise), calculate scaling ratio from SDL window size and Graphics backbuffer size. Scale mouse positions and deltas with the input scale. Inspired by work of Elissa Ross in PR #1725. Related to issue #1252, might resolve it, but not tested on actual Retina hardware.
2017-01-10 08:03:34 +00:00
Lasse Öörni
d229db148c When Input detects screen mode change (initial or otherwise), calculate scaling ratio from SDL window size and Graphics backbuffer size. Scale mouse positions and deltas with the input scale. Inspired by work of Elissa Ross in PR #1725. Related to issue #1252, might resolve it, but not tested on actual Retina hardware. 2017-01-10 09:52:42 +02:00
Lasse Öörni
8b4ddd5289 Use ALPHAMAP shader define in Text shader to differentiate between alpha texture (TTF) and RGBA (bitmap fonts). Closes #1750. 2017-01-07 19:09:05 +02:00
Lasse Öörni
883b5105cb Merge branch 'master' into update-angelscript 2017-01-07 16:40:55 +02:00
Yao Wei Tjong 姚伟忠
53d213eb50 Minor refactor to remove the '***' as the repeat indicator.
The script already knows when the nested attributes repeat itself.
2017-01-07 14:08:37 +08:00
Lasse Öörni
e22de44be5 Restore Urho3D tweaks to as_config.h and earlier ifdef check for C++11 features. 2017-01-06 15:54:42 +02:00
Lasse Öörni
080bf36f9f Restore earlier ifdef for AS type traits due to some Android CI builds failing. 2017-01-06 11:12:55 +02:00
Lasse Öörni
fe2d6cf21a Add contributor credit. 2017-01-04 16:13:46 +02:00
Lasse Öörni
c548d8ed24 Merge remote-tracking branch 'arnislielturks/console-update' 2017-01-04 16:05:28 +02:00
Lasse Öörni
458830d1c7 Fix crash in usedGlyphs mode. Fix AS binding for Font::SaveXML taking a Serializer. Closes #1746. 2017-01-04 15:48:47 +02:00
Arnis Lielturks
e89a769a76 console text highlighting, style detection by log level improved 2017-01-04 10:50:19 +02:00
Yao Wei Tjong
b6f10c6f48 Merge pull request #1739 from koja/cmake_fix
Avoid special chars in paths in MRI script passed to ar utility
2017-01-04 09:24:03 +08:00
Arnis Lielturks
fad8c6c51b Console.cpp indentation fixed 2017-01-03 20:02:37 +02:00
urho3d-travis-ci
42f40ad64f Travis CI: API documentation update at 2017-01-03 16:25:53 UTC.
[ci package]

Commit: 48b82e136e

Message: Fix typo in Editor scripts.
2017-01-03 16:25:53 +00:00
Jan Korous
524fba130f Simplified regex for MRI script special chars 2017-01-03 16:22:35 +01:00
Arnis Lielturks
ffbe619c8a log message colour in console displayed based on it's type 2017-01-03 17:09:59 +02:00
Lasse Öörni
019862a8f7 Fix end of line typo in FontFace.cpp. Closes #1744. 2017-01-03 13:25:43 +02:00
Lasse Öörni
f5b68769d0 ElementsNames -> ElementNames. 2017-01-02 18:19:58 +02:00
Lasse Öörni
c9884af9a6 Minor code edit, prefer GetObjectAttributeInfos() since it's asking for a single object's attributes. 2017-01-02 17:57:47 +02:00
Lasse Öörni
1f1433847d Merge remote-tracking branch 'KonstantinTomashevich/allow-define-vector-structs-attributes' 2017-01-02 17:43:15 +02:00
Konstant
b155da4f16 Add checking if object has any attributes. 2017-01-02 11:47:20 +02:00
Konstant
c70b6cf7ae Fix another misspelling. 2017-01-02 11:23:52 +02:00
Lasse Öörni
a6a99c1faf Clang internal error workaround to as_callfunc_x86.cpp 2017-01-02 01:32:43 +02:00
urho3d-travis-ci
39b6089615 Travis CI: API documentation update at 2017-01-01 20:43:44 UTC.
[ci package]

Commit: 11f099c655

Message: Minor style edits. Use position instead of iterator in autocomplete to be safe against iterator invalidation. Add Lua binding to autocomplete. Add short description of the new feature being demonstrated in sample 26.
2017-01-01 20:43:44 +00:00
Lasse Öörni
11f099c655 Minor style edits. Use position instead of iterator in autocomplete to be safe against iterator invalidation. Add Lua binding to autocomplete. Add short description of the new feature being demonstrated in sample 26. 2017-01-01 22:35:16 +02:00
Enhex
d75cee7e1c Switched to using Urho3D::Vector, and conforming with Urho's contribution requirements. 2017-01-01 22:35:15 +02:00
Enhex
f0e05cb7e1 Console auto complete 2017-01-01 22:35:14 +02:00
Konstant
e96bc6eaa8 Fix misspelling. 2017-01-01 21:49:28 +02:00
Konstant
c3e9f4617d Another small fixes in codestyle. 2017-01-01 21:41:40 +02:00
Konstant
73f72be922 Fix codestyle. 2017-01-01 21:38:39 +02:00
Konstant
d2364ed342 Update components with variant vector structures. 2017-01-01 20:52:15 +02:00
Konstant
8bde966269 Add macro. 2017-01-01 20:24:33 +02:00
Konstant
59c123630d Add GetObjectsAttriuteInfos to angel script api. 2017-01-01 20:06:51 +02:00
Konstant
f0a872ad2b Add variantStructureElementsNames_ list to attribute. 2017-01-01 19:22:34 +02:00
urho3d-travis-ci
ee054a1507 Travis CI: bump copyright to 2017.
[ccache clear]
2017-01-01 13:01:31 +00:00
Lasse Öörni
d8a7b2ed8f Safeguard against zero sized root UI element. Closes #1738. 2017-01-01 14:52:43 +02:00
Jan Korous
d977be0d59 Avoid special chars in paths in MRI script passed to ar utility 2017-01-01 10:05:02 +01:00
eugeneko
ec5f1f6d02 Merge pull request #1735 from eugeneko/master
Rename Resource::Load and Resource::Save filename overloads to Resour…
2016-12-31 12:55:15 +03:00
Eugene Kozlov
c59b0d941d Rename Resource::Load and Resource::Save filename overloads to Resource::LoadFile and Resource::SaveFile to prevent Resource::Save shadowing. 2016-12-30 20:53:36 +03:00
Lasse Öörni
6b03450f46 Compiler incompatibility fix for UINT64_MAX. 2016-12-30 19:13:32 +02:00
1vanK
9d7dceb2f2 06_SkeletalAnimatin: fix running out bounds, lighting correction
Fix excessive specular on Kachujin texture
2016-12-30 13:58:41 +03:00
Lasse Öörni
299dbf803b Squashed commit of the following:
commit 8b67f0edcb9b588c70df1676bdbfa4853e50c3aa
Author: Lumak <lumak5309@gmail.com>
Date:   Thu Dec 29 10:18:40 2016 -0800

    corrected to stonetiled mat

commit c17d68b1e0ed5435c492a26ed8010c4f4aa708eb
Author: Lumak <lumak5309@gmail.com>
Date:   Thu Dec 29 10:14:20 2016 -0800

    removed proto mat/texture

commit 1c322d19556d7796c4958a920203e5b1c80af843
Author: Lumak <lumak5309@gmail.com>
Date:   Wed Dec 28 12:18:59 2016 -0800

    replaced the Jack with Jill in 06_SkeletalAnimation sample
2016-12-29 20:39:28 +02:00
Konstant
435fb3687d Add missing namespace prefix in URHO3D_ACESSOR_ATTRIBUTE 2016-12-29 20:25:07 +02:00
Lasse Öörni
dae1c615a9 Initial work to update to AngelScript 2.31.2. 2016-12-29 19:51:46 +02:00
urho3d-travis-ci
d1af23bebc Travis CI: API documentation update at 2016-12-27 19:48:39 UTC.
[ci package]

Commit: a44f5299ee

Message: Register Variant::GetTypeName & Variant::GetTypeFromName as global functions into AngelScript. Closes #1730.
2016-12-27 19:48:40 +00:00
Lasse Öörni
a44f5299ee Register Variant::GetTypeName & Variant::GetTypeFromName as global functions into AngelScript. Closes #1730. 2016-12-27 21:39:46 +02:00
Lasse Öörni
7783d815e8 Minor include order change. 2016-12-26 21:12:15 +02:00
Henrik Heino
faa8fc8854 Fix minor Terrain bugs.
- Missing include added.
- Terrain UV coordinates fixed.
2016-12-26 18:51:34 +02:00
Yao Wei Tjong 姚伟忠
68293002b5 Fix Urho3DAll.h generation in an non out-of-source build tree.
Close #1720.
2016-12-23 23:00:10 +08:00
Lasse Öörni
fef73ba4c4 Squashed commit of the following:
commit 06f4d6afab933e32eaf3428dd080766b11a87f82
Author: Lasse Öörni <loorni@gmail.com>
Date:   Sun Dec 18 18:31:39 2016 +0200

    Black variant of logo.

commit 8fa11f888de023fcc76f26908e2ea77ebfd3146b
Author: Lasse Öörni <loorni@gmail.com>
Date:   Sun Dec 18 17:12:14 2016 +0200

    New logo in Lua samples.

commit 1283e38db1164a1c1e5db7d1042feabf996031fb
Merge: 4062553 4f5a2ea
Author: Lasse Öörni <loorni@gmail.com>
Date:   Sun Dec 18 16:51:04 2016 +0200

    Merge remote-tracking branch 'Modanung/new-logo'

commit 4f5a2ea104feeac12b87d3fb89d116e1866c2513
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 05:36:37 2016 +0100

    Also replaced logo in angelscript samples

commit 7c6e5e90c4dc82705883806e46b0957a44fbc787
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 03:34:31 2016 +0100

    Changed logo in samples to fishbone logo
2016-12-18 18:48:39 +02:00
urho3d-travis-ci
4062553b4f Travis CI: API documentation update at 2016-12-18 12:56:19 UTC.
[ci package]

Commit: 475bed04a8

Message: Fix nearest aniso filtering on Direct3D9 (At least NVIDIA GPUs.) Add documentation note on nearest aniso mode support. Closes #1718.
2016-12-18 12:56:19 +00:00
Lasse Öörni
475bed04a8 Fix nearest aniso filtering on Direct3D9 (At least NVIDIA GPUs.) Add documentation note on nearest aniso mode support. Closes #1718. 2016-12-18 14:42:33 +02:00
Lasse Öörni
6da62ecfe4 Aniso-nearest texture filter mode. 2016-12-18 13:42:24 +02:00
Lasse Öörni
59be3a2a17 Increase default VSM light bleeding prevention to 0.9 (from dragonCASTjosh.) Closes #1716. 2016-12-17 21:02:07 +02:00
Yao Wei Tjong 姚伟忠
d4e74a35c0 Set the default for SDL's VIDEO_MIR build option to FALSE.
Related to issue #1714.
2016-12-16 22:24:21 +08:00
Eugene Kozlov
705c5a17fa Extract AnimatedModel::ApplyAnimation method to force animation update. Make AnimationController::Update virtual. 2016-12-14 22:25:01 +03:00
Lasse Öörni
23b29fdb57 Reassign shader defines in SDF text pass when updating material so that later text effect changes work. Closes #1710. 2016-12-14 20:02:19 +02:00
Lasse Öörni
bbee668dfa Fix typo in header comment. Add mention of EngineDefs.h in documentation. 2016-12-10 18:00:10 +02:00
Lasse Öörni
f65ca809e2 Merge remote-tracking branch '1vanK/master' 2016-12-10 15:22:28 +02:00
1vanK
2a703a5ab1 Add engine parameters const 2016-12-10 08:18:18 +03:00
Lasse Öörni
0010226c0b Initialize new VertexBuffer / IndexBuffer variable for completeness. 2016-12-08 21:47:58 +02:00
Lasse Öörni
ed15cc21e4 Pass discard flag to buffer "unlock" on OpenGL. Closes #1706. 2016-12-08 18:41:58 +02:00
Lasse Öörni
bc1926eea3 Fade other animations in AnimationController::PlayExclusive() only if starting the new animation succeeded. Thanks to orefkov. Closes #1703. 2016-12-07 18:37:21 +02:00
Lasse Öörni
54ad428b4b Fix nearest filter mode not using mipmaps on OpenGL. Closes #1701. 2016-12-05 19:01:25 +02:00
Yao Wei Tjong 姚伟忠
e045b29c59 Split 3rd-party licenses into its own file. 2016-12-05 23:28:39 +08:00
Yao Wei Tjong 姚伟忠
f1d1b757b8 Change all CMakeLists.txt to use LF for consistency sake. 2016-12-05 22:33:59 +08:00
Lasse Öörni
1edc5f306e Disable rendertarget mipmaps on iOS as they appear not to work. 2016-12-04 01:12:34 +02:00
Lasse Öörni
db6b91cd7d If no Text3D text vertices, set local bounding box to zero sized. 2016-11-30 14:24:17 +02:00
urho3d-travis-ci
ea3a97a078 Travis CI: API documentation update at 2016-11-30 11:45:48 UTC.
[ci package]

Commit: 71731961bd

Message: Add function to return Text3D UI element height.
2016-11-30 11:45:48 +00:00
Lasse Öörni
71731961bd Add function to return Text3D UI element height. 2016-11-30 13:35:05 +02:00
Lasse Öörni
a8a29d757b Set node's final position before ApplyAttributes when instantiating. When node containing CrowdAgent has transform dirtied, readd to crowd if far enough. Operate on WorldPosition consistently to allow being parented to a non-identity transform parent node. Closes #1695. 2016-11-29 23:07:30 +02:00
Yao Wei Tjong 姚伟忠
e071b20967 Another attempt to auto-detect clock_gettime() on Apple platforms.
It is strange that Apple does not honour the deployment target and only based on base SDK when defining __CLOCK_AVAILABILITY internally.
[ci only: OSX]
2016-11-30 01:55:16 +08:00
Lasse Öörni
290f671e91 Ensure skinning matrix pointers do not change after late creation of bones. (e.g. prefab without bones.) Found while investigating #1695. 2016-11-29 18:42:20 +02:00
Yao Wei Tjong 姚伟忠
9290ebf6e0 Use auto-detection for clock_gettime() function on Apple platforms.
Fix #1692 [ci only: OSX]
2016-11-29 22:50:08 +08:00
Lasse Öörni
8e2ecb9617 Revert the check to not allow to set null sprite, as it should work without crashing. Safety checks in UpdateDrawRect() left. 2016-11-29 10:55:10 +02:00
Lasse Öörni
aa1600b91c Tabs to spaces, rephrase log message 2016-11-29 00:46:12 +02:00
Y-way
be8cbb43ba Crash due to call of StaticSprite2D::SetSprite if param is null.
If mouse left button hit a sprite tile in 36_Urho2DTileMap sample, it
make a crash.
2016-11-29 00:25:27 +02:00
Lasse Öörni
b9e8bf7ca0 Eliminate BillboardSet 16 bit index limitation and use large indices when necessary. 2016-11-25 12:16:46 +02:00
urho3d-travis-ci
13b3d9e9e6 Travis CI: API documentation update at 2016-11-22 18:11:01 UTC.
[ci package]

Commit: 1efb0d9085

Message: Enable IME for Linux platform. Only tested using ibus.
2016-11-22 18:11:01 +00:00
Yao Wei Tjong 姚伟忠
1efb0d9085 Enable IME for Linux platform. Only tested using ibus. 2016-11-23 01:59:55 +08:00
Lasse Öörni
0edcd340c0 Remove unused Matrix2 member variable. 2016-11-22 13:26:29 +02:00
Yao Wei Tjong 姚伟忠
2fb158d089 Add support for FCITX (an alternative IME to ibus). 2016-11-20 13:50:24 +08:00
urho3d-travis-ci
c7a63ac03e Travis CI: API documentation update at 2016-11-19 23:29:28 UTC.
[ci package]

Commit: df808db28d

Message: Update DebugRenderer comments. Render lines with depth write on and solid triangles with depth write off.
2016-11-19 23:29:28 +00:00
Lasse Öörni
df808db28d Update DebugRenderer comments. Render lines with depth write on and solid triangles with depth write off. 2016-11-20 01:05:45 +02:00
Lasse Öörni
681e9f832c Merge remote-tracking branch '1vanK/master' 2016-11-19 23:55:56 +02:00
Yao Wei Tjong 姚伟忠
05690e0a36 Fix #1681 for good. The ibus devel pacakge is optional once more. 2016-11-20 01:25:59 +08:00
Yao Wei Tjong 姚伟忠
b2af56a14b Minor bug fixes. 2016-11-20 01:24:10 +08:00
Yao Wei Tjong 姚伟忠
98d1eba903 Fix Android build error due to declaration after statement (using GCC).
Close #1690 [ci only: Android]
2016-11-19 13:07:54 +08:00
urho3d-travis-ci
1176e9daab Travis CI: API documentation update at 2016-11-18 08:12:47 UTC.
[ci package]

Commit: ade01f61af

Message: Remove isAreaLight variable completely from Light class, as it's unused. Some cleanup / comment changes. Fix PBRDeferred GLSL shader.
2016-11-18 08:12:47 +00:00
Lasse Öörni
ade01f61af Remove isAreaLight variable completely from Light class, as it's unused. Some cleanup / comment changes. Fix PBRDeferred GLSL shader. 2016-11-18 10:03:23 +02:00
Lasse Öörni
b8d55583f7 Squashed commit of the following:
commit a384431cd1ce230630d6a4522022de919cb55ac9
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Thu Nov 10 00:16:26 2016 +0000

    Fixed typing and style errors

commit d4f8ca2eeed2b0196b46bd391e96a511594dc738
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Thu Nov 10 00:14:02 2016 +0000

    Removed isAreaLight from attibutes

commit 62d50f3ba94d9c665358dcd7377730d968fde7be
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Mon Nov 7 22:53:45 2016 +0000

    Added documentation on area lighting options

commit 53e5844bee5caccc2a37f0dcdac3b8d4a984dd62
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 17:15:14 2016 +0000

    Fixd spacing

commit 5afa4ec59c1ecd2aa4892d4854e3b954af9cc73f
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 06:00:19 2016 +0000

    Fixed materials under deferred and light position in the scene

commit 314bc5847a44979b89f46a0272fcf5cd0f04e866
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 05:14:27 2016 +0000

    Fixed Deferred rendering

commit bde3560de71ab5a33c9cc3a4ee40029567cca5bf
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 03:26:54 2016 +0000

    Area lighting, improved IBL and improved attenuation for OpenGL

commit 52be0fc67626a9c8901091445be52bdbe99657d1
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 01:23:53 2016 +0000

    Intergrated Area ligthing with the editor, and improved texture quality

commit 5044bebe3d8799dee687ca676334f4493586d376
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Mon Oct 24 09:25:15 2016 +0100

    Tube lighting HLSL

commit f3849a93d1812345b21918a7418d12c8d3e1e3dd
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Mon Oct 24 09:01:10 2016 +0100

    Improve IBL

commit 210bfaebb40ed977eb46f0f6f91b3b6a49ec25a7
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Thu Sep 15 12:32:15 2016 +0100

    Made sphere lights closer to epics paper

commit c186870e9e79de9572b5302019598ac059af58cf
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Thu Sep 15 11:57:39 2016 +0100

    Added sphere light and beginning of tube lights
2016-11-18 02:02:05 +02:00
Lasse Öörni
84c36e10e5 Ensure proper recursive calculation of UI element combined screen rect. Closes #1687. 2016-11-17 22:14:48 +02:00
Lasse Öörni
4144ff27c6 Make sure nodes with CrowdAgent component are excluded from nav geometry generation. Related to #1689. 2016-11-17 21:58:17 +02:00
Yao Wei Tjong 姚伟忠
628e4b2795 Quick fix for #1681 on Linux build, requires ibus-dev(el) package. 2016-11-17 01:20:47 +08:00
Yao Wei Tjong 姚伟忠
ad97bfacd0 Fix Android build. 2016-11-09 23:10:02 +08:00
Yao Wei Tjong 姚伟忠
805932a498 Merge commit '8eb652a0d09b97901540c9721f5afb37b903a286' into upstream.master 2016-11-09 23:08:19 +08:00
urho3d-travis-ci
b9b88591fb Travis CI: API documentation update at 2016-11-07 20:21:46 UTC.
[ci package]

Commit: 10e97395e3

Message: Add contributor credit.
2016-11-07 20:21:47 +00:00
Lasse Öörni
467729bae7 Minor comment edits and missing bindings. Move VAR_RECT last in the enum to not break potential binary scenes/prefabs. Set StaticSprite2D rect attribute default values to Rect::ZERO for more pleasant editing. Editing of VAR_RECT attributes. 2016-11-07 22:04:46 +02:00
Lasse Öörni
c3fc83c7f3 Merge remote-tracking branch 'gogoprog/feature-draw_and_texture_rects' 2016-11-07 21:24:08 +02:00
Gauthier Billot
43a1a22f1c Added Lua and AngelScript bindings 2016-11-07 13:28:28 +01:00
Gauthier Billot
552f2d107b Added attributes to StaticSprite2D 2016-11-07 13:20:47 +01:00
Gauthier Billot
44224786d2 Added Set/Get Use[Draw/Texture]Rect 2016-11-07 13:20:04 +01:00
Gauthier Billot
544bd1eefe Updated Variant to support Rect 2016-11-07 13:09:19 +01:00
Igor
90312d21b1 Remove redundant assignment 2016-11-07 11:07:39 +03:00
1vanK
32032d60f7 Solid debug geometry for NavArea 2016-11-06 11:35:23 +03:00
Matan Shukry
22b16e2aa3 Added namespace prefix for various calls to GetVariantType 2016-11-05 20:18:49 +02:00
Gauthier Billot
44adda4f17 Added SetDrawRect and SetTextureRect in StaticSprite2D 2016-11-03 13:33:51 +01:00
urho3d-travis-ci
e550dda403 Travis CI: API documentation update at 2016-11-01 18:11:07 UTC.
[ci package]

Commit: e44dda965c

Message: Merge pull request #1669 from eugeneko/master

Optimize Editor work with temporary objects
2016-11-01 18:11:07 +00:00
eugeneko
e44dda965c Merge pull request #1669 from eugeneko/master
Optimize Editor work with temporary objects
2016-11-01 20:58:18 +03:00
Eugene Kozlov
e556f63291 Add 'temporary' parameter to Node::CreateChild and Node::CreateTemporaryChild. 2016-10-30 00:13:41 +03:00
Johnathan Jenkins
d78fc4020f minor typos 2016-10-28 13:07:14 -07:00
Lasse Öörni
02ab74ec6a Fix FontFaceFreeType signedness warning on MSVC. 2016-10-28 22:21:23 +03:00
urho3d-travis-ci
7ccffe217d Travis CI: API documentation update at 2016-10-28 14:56:35 UTC.
[ci package]

Commit: 098679893f

Message: Expose SDLK_UNKNOWN as KEY_UNKNOWN in InputEvents.h. Closes #1666.
2016-10-28 14:56:35 +00:00
Lasse Öörni
098679893f Expose SDLK_UNKNOWN as KEY_UNKNOWN in InputEvents.h. Closes #1666. 2016-10-28 17:40:31 +03:00
Lasse Öörni
ce78e3217c Fix material removal while handling attribute animation causing potential crash. Fix material animation event being transmitted already on the first frame. 2016-10-26 00:00:43 +03:00
urho3d-travis-ci
d010c1ff2f Travis CI: API documentation update at 2016-10-25 19:03:28 UTC.
[ci package]

Commit: 0acd25e763

Message: Add logarithm function to Math API.
2016-10-25 19:03:28 +00:00
Eugene Kozlov
0acd25e763 Add logarithm function to Math API. 2016-10-25 21:40:39 +03:00
Eugene Kozlov
87a3e7e2fb Replace some expressions with new functions. 2016-10-25 21:40:39 +03:00
Eugene Kozlov
a785c1f37c Add missing binding for Image::SaveDDS. 2016-10-25 21:40:39 +03:00
Lasse Öörni
9a5d9af6b7 Fix event frame not expanding the ValueAnimation's time range properly. Fix removing an animating object during an event frame causing crash. Thanks to vudugun for noticing (forum thread http://urho3d.prophpbb.com/topic2464.html) 2016-10-25 21:38:04 +03:00
Lasse Öörni
3d2987c2ba Reset levelsDirty / resolveDirty when releasing a texture. Resolve multisampled texture in GetData() if necessary. Fix getting multisampled texture data on D3D9/11. 2016-10-23 19:48:13 +03:00
Lasse Öörni
05b47d8913 Always set history position after pressing enter, even if row wasn't saved. 2016-10-23 01:33:14 +03:00
Lasse Öörni
408398dc83 Merge remote-tracking branch 'Enhex/patch-1' 2016-10-23 01:16:27 +03:00
urho3d-travis-ci
cb459449d9 Travis CI: API documentation update at 2016-10-22 21:08:25 UTC.
[ci package]

Commit: 875ebcfef5

Message: Disable rendertarget mipmaps on WebGL for now, as they appeared to not be working.
2016-10-22 21:08:25 +00:00
Lasse Öörni
875ebcfef5 Disable rendertarget mipmaps on WebGL for now, as they appeared to not be working. 2016-10-22 23:56:47 +03:00
Lasse Öörni
1bb6d3d1ac Support for mipmapped rendertargets & automatic mip regeneration after rendering. Renderer allocated screen buffers are not mipmapped, but a manually created rendertarget texture will be (like regular textures), unless disabled by calling SetNumLevels(1). 2016-10-22 23:56:46 +03:00
Mike3D
066448b26d Fixed return value of Viewport::WorldToScreenPoint() for AS [ci skip] 2016-10-22 22:01:18 +02:00
Enhex
1736c67487 Don't save line repetitions in the console's history 2016-10-22 01:45:46 +03:00
Lasse Öörni
d01facfb56 Word wrap char positions fix contributed by Fastran. Closes #1659. 2016-10-20 01:05:51 +03:00
Lasse Öörni
a8f1fbc7ed Ensure work item gets inserted last into the queue if no other option. Closes #1656. 2016-10-19 17:53:39 +03:00
Lasse Öörni
3bf13318fc Sync Urho3DPlayer command line help from the documentation. 2016-10-18 22:49:13 +03:00
urho3d-travis-ci
e035fa0b8d Travis CI: API documentation update at 2016-10-16 17:40:18 UTC.
[ci package]

Commit: b09fd98bef

Message: Tab to spaces. Cast to float in IntVector2::Length() to avoid warning spam.
2016-10-16 17:40:18 +00:00
Lasse Öörni
b09fd98bef Tab to spaces. Cast to float in IntVector2::Length() to avoid warning spam. 2016-10-16 20:26:38 +03:00
Lasse Öörni
7af7cf202a Merge remote-tracking branch 'rokups/utility-functions' 2016-10-16 19:54:40 +03:00
Eugene Kozlov
89ce82e0ed Fix copy-paste error in math AS bindings. 2016-10-16 19:36:03 +03:00
Lasse Öörni
17e2122a6e Allow to set desired mouse mode or mouse visibility before Input initialization. 2016-10-16 17:49:43 +03:00
Rokas Kupstys
964351a03a Node::GetChildren* that return a collection of children (for use in ranged for loops) 2016-10-16 17:35:14 +03:00
Rokas Kupstys
e71fa46e89 Node::SetTransform(const Matrix3x4& matrix) 2016-10-16 17:35:14 +03:00
Rokas Kupstys
f9aa090c92 IntVector2::Length() 2016-10-16 17:35:14 +03:00
Rokas Kupstys
5d1ef7fdbb UIElement::GetChildrenWithTag() that returns PODVector. 2016-10-16 17:35:14 +03:00
urho3d-travis-ci
9b88d79945 Travis CI: API documentation update at 2016-10-16 13:39:24 UTC.
[ci package]

Commit: b23a1bd856

Message: Merge branch 'update-api'
2016-10-16 13:39:24 +00:00
Eugene Kozlov
b23a1bd856 Merge branch 'update-api' 2016-10-16 16:00:24 +03:00
Yao Wei Tjong 姚伟忠
123d06471a Remove mouse centering logic from screen mode change event handler.
Remove Linux-specific workaround for fixing the initial input focus lose problem.
Close #1652.
2016-10-16 20:30:31 +08:00
Lasse Öörni
fff10e15cf Eliminate a few uses of NULL, and mention preference to not use it in the code convention. Ensure UIElementLoadChildXML returns a value. 2016-10-16 14:03:01 +03:00
Eugene Kozlov
14bc9b0085 Make UniquePtr non-copyable. 2016-10-16 13:41:56 +03:00
Eugene Kozlov
eac08de5cb Add extra check to prevent deletion of incomplete type in UniquePtr. 2016-10-16 11:40:29 +03:00
Eugene Kozlov
b85efd2462 Fix Image::SaveDDS implementation. 2016-10-16 00:51:41 +03:00
Eugene Kozlov
a69df6344a Replace new/delete with UniquePtr in simplest cases. 2016-10-16 00:51:27 +03:00
urho3d-travis-ci
e60bc58099 Travis CI: API documentation update at 2016-10-15 18:58:36 UTC.
[ci package]

Commit: d81b2b414c

Message: More rendertarget formats. Add porting note.
2016-10-15 18:58:36 +00:00
Lasse Öörni
fd4a9bdb9b Load & store a different set of shader variations into Pass if necessary, when a renderpath scenepass command defines additional shader compile defines. 2016-10-15 21:47:18 +03:00
Lasse Öörni
05c0e7741b Allow also scenepass & forwardlights commands to define shader parameters. 2016-10-15 21:47:17 +03:00
TheComet
82e09e8632 UIElement::CreateChildXML() returns child instead of bool. If loading fails, child is destroyed instead of keeping an empty child around 2016-10-15 21:47:16 +03:00
Eugene Kozlov
89fb47f550 Add stable random generator. 2016-10-15 21:43:24 +03:00
Eugene Kozlov
e150bb29ec Fix include in Ptr.h 2016-10-15 21:43:23 +03:00
Eugene Kozlov
8acd69046a Add Image::SaveDDS function. Add Resource::Save|Load(fileName) functions. 2016-10-15 21:43:23 +03:00
Eugene Kozlov
f437d858a7 Fix AS bindings. 2016-10-15 18:50:08 +03:00
Eugene Kozlov
3087632f84 Add Math API functions: InverseLerp, Vector2|3|4::ProjectOntoAxis 2016-10-15 16:56:57 +03:00
Eugene Kozlov
a49dab7456 Add math API functions: vector Lerp, Min, Max, Floor, Round and Ceil. 2016-10-15 16:32:08 +03:00
Eugene Kozlov
0c144b542d Add math API functions: Sqrt, Pow, Mod, Fract, Floor, Round, Ceil and their integer counterparts. 2016-10-15 15:04:27 +03:00
Eugene Kozlov
583c851b03 Add LowerBound and UpperBound functions. 2016-10-15 15:04:26 +03:00
Eugene Kozlov
92b151d4aa Add template FromString. Add begin() and end() for Pair<T, T>. 2016-10-15 15:04:26 +03:00
Eugene Kozlov
49a4c46c97 Add UniquePtr template. Add MakeUnique and MakeShared helpers. 2016-10-15 11:58:35 +03:00
Yao Wei Tjong 姚伟忠
8d76730f5c Declare the template specialization in the header to keep MSVC happy. 2016-10-14 07:42:42 +08:00
Lasse Öörni
31744b797c Fix potential use of dangling EventReceiverGroup (leading to assert) by making it refcounted and holding onto it until event sending is complete. 2016-10-13 21:40:21 +03:00
urho3d-travis-ci
fdfbb742f5 Travis CI: API documentation update at 2016-10-13 17:25:15 UTC.
[ci package]

Commit: c13084b962

Message: Add Lua binding for Model's SetVertexBuffer() and SetIndexBuffer().
Related to #1638.
2016-10-13 17:25:15 +00:00
Yao Wei Tjong 姚伟忠
c13084b962 Add Lua binding for Model's SetVertexBuffer() and SetIndexBuffer().
Related to #1638.
2016-10-14 00:59:15 +08:00
Lasse Öörni
3143336a76 Rewrite event receiver tracking to allow safe receiver removal during event send, even when same number of receivers is added and removed. Closes #1642. 2016-10-12 01:04:29 +03:00
urho3d-travis-ci
dbb589855e Travis CI: API documentation update at 2016-10-11 19:34:59 UTC.
[ci package]

Commit: 9aca15f4d6

Message: Add contributor credit. Code style edits to ProgressBar. Fix ProgressBar resize. Calculate percent as value / range and convert to integer to prevent showing too many decimals.
2016-10-11 19:34:59 +00:00
Lasse Öörni
9aca15f4d6 Add contributor credit. Code style edits to ProgressBar. Fix ProgressBar resize. Calculate percent as value / range and convert to integer to prevent showing too many decimals. 2016-10-11 22:24:30 +03:00
Lasse Öörni
0e0066ad21 Merge remote-tracking branch 'victorholt/master' 2016-10-11 19:30:55 +03:00
Yao Wei Tjong 姚伟忠
82f7fd56d0 Remove CMake workaround for Bullet library building.
The workaround is not needed anymore as the offending code has been patched.
[ci only: master] [skip appveyor]
2016-10-11 22:33:25 +08:00
Lasse Öörni
00f414416e Explicitly cast infinity to float in btVector3 code to prevent narrowing errors on TDM-GCC. Closes #1637. 2016-10-11 10:16:15 +03:00
Victor Holt
a2261f5a56 Updated the ProgressBar PR to include Lua and AngelScript bindings
Added the ability to show or hide the percent text
2016-10-10 23:38:48 -05:00
urho3d-travis-ci
91b919ea30 Travis CI: API documentation update at 2016-10-10 12:55:05 UTC.
[ci package]

Commit: 20af1aa85f

Message: Demonstrate listing the vertex + index buffers to Model so that it can be saved correctly. Lua bindings not added for now due to problem with serializing a vector of object pointers. Closes #1638.
2016-10-10 12:55:05 +00:00
Lasse Öörni
20af1aa85f Demonstrate listing the vertex + index buffers to Model so that it can be saved correctly. Lua bindings not added for now due to problem with serializing a vector of object pointers. Closes #1638. 2016-10-10 15:44:31 +03:00
Lasse Öörni
9065247c45 Merge remote-tracking branch 'victorholt/master' 2016-10-10 10:50:36 +03:00
Victor Holt
b232eb1114 Removed an unnecessary variable. 2016-10-10 01:26:15 -05:00
Victor Holt
c486b1608b Fixed an issue for SQLite queries where String::Trimmed was returning a corrupted version of the query string 2016-10-09 19:36:43 -05:00
urho3d-travis-ci
02066e2ac8 Travis CI: API documentation update at 2016-10-09 03:52:52 UTC.
[ci package]

Commit: 1ef164d741

Message: Minor typo correction on a Lua property name for AnimationControl.
2016-10-09 03:52:52 +00:00
Yao Wei Tjong 姚伟忠
1ef164d741 Minor typo correction on a Lua property name for AnimationControl. 2016-10-09 11:43:36 +08:00
Lasse Öörni
44748322d5 Urho2D sprite related classes 64bit warning fixes. 2016-10-09 03:04:17 +03:00
Lasse Öörni
9a2d373d29 Assert receiver in derived template implementation, not in base class, which allows to set a null pointer instead of one cast from unsigned int. Closes #1634. 2016-10-09 03:03:58 +03:00
urho3d-travis-ci
92afe3521e Travis CI: API documentation update at 2016-10-08 18:11:48 UTC.
[ci package]

Commit: f099b8e0a2

Message: Expose read-only access to AnimationController's internal AnimationControl structures.
2016-10-08 18:11:48 +00:00
Lasse Öörni
f099b8e0a2 Expose read-only access to AnimationController's internal AnimationControl structures. 2016-10-08 21:01:32 +03:00
urho3d-travis-ci
763e99367d Travis CI: API documentation update at 2016-10-07 07:57:13 UTC.
[ci package]

Commit: f545877cc8

Message: Merge pull request #1632 from 1vanK/master

Add AnimationController::IsPlaying(layer) method
2016-10-07 07:57:13 +00:00
Lasse Öörni
f545877cc8 Merge pull request #1632 from 1vanK/master
Add AnimationController::IsPlaying(layer) method
2016-10-07 10:47:46 +03:00
urho3d-travis-ci
07f02972ed Travis CI: API documentation update at 2016-10-06 19:42:20 UTC.
[ci package]

Commit: 47e016eca4

Message: Add function to check Rect <-> Rect intersection.
2016-10-06 19:42:20 +00:00
Lasse Öörni
47e016eca4 Add function to check Rect <-> Rect intersection. 2016-10-06 22:21:39 +03:00
Lasse Öörni
08ff3f6629 Clarify comment. Closes #1631. 2016-10-06 14:43:32 +03:00
urho3d-travis-ci
ca263bef55 Travis CI: API documentation update at 2016-10-05 09:00:11 UTC.
[ci package]

Commit: 203cb06048

Message: Merge remote-tracking branch 'eugeneko/master'
2016-10-05 09:00:11 +00:00
Lasse Öörni
203cb06048 Merge remote-tracking branch 'eugeneko/master' 2016-10-05 11:27:41 +03:00
urho3d-travis-ci
c3c45a0c1b Travis CI: API documentation update at 2016-10-04 21:28:16 UTC.
[ci package]

Commit: f8ebf2dbc9

Message: Line antialiasing support in Graphics, Material, DebugRenderer classes. Closes #1627.
2016-10-04 21:28:16 +00:00
Lasse Öörni
f8ebf2dbc9 Line antialiasing support in Graphics, Material, DebugRenderer classes. Closes #1627. 2016-10-05 00:17:05 +03:00
Eugene Kozlov
dec0361792 Fix Texture2D::GetImage and TextureCube::GetImage Lua bindings. Simplify some Lua bindings. 2016-10-04 23:12:07 +03:00
Eugene Kozlov
6a469e6af8 Update return value of SharedPtr<T>::Detach. 2016-10-04 22:41:38 +03:00
Eugene Kozlov
b16b7f6f7a Move Texture2D::GetImage and TextureCube::GetImage implementations. 2016-10-04 22:11:31 +03:00
Lasse Öörni
bf4591b158 Define WINVER in SDL_windowsjoystick.c if not defined. Related to #1629. 2016-10-04 16:28:20 +03:00
urho3d-travis-ci
9b78bbacb6 Travis CI: API documentation update at 2016-10-02 10:55:35 UTC.
[ci package]

Commit: 6068963457

Message: Preserve anchored size if setting horiz/vert alignment while anchored.
2016-10-02 10:55:35 +00:00
Lasse Öörni
6068963457 Preserve anchored size if setting horiz/vert alignment while anchored. 2016-10-02 13:43:22 +03:00
Lasse Öörni
ab5cdf9da7 Update documentation on UI element anchoring. 2016-10-02 13:43:21 +03:00
Lasse Öörni
a5d20441dd Adjustments to UI element anchoring to make it more foolproof and intuitive. Anchoring must now be enabled explicitly. 2016-10-02 13:43:20 +03:00
Lasse Öörni
6f8164c492 Script bindings for anchor/pivot settings. Edit comments. 2016-10-02 13:43:19 +03:00
ninjastone
93f009d882 Fixed missing argument 2016-10-02 13:43:18 +03:00
ninjastone
e1724b84e5 Changed FLT_MAX to std::numeric_limits 2016-10-02 13:43:17 +03:00
ninjastone
9c4b0b169d Fixed read only attributes in serialization.
Added flags to UIElement for compatibility.
2016-10-02 13:43:17 +03:00
ninjastone
6fb6de2873 Added some comments. 2016-10-02 13:43:16 +03:00
ninjastone
68f4657528 Add anchor and pivot to UIElement. 2016-10-02 13:43:15 +03:00
urho3d-travis-ci
1377657b2d Travis CI: API documentation update at 2016-10-01 13:05:53 UTC.
[ci package]

Commit: 0ea9ed6e34

Message: Possibility in DecalSet to size VB/IB to only size used by decals. Default off; causes reallocation whenever decals are added/removed and thus can have worse performance.
2016-10-01 13:05:53 +00:00
Lasse Öörni
0ea9ed6e34 Possibility in DecalSet to size VB/IB to only size used by decals. Default off; causes reallocation whenever decals are added/removed and thus can have worse performance. 2016-10-01 15:51:10 +03:00
Lasse Öörni
72c2e82ee8 Support for bool & int constants in materials on OpenGL & Direct3D11. Added int uniform support to OpenGL. Removed code duplication for setting a Variant shader parameter. 2016-09-30 18:55:00 +03:00
Lasse Öörni
fa42bc6a8f Fix erroneous reuse of the backbuffer depth buffer when multisampling is used. Closes #1625. 2016-09-30 14:48:24 +03:00
urho3d-travis-ci
c797ba266c Travis CI: API documentation update at 2016-09-29 20:38:21 UTC.
[ci package]

Commit: 562b193ef5

Message: Add delta parameter to UIElement::OnResize() and the Resized event.
2016-09-29 20:38:22 +00:00
Lasse Öörni
562b193ef5 Add delta parameter to UIElement::OnResize() and the Resized event. 2016-09-29 23:12:25 +03:00
urho3d-travis-ci
102a137a4d Travis CI: API documentation update at 2016-09-28 18:04:08 UTC.
[ci package]

Commit: 2868854338

Message: Clarify Texture2D::SetSize() & fix tabs.
2016-09-28 18:04:08 +00:00
Lasse Öörni
2868854338 Clarify Texture2D::SetSize() & fix tabs. 2016-09-28 20:26:26 +03:00
Lasse Öörni
fc42e5d98e Merge branch 'multisample-textures' 2016-09-28 19:41:08 +03:00
Lasse Öörni
3a5a85151e Instead of specific fix in Material, convert double Variants to float on demand in Graphics::SetShaderParameter(). Closes #1621. 2016-09-28 19:39:01 +03:00
Lasse Öörni
1bb04b2cbd Avoid getting a light's lightMask constantly when looping over geometries, rather get it once into a stack variable. 2016-09-28 01:16:01 +03:00
Lasse Öörni
fee755e942 To restore lost performance, move less critical Node variables to an implementation struct to reduce Node instance memory size, and restore old unsafe PODVector operation that does not allow self-insertion. 2016-09-28 00:43:43 +03:00
Lasse Öörni
174e555303 Fix incorrect transform of decal normals when decal is not in same node as target geometry. Closes #1618. 2016-09-26 23:03:58 +03:00
Lasse Öörni
bb057522ad Remove static TypeInfo checking functions, as they cannot function properly due to always accessing the TypeInfo of Object class. 2016-09-26 21:53:46 +03:00
Lasse Öörni
3ca4bb25c3 For consistency/safety, release the surface also when failing to acquire. Closes #1050. 2016-09-26 12:29:19 +03:00
Lasse Öörni
90e376c9cc Add documentation on multisampled rendertargets. 2016-09-26 12:04:03 +03:00
Lasse Öörni
c923476847 Merge branch 'master' into multisample-textures
# Conflicts:
#	Docs/Reference.dox
2016-09-26 10:52:54 +03:00
Lasse Öörni
f01024881f Add multisampling possibility for VSM shadows. 2016-09-25 23:59:57 +03:00
Lasse Öörni
46793bbb72 Match multisample mode of the substitute rendertarget & screen buffers with the final destination rendertarget. 2016-09-25 19:31:24 +03:00
Lasse Öörni
749c283fb7 Since it appears none of the APIs support sampling a multisampled cube texture, remove the autoresolve parameter and always set it true if multisampled for cube textures. Make it a warning (not error) to attempt no autoresolve for a 2D multisampled texture on Direct3D9. 2016-09-25 17:14:10 +03:00
Lasse Öörni
76911afe38 Fix D3D11 multisampled cube texture creation. 2016-09-25 02:53:25 +03:00
Lasse Öörni
37e002e58b D3D11 multisampled cube texture. Refactoring / cleanup of D3D error logging and GPU object release. 2016-09-25 01:46:58 +03:00
Lasse Öörni
f07f3e8c91 OpenGL multisampled cube texture. 2016-09-25 00:12:53 +03:00
Lasse Öörni
32192bc7fb Remove unnecessary iteration from StaticModelGroup to update node ID's. Instead update ID's when asked. 2016-09-24 19:24:51 +03:00
Lasse Öörni
f635df3cb1 Fix uninitialized memory in Material. Closes #1615. 2016-09-24 19:24:50 +03:00
Lasse Öörni
f89c4e4dfb Merge pull request #1612 from eugeneko/master
Minor changes
2016-09-23 22:32:13 +03:00
Lasse Öörni
4c2e2b713b Fix out of bounds array access when material quality is higher than high. Closes #1611. 2016-09-23 22:21:41 +03:00
Eugene Kozlov
3c585a15c9 Add Vector::Resize and PODVector::Resize overloads. 2016-09-23 21:01:07 +03:00
Eugene Kozlov
14e057a70d Make EnumAttributeAccessorImpl compatible with enum classes. 2016-09-23 20:43:32 +03:00
Eugene Kozlov
12499aa0d0 Virtualize some member functions of StaticModel. 2016-09-23 20:43:32 +03:00
urho3d-travis-ci
52efdb31cb Travis CI: API documentation update at 2016-09-23 15:48:26 UTC.
[ci package]

Commit: a1e2bc9bd3

Message: Make shader cache location configurable, default urho3d/shadercache in app preferences, to avoid writing to write-protected installation directory by default. Instructions in porting notes to restore earlier behavior. ShaderCacheDir & PackageCacheDir parameters added to engine startup parameters. Fix GetResourceFileName() function to return the unmodified filename if it's absolute and exists. Remove unnecessary mutex lock from GetResourceFileName(). Remove some code duplication from Graphics class implementations. Closes #1610.
2016-09-23 15:48:26 +00:00
Lasse Öörni
a1e2bc9bd3 Make shader cache location configurable, default "urho3d/shadercache" in app preferences, to avoid writing to write-protected installation directory by default. Instructions in porting notes to restore earlier behavior. ShaderCacheDir & PackageCacheDir parameters added to engine startup parameters. Fix GetResourceFileName() function to return the unmodified filename if it's absolute and exists. Remove unnecessary mutex lock from GetResourceFileName(). Remove some code duplication from Graphics class implementations. Closes #1610. 2016-09-23 18:36:40 +03:00
Lasse Öörni
c745d2ea52 Multisampled cube rendertarget on Direct3D9. 2016-09-23 09:55:10 +03:00
urho3d-travis-ci
5aa0b0613e Travis CI: API documentation update at 2016-09-22 18:51:31 UTC.
[ci package]

Commit: fe2e70db13

Message: Clean up view event sending code. Add 2 new view events: buffers allocated, and global shader parameters set.
2016-09-22 18:51:31 +00:00
Lasse Öörni
fe2e70db13 Clean up view event sending code. Add 2 new view events: buffers allocated, and global shader parameters set. 2016-09-22 21:42:30 +03:00
Lasse Öörni
3b4f4d4c0c Clear multisampling from texture on GLES and log warning. 2016-09-21 00:41:00 +03:00
urho3d-travis-ci
d13a92d616 Travis CI: API documentation update at 2016-09-20 08:53:23 UTC.
[ci package]

Commit: 886e48ab8a

Message: Script bindings for new input functions.
2016-09-20 08:53:23 +00:00
Lasse Öörni
886e48ab8a Script bindings for new input functions. 2016-09-20 11:36:32 +03:00
Lasse Öörni
f6ce114830 Multisampled texture without autoresolve on OpenGL. 2016-09-19 23:05:44 +03:00
Lasse Öörni
d068842bf5 Error logging for attempting to use non-autoresolve multisampled texture on Direct3D9. 2016-09-19 21:35:04 +03:00
Lasse Öörni
f75fbfa688 Add multisample & autoresolve definitions to RenderTargetInfo. 2016-09-19 21:27:38 +03:00
Lasse Öörni
a7f3c61bdf Multisampled texture on D3D11. 2016-09-19 21:06:40 +03:00
Rokas Kupstys
19012714e1 Expose mouse position manipulation api in Input class 2016-09-19 18:24:30 +03:00
Lumak
4fd62537e6 implemented a much simpler version 2016-09-19 00:40:17 -07:00
Lasse Öörni
4e40cf849e Work on OpenGL multisample textures. 2016-09-19 02:35:28 +03:00
Lumak
7341c9a48b a bit of clean up 2016-09-18 14:42:26 -07:00
Lumak
931b9bbd98 added a feature to be able to export fbx animation w/o skinned mesh 2016-09-18 13:12:49 -07:00
1vanK
eda96cd128 Add AnimationController::IsPlaying(layer) method 2016-09-18 19:47:10 +03:00
Lasse Öörni
eb62fd941b Next attempt to fix civetweb for XCode 8. 2016-09-18 00:27:25 +03:00
Eugene Kozlov
d4039d5bc6 Add functions for mipmap manipulation to Image. 2016-09-17 01:20:59 +03:00
Lasse Öörni
c1ad7ea5b7 Modified Civetweb patch from Josh Engebretson. Related to #1588. 2016-09-16 23:11:32 +03:00
Lasse Öörni
5b67d284e1 Let Box2D world stay at default values for continuous (true) & substepping (false), since substepping enabled leads to erratic behavior under load. Closes #1592. 2016-09-16 18:29:52 +03:00
Lasse Öörni
43535f4087 Add script bindings for the new texture read-only properties. 2016-09-16 14:15:28 +03:00
Lasse Öörni
508db7feb8 Create additional screen buffers as non-antialiased to avoid extra resolves, with the assumption that they will be used for quad ping-ponging in postprocess effect chain. 2016-09-16 01:36:08 +03:00
Lasse Öörni
56edbef9d6 Initial multisample support for Texture2D on Direct3D9. 2016-09-16 01:24:36 +03:00
Eugene Kozlov
9c6e6071b2 Fix memory leak in Dictionary. 2016-09-14 23:02:55 +03:00
Lasse Öörni
781dc31143 Merge remote-tracking branch '1vanK/master' 2016-09-14 18:18:33 +03:00
Yao Wei Tjong 姚伟忠
952408eba0 Update code comment. [ci skip] 2016-09-14 21:13:09 +08:00
1vanK
bba9766c66 39_CrowdNavigation: animation sync 2016-09-14 11:24:20 +03:00
Lasse Öörni
4c1d729a21 Merge pull request #1581 from eugeneko/master
Fix LookAt Mixed rotation mode.
2016-09-14 10:17:45 +03:00
Lasse Öörni
00f0a87dc5 Stop existing weight fade when AnimationController::SetWeight() is called, to ensure the set weight is not overridden one frame later. Closes #1583. 2016-09-14 09:50:50 +03:00
Eugene Kozlov
7c72c36676 Fix LookAt Mixed rotation mode. 2016-09-13 20:45:13 +02:00
Lasse Öörni
4f1de66529 Merge remote-tracking branch 'Gordon-F/Gordon-F-delfix' 2016-09-13 13:45:45 +03:00
urho3d-travis-ci
1f6be30c98 Travis CI: API documentation update at 2016-09-12 21:07:18 UTC.
[ci package]

Commit: b22768227f

Message: Possibility to enable alpha-to-coverage in either pass or material (all passes). Requires D3D11 or OpenGL and hardware multisampling enabled. Seems to look slightly different on D3D / OpenGL. Fixed depth bias not being copied in Material::Clone(). Closes #1578.
2016-09-12 21:07:19 +00:00
Lasse Öörni
b22768227f Possibility to enable alpha-to-coverage in either pass or material (all passes). Requires D3D11 or OpenGL and hardware multisampling enabled. Seems to look slightly different on D3D / OpenGL. Fixed depth bias not being copied in Material::Clone(). Closes #1578. 2016-09-12 23:43:45 +03:00
Lasse Öörni
90d7d226fc Do not make a value copy of the VariantVector inside the attribute in SceneResolver. Closes #1576. 2016-09-12 17:33:12 +03:00
Igor
c72ea82b5f fix delete in SpritePacker.cpp 2016-09-12 12:29:52 +03:00
Lasse Öörni
32ef767485 Make a value copy of the node IDs when resolving. Potential solution for #1576. 2016-09-12 02:23:59 +03:00
urho3d-travis-ci
acbbaacc5c Travis CI: API documentation update at 2016-09-11 13:53:23 UTC.
[ci package]

Commit: 91141412c9

Message: Add missing enum string name for serialization.
2016-09-11 13:53:23 +00:00
Lasse Öörni
91141412c9 Add missing enum string name for serialization. 2016-09-11 16:42:11 +03:00
Lasse Öörni
8968fa4bb2 Merge remote-tracking branch '1vanK/master' 2016-09-11 16:40:15 +03:00
Lasse Öörni
83acf5bc14 Optional per-texture specifiable max. anisotropy level. Closes #1563. 2016-09-11 16:28:45 +03:00
1vanK
6323aed69a Add NavigationPushiness::NAVIGATIONPUSHINESS_NONE 2016-09-11 15:38:57 +03:00
Lasse Öörni
a10aba4cfa Remove debug print. 2016-09-10 20:51:42 +03:00
Lasse Öörni
19300a3dd7 Add note that ResetTarget() doesn't stop automatically. Do not debug draw a "velocity" target for CrowdAgent. Closes #1572. 2016-09-10 20:50:12 +03:00
urho3d-travis-ci
e3834b7cf9 Travis CI: API documentation update at 2016-09-08 21:39:21 UTC.
[ci package]

Commit: 6895a512af

Message: Pass-level mechanism for eliminating unnecessary shader compilation defines. Closes #1567. Use this mechanism to eliminate PACKEDNORMAL define from depth & shadow pass in normalmapped techniques.
2016-09-08 21:39:21 +00:00
Lasse Öörni
6895a512af Pass-level mechanism for eliminating unnecessary shader compilation defines. Closes #1567. Use this mechanism to eliminate PACKEDNORMAL define from depth & shadow pass in normalmapped techniques. 2016-09-09 00:29:19 +03:00
Lasse Öörni
4e5f83acc9 Make it safe to remove CrowdAgent during the reposition event. Closes #1570. 2016-09-08 22:00:30 +03:00
Yao Wei Tjong 姚伟忠
d19d8d3dbf Minor refactor for code reuse. 2016-09-08 23:02:03 +08:00
urho3d-travis-ci
13dbb22564 Travis CI: API documentation update at 2016-09-07 20:45:59 UTC.
[ci package]

Commit: 6be0d71814

Message: Fix keeping track of RigidBody2D constraints. Closes #1569.
2016-09-07 20:45:59 +00:00
Lasse Öörni
6be0d71814 Fix keeping track of RigidBody2D constraints. Closes #1569. 2016-09-07 21:49:05 +03:00
Lasse Öörni
4bf27d1a0e Synchronize the two definitions of FaceCameraMode in Lua bindings. 2016-09-07 21:49:04 +03:00
urho3d-travis-ci
508b916769 Travis CI: API documentation update at 2016-09-07 17:44:46 UTC.
[ci package]

Commit: 02fae13ad6

Message: Update face camera mode name and add script bindings.
2016-09-07 17:44:46 +00:00
Eugene Kozlov
02fae13ad6 Update face camera mode name and add script bindings. 2016-09-06 22:52:19 +03:00
Eugene Kozlov
d344cae791 Add new face camera mode to BillboardSet and Text3D. 2016-09-06 22:23:35 +03:00
urho3d-travis-ci
64220a1c13 Travis CI: API documentation update at 2016-09-06 17:52:30 UTC.
[ci package]

Commit: 2fe4cb0131

Message: Add max extrusion parameter for directional lights. Default to 1000. This prevents large far clip causing poor shadow map depth resolution and too strong effect of depth bias parameters, but can be increased if very tall shadows are needed.
2016-09-06 17:52:30 +00:00
Lasse Öörni
2fe4cb0131 Add max extrusion parameter for directional lights. Default to 1000. This prevents large far clip causing poor shadow map depth resolution and too strong effect of depth bias parameters, but can be increased if very tall shadows are needed. 2016-09-06 20:41:55 +03:00
Lasse Öörni
dc90a2d5de Remove ambiguous weak ptr constructor call. 2016-09-06 11:02:10 +03:00
urho3d-travis-ci
1954c550ed Travis CI: API documentation update at 2016-09-06 07:16:12 UTC.
[ci package]

Commit: 48f779e234

Message: Add possibility for materials to define vertex & pixel shader compilation defines, like techniques & passes. Related to #1566. As a consequence, removed the alphamask hint from techniques (render order can be used instead) and automatic determination if material should occlude. Fixed bugs in Material JSON save. Allow JSONValue::Size() to also work in object mode. Added porting notes as necessary.
2016-09-06 07:16:12 +00:00
Lasse Öörni
48f779e234 Add possibility for materials to define vertex & pixel shader compilation defines, like techniques & passes. Related to #1566. As a consequence, removed the "alphamask" hint from techniques (render order can be used instead) and automatic determination if material should occlude. Fixed bugs in Material JSON save. Allow JSONValue::Size() to also work in object mode. Added porting notes as necessary. 2016-09-06 10:01:32 +03:00
Lasse Öörni
3dfb4a4c0b Find navigation mesh from the scene in a delayed manner. Plus other codepath consistency fixes for CrowdManager. Closes #1565. 2016-09-05 20:38:42 +03:00
Yao Wei Tjong 姚伟忠
13ed7bbbb6 Workaround a linking issue when using MinGW >= 6.1.0. 2016-09-04 12:02:05 +08:00
Lasse Öörni
1dbb9908b5 Convert double to float when assigning a shader parameter (possible danger when setting material parameters from Lua) 2016-09-03 17:03:16 +03:00
Lasse Öörni
0201718c87 Add missing assert to PODVector. 2016-09-03 16:42:49 +03:00
Lasse Öörni
2d59e72df7 Guard against self-assignment clearing the containers. 2016-09-03 15:36:19 +03:00
Eugene Kozlov
7a600befd2 Refactor Vector and PODVector implementation. 2016-09-03 09:40:43 +03:00
Lasse Öörni
000b1af6d7 Check for obstacle node moving and update navigation mesh appropriately. Needs a hack to skip this during scene deletion to avoid crash. Closes #1558. 2016-09-02 23:26:31 +03:00
urho3d-travis-ci
b2c3a96197 Travis CI: API documentation update at 2016-09-01 18:09:10 UTC.
[ci package]

Commit: b7c7568c24

Message: Add to/from string conversions for JSONValueType & JSONNumberType. Minor code cleanup and missing JSONValue script bindings. Closes #1546.
2016-09-01 18:09:10 +00:00
Lasse Öörni
b7c7568c24 Add to/from string conversions for JSONValueType & JSONNumberType. Minor code cleanup and missing JSONValue script bindings. Closes #1546. 2016-09-01 20:57:30 +03:00
Lasse Öörni
84fa0ba977 Squashed commit of the following:
commit 7cb949170f3585c860e9946dc4465fb73791e692
Author: Henrik Heino <henrik.heino@gmail.com>
Date:   Wed Aug 31 23:53:53 2016 +0300

    Suggested modifications to hash function.

commit ca28aa5cb5ecf5cb746bbc78e417ee580327e676
Author: Henrik Heino <henrik.heino@gmail.com>
Date:   Tue Aug 30 02:39:42 2016 +0300

    IntVector2::ToHash()
2016-09-01 10:40:42 +03:00
Lasse Öörni
ab4095829d Detect Push / Insert to Vector or PODVector from inside itself and make a value copy in that case. Closes #1556. 2016-09-01 00:03:11 +03:00
Lasse Öörni
773ba488ea Merge pull request #1550 from Lumak/master
fixed a bug where crash is caused by geometry having key animation
2016-08-31 12:45:54 +03:00
Lasse Öörni
8bef941082 Fix slowed down navigation crowd agent when node dirtied in E_CROWD_AGENT_NODE_REPOSITION. Send the event only after position has been updated. Check for only rotation changing when node dirtied, and do not update position / reset state in that case. Closes #1548. 2016-08-31 12:41:10 +03:00
Lasse Öörni
d72de15898 Add note that GetNextLevel() will keep returning 1x1x1 image if necessary. Closes #1554. 2016-08-31 10:52:43 +03:00
Yao Wei Tjong 姚伟忠
11f319c2cd Fix the version check so the MinGW workaround is applied for >= 6.1.0.
Close #1552.
2016-08-31 14:52:35 +08:00
Lasse Öörni
5b70c5da64 Restore earlier method of defining camera frustum when a custom projection matrix is not in use, to improve deferred depth reconstruction accuracy. Related to #1551. 2016-08-30 23:08:05 +03:00
Lasse Öörni
b3964e21c5 Demonstrate Z fighting elimination by depth bias in 10_RenderToTexture sample. Closes #1543. 2016-08-30 21:21:10 +03:00
Lasse Öörni
fcb7808aff Minor edit to reduce unnecessary whitespace. 2016-08-30 20:44:32 +03:00
Lasse Öörni
b3e1791b19 Merge remote-tracking branch 'eugeneko/master' 2016-08-30 20:38:37 +03:00
Lumak
79f1a1bdcd added a check for invalid boneIndex caused by geometry key animation 2016-08-30 10:19:43 -07:00
Lumak
d7085d2c7c copy and paste edit 2016-08-30 09:06:56 -07:00
Lumak
a1aa049e2f fixed geometry having animation key problem
a geometry being animated causes crash because the suppression looks for
a parent bone
2016-08-30 08:44:12 -07:00
Lasse Öörni
489f759e00 Fix slope-scale depth bias potentially not creating new rasterizer state on D3D11 due to poor hashing. Remove mistaken adjustment of slope-scale bias on OpenGL. Now behavior should be uniform between D3D9/D3D11/OpenGL. Closes #1547. 2016-08-29 22:15:42 +03:00
Eugene Kozlov
6a72b70b41 Fix copypaste error in attribute accessor. 2016-08-27 12:11:18 +03:00
Eugene Kozlov
273a3ac881 Add support of free functions as attribute accessors. 2016-08-26 23:30:36 +03:00
urho3d-travis-ci
f0f1711037 Travis CI: API documentation update at 2016-08-26 12:21:57 UTC.
[ci package]

Commit: 6c4a112fce

Message: Add note on camera projection matrix API change.
2016-08-26 12:21:57 +00:00
Lasse Öörni
a53f19151f Remove redundant comment. 2016-08-26 14:36:13 +03:00
Lasse Öörni
48e9f8e112 Merge branch 'projection-matrix' 2016-08-26 13:59:43 +03:00
Yao Wei Tjong 姚伟忠
02e1aec083 Add "-Wno-narrowing" compiler flag to MinGW 6.1.0 for all build config. 2016-08-25 18:21:58 +08:00
Yao Wei Tjong 姚伟忠
4b964a6989 Workaround MinGW build issue when using version 6.1.0 and above.
Fix internal compilation error by reducing the optimization level from -O3 to -O2. Suppress compilation error caused by narrowing conversions.
2016-08-25 08:49:44 +08:00
urho3d-travis-ci
5c855f1040 Travis CI: API documentation update at 2016-08-24 19:32:43 UTC.
[ci package]

Commit: d9c0ce7f15

Message: Send also node-specific 2D collision events. Closes #1535.
2016-08-24 19:32:43 +00:00
Lasse Öörni
d9c0ce7f15 Send also node-specific 2D collision events. Closes #1535. 2016-08-24 22:23:17 +03:00
Lasse Öörni
9df9a5c77c Add new AssetImporter flag to Doxygen docs. 2016-08-24 17:32:54 +03:00
Lasse Öörni
341f2d9b48 Normalize slash / backslash when AnimationController queries for existence of an animation state. Closes #1537. 2016-08-24 17:32:21 +03:00
Lasse Öörni
bc8074a6f5 Added SetProjection() to camera, which sets custom projection matrix. This is reset by modifying any of the standard projection parameters (farClip, FOV etc.) Make sure camera's actual far & near clip are based on the projection matrix. 2016-08-24 00:12:04 +03:00
Lasse Öörni
871e52fadd Base frustum calculation on the projection matrix. 2016-08-23 18:58:26 +03:00
Lumak
3af3c2b695 fixed channelIndices[] indexing in ExpandAnimatedChannelKeys() func.
-and removed dbg dump code
2016-08-22 21:48:39 -07:00
Lasse Öörni
48cd15bc5a Store camera projection matrix as API-independent and convert as necessary (preparation for allowing the user to define a custom projection matrix.) Camera GetProjection() API changed; GetGPUProjection() is now used to get the API-specific projection for use as a shader parameter. 2016-08-23 01:34:06 +03:00
Lasse Öörni
dc2acfdf6e Minor typo, code convention and whitespace fixes. 2016-08-22 21:32:50 +03:00
Lumak
9636bba26d corrected copying scalingkey in ExpandAnimatedChannelKeys func. 2016-08-22 08:59:41 -07:00
Lumak
501dc3b364 max compile error fix 2016-08-22 07:58:25 -07:00
Lumak
dbd6465169 added assetimporter feature to suppress $fbx nodes 2016-08-22 07:34:43 -07:00
urho3d-travis-ci
2ef87e27b6 Travis CI: API documentation update at 2016-08-20 15:46:10 UTC.
[ci package]

Commit: bef8df21bb

Message: Support defining neighbor terrains to avoid LOD level discontinuities at the edges.
2016-08-20 15:46:10 +00:00
Lasse Öörni
bef8df21bb Support defining neighbor terrains to avoid LOD level discontinuities at the edges. 2016-08-20 18:33:49 +03:00
Lasse Öörni
98a3c8d49a Remove Abs() from NinjaSnowWar & CharacterDemo ground contact handling to prove that we can check for normals pointing up to detect ground. 2016-08-17 23:52:13 +03:00
Lasse Öörni
d3cc0118e8 Handle flipping of normals in collision event sending if body pointers were swapped. Do not discard contact results from the "other" manifold, rather concatenate them into the same collision event. Thanks to Enhex for highlighting the issue. 2016-08-17 23:45:11 +03:00
Yao Wei Tjong 姚伟忠
ecfa732d52 Workaround GCC issue producing shared lib containing undefined symbol.
Close #1519.
2016-08-17 16:58:57 +08:00
Lasse Öörni
9f3e5e9cbb Squashed commit of the following:
commit da349be28508316a690086f5f8cec4be80d4a0a9
Author: Lasse Öörni <loorni@gmail.com>
Date:   Tue Aug 16 21:40:50 2016 +0300

    Convert mutant textures to .jpg to conserve repository size.

commit 086bfd662631df30bbad033b8be967b04db44f0b
Merge: 84e5da6 d135d76
Author: Lasse Öörni <loorni@gmail.com>
Date:   Tue Aug 16 21:38:44 2016 +0300

    Merge remote-tracking branch 'Lumak/master'

commit d135d760460e1bc925b1a3ea6a14a9d7ed5e8283
Author: Lumak <lumak5309@gmail.com>
Date:   Tue Aug 16 10:01:53 2016 -0700

    replaced char model w/ mutant model in 18 char demo lua,

commit 9255fd76e5393b636f2c32d33dce99c00caa555a
Author: Lumak <lumak5309@gmail.com>
Date:   Mon Aug 15 16:08:39 2016 -0700

    replaced jack model w/ mutant model in 18 character demo
2016-08-16 21:45:17 +03:00
urho3d-travis-ci
84e5da6155 Travis CI: API documentation update at 2016-08-16 17:41:26 UTC.
[ci package]

Commit: d2abcc89a6

Message: Add brief documentation section on physical light values.
2016-08-16 17:41:26 +00:00
Lasse Öörni
d839b2afb8 Minor attribute order and name tweak for the editor. 2016-08-16 19:57:44 +03:00
Lasse Öörni
291b33df99 Squashed commit of the following:
commit c2f7ab8735bed357555bed7a901f02372cdd5be0
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Aug 16 13:46:34 2016 +0100

    Physical based light values

commit 60f87b92a85635c20200d1bff16432e6f4a01e7c
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Aug 16 10:50:45 2016 +0100

    removed unused share code and fixes spacing

commit 04a6961576ba1034d32b1abcf5cd2dab6599e9d4
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Aug 13 15:47:19 2016 +0100

    cleaned up naming a little

commit 7742eebcb51506c338c7bc93dd9fe683ca7c7293
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Aug 13 15:43:32 2016 +0100

    Made light temperature calculate outside of the shaders, and optional

commit ff784e3af0a23838ac932a1c54ca508687f1ca78
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Aug 12 22:40:06 2016 +0100

    Added AS binding

commit d96634a5af41a230d481f13aaed444bbeaa285bf
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Aug 12 22:25:17 2016 +0100

    Added light temputure
2016-08-16 19:43:27 +03:00
urho3d-travis-ci
6b4825d798 Travis CI: API documentation update at 2016-08-16 11:54:58 UTC.
[ci package]

Commit: 5ce39a2955

Message: Support setting a custom size for the UI root element (UI::SetCustomSize()) instead of always auto-resizing according to window size. When renderui renderpath command is used, use the current viewport size for UI rendering projection matrix to avoid distortion. If UI root element is smaller than the screen, apply wrapping in GetElementAt(), with the assumption that a copy is being rendered next to it. Related to #1514.
2016-08-16 11:54:58 +00:00
Lasse Öörni
5ce39a2955 Support setting a custom size for the UI root element (UI::SetCustomSize()) instead of always auto-resizing according to window size. When "renderui" renderpath command is used, use the current viewport size for UI rendering projection matrix to avoid distortion. If UI root element is smaller than the screen, apply wrapping in GetElementAt(), with the assumption that a copy is being rendered next to it. Related to #1514. 2016-08-16 14:43:27 +03:00
Lasse Öörni
9bbec4b797 Explain why normal offset is not saved for materials. Closes #1518. 2016-08-14 16:22:53 +03:00
Lasse Öörni
7b5da6669f Skip adding a deferred light volume batch when the light has low 8 bits of lightmask cleared; it would not have effect due to the stencil test. Skip shadow map render when there are no forward & deferred batches using it. 2016-08-13 22:56:48 +03:00
Lasse Öörni
9cb40e239f Minor additions / changes to the UI documentation page. 2016-08-13 19:23:47 +03:00
urho3d-travis-ci
4e6d9fb4f9 Travis CI: API documentation update at 2016-08-13 13:53:42 UTC.
[ci package]

Commit: fa7db658bc

Message: Start porting notes section from 1.6 to current master.
2016-08-13 13:53:42 +00:00
Lasse Öörni
2c8ed38a65 Capitalize CrowdAgent enum attributes for consistency with other components. Loading is case-insensitive so this does not break existing scenes. 2016-08-13 16:26:20 +03:00
Lasse Öörni
3fe5024cf7 Remove deprecated autoRemove bool from SoundSource. Replace with a more generic AutoRemoveMode enum which is now used by both SoundSource & ParticleEmitter. 2016-08-13 16:25:16 +03:00
Lasse Öörni
a2d86f1a59 Get screenshot as RGBA on OpenGL ES to fix Android black screenshot. 2016-08-12 00:06:39 +03:00
Lasse Öörni
a76fc0a316 Undefine GetObject in TileMapLayer2D.h to prevent it getting confused with Win32 API function define. To help, the header should be included after Windows.h is included. Related to #1512. 2016-08-10 17:59:11 +03:00
Lasse Öörni
0991c8e078 Ensure node's components are properly marked for network update in case node is late added to the scene. Make it impossible for a NetworkState to exist without properly allocated currentValues & previousValues. Fix erroneous comment in C++ version of SceneReplication sample. Code cleanup & minor optimization. Closes #1511. 2016-08-09 22:38:35 +03:00
Lasse Öörni
2f25c3b98d Add note to discourage use of AddComponent(). Prevent attempting to assign model resource on StaticModel / AnimatedModel when no node set. Closes #1510. 2016-08-09 15:15:12 +03:00
Lasse Öörni
f89696e83f Fix FileSystem.cpp on Android to not use the removed string + char operator. 2016-08-07 18:18:28 +03:00
Lasse Öörni
939e7c9fd3 Revert "String + number operator". Remove String + operator with char parameter to prevent accidental truncation and replace with string literal concatenation where needed.
This reverts commit fafd921f32.
2016-08-07 18:18:27 +03:00
Yao Wei Tjong 姚伟忠
b21ff1895e Fix overlinking of EGL library in FindVideoCore.cmake module.
Remove hardcoding of indirect dependency libraries list in the FindUrho3D.cmake module. Instead we now rely on the linker to find those indirect dependencies automatically with our hint via "-runpath-link" linker flag, especially when cross-compiling.
Also setup GLESv2 (and GLESv1_CM) for Raspberry-Pi in the same manner as generic ARM and Android platforms.
2016-08-07 18:22:46 +08:00
urho3d-travis-ci
b856bfbcd0 Travis CI: API documentation update at 2016-08-06 15:39:52 UTC.
[ci package]

Commit: a44c0a7a43

Message: Capitalization & other minor code style edits to the SDL raw event sending. Sync contributor credits.
2016-08-06 15:39:52 +00:00
Lasse Öörni
a44c0a7a43 Capitalization & other minor code style edits to the SDL raw event sending. Sync contributor credits. 2016-08-06 18:24:52 +03:00
Rokas Kupstys
d48c4120a1 E_INPUTBEGIN, E_INPUTEND, E_SDLRAWINPUT 2016-08-06 15:47:40 +03:00
Yao Wei Tjong 姚伟忠
ffa3a4bfac Revert back to use sprintf() function in the ResourceCache class.
The more secure snprintf() function is not universally available.
2016-08-06 00:00:37 +08:00
Yao Wei Tjong 姚伟忠
5419f37a60 Realign the new generic ARM "platform" name with the 1.6 changelog. 2016-08-05 19:54:06 +08:00
Yao Wei Tjong 姚伟忠
87bee872e8 Add extra linker flags to make 64-bit ARM cross-compiling possible.
When cross-compiling we have already defined '--sysroot' to find the direct library dependencies. However when a shared library has its own dependencies (DT_NEEDED) then we need to supply extra linker flags to help the linker to find those indirect library dependecies in the sysroot.
Actually we also had this problem for 32-bit ARM cross-compiling, but we cheated in the earlier CI build jobs by using Linaro/Raspbian compiler toolchain. Somehow the Raspbian's linker simply "ignores" those indirect library dependencies or it uses other mean to locate them (but I doubt that), and so it does not have linker issues with libreadline.so (depends on tinfo), libGLESv2.so (depends on glapi), etc. The other ARM compiler toolchains from Linaro seem to be more strict in this regard. Most likely the raspbian's linker is a gold linker.
This commit could also potentially fix a known issue in our FindUrho3D.cmake module where we have to hardcode the library dependencies that libUrho3D.so in turn depends on (to be investigated later).
2016-08-05 18:41:52 +08:00
urho3d-travis-ci
264f2368f9 Travis CI: API documentation update at 2016-08-05 09:56:08 UTC.
[ci package]

Commit: b99f652892

Message: Minor refactoring on the event profiler subsystem.
2016-08-05 09:56:08 +00:00
Yao Wei Tjong 姚伟忠
b99f652892 Minor refactoring on the event profiler subsystem. 2016-08-05 17:43:30 +08:00
Lasse Öörni
91f4489e07 Fix hardwareShadowSupport returning false on OpenGL, which would make it impossible to switch to 1-sample shadow mode. However, deliberately disable 1-sample mode from mobile NinjaSnowWar to achieve similar quality to desktops. 2016-08-05 00:35:41 +03:00
Lasse Öörni
7a16f9ca66 Clarify use of ScreenToWorldPoint(). Closes #1504. 2016-08-04 15:19:58 +03:00
urho3d-travis-ci
64f90dfc5d Travis CI: API documentation update at 2016-08-04 09:43:19 UTC.
[ci package]

Commit: 5e0e53aa87

Message: Add feature to changelog.
2016-08-04 09:43:19 +00:00
Lasse Öörni
8c7c34ac4d Configurable base in StringUtils ToInt & ToUInt to allow parsing hexadecimal. 2016-08-04 12:01:17 +03:00
Lasse Öörni
1746eed620 Add URHO3D_API specifier to FontGlyph struct. 2016-08-04 10:59:32 +03:00
Aliaksandr Kryvashein
be308e67c2 Fix "copy-paste" error 2016-08-03 20:37:43 +03:00
Mike3D
ef6284c938 Fixed mouse mode for sample #36 [ci skip] 2016-08-03 08:15:34 +02:00
Lasse Öörni
97d1e7d44e Prevent dependency of Civetweb from pthread library on recent MinGW versions. 2016-08-02 23:37:00 +03:00
Yao Wei Tjong 姚伟忠
f9b23104dd Fix Mir and Wayland auto-detection to also check on EGL. 2016-08-03 00:16:25 +08:00
Yao Wei Tjong 姚伟忠
576b6ea7cf Better multiarch support in auto-detection.
This should also solve the problem with cross-compiling other target triplets as there is no more hardcoding.
2016-08-03 00:16:25 +08:00
Yao Wei Tjong 姚伟忠
7c90c2c0ec Simplify command to detect predefined macros of the chosen compiler.
Add new CMake module for detecting host capability.
2016-08-03 00:16:23 +08:00
Anatoly Sennov
886d55c4bc Made JSONValue.get_size() const 2016-08-01 10:28:08 +03:00
Lasse Öörni
fe3b93080c Further style edits. Only delete the collisionConfiguration in PhysicsWorld destructor if it was created in the constructor, and not specified by the override config. 2016-07-31 20:46:29 +03:00
Lasse Öörni
13ec83ad5f Merge remote-tracking branch 'feltech/custom_physics' 2016-07-31 20:24:02 +03:00
David Feltell
f9d815f551 Use 0 rather than NULL to comply with Urho3D style. 2016-07-30 17:19:45 +01:00
David Feltell
4418919180 Allow custom collision shapes + algorithms.
* Add static `config` variable to `PhysicsWorld`, allowing overrides to
be set prior to construction - currently just for the
`btCollisionConfiguration`.
* Add protected member function to `CollisionShape` to allow for
configuring custom collision shapes.
2016-07-30 16:33:18 +01:00
urho3d-travis-ci
f7266d27b4 Travis CI: API documentation update at 2016-07-30 13:35:42 UTC.
[ci package]

Commit: 34ddcdc294

Message: Component reorder in editor. Fix attribute inspector not updating when nodes are added to e.g. StaticModelGroup via dragging. Clean up reorder related code. Set Urho icon as window icon in the editor. Closes #1463.
2016-07-30 13:35:42 +00:00
Lasse Öörni
34ddcdc294 Component reorder in editor. Fix attribute inspector not updating when nodes are added to e.g. StaticModelGroup via dragging. Clean up reorder related code. Set Urho icon as window icon in the editor. Closes #1463. 2016-07-30 16:24:14 +03:00
urho3d-travis-ci
a3c2835fa2 Travis CI: API documentation update at 2016-07-29 21:13:52 UTC.
[ci package]

Commit: b3e492e18c

Message: Scene node and UI element reordering (within the same parent) by Ctrl-dragging. Closes #1088. Expose Node::SetID() in script, as it was necessary for this, though not recommended to be called.
2016-07-29 21:13:52 +00:00
Lasse Öörni
b3e492e18c Scene node and UI element reordering (within the same parent) by Ctrl-dragging. Closes #1088. Expose Node::SetID() in script, as it was necessary for this, though not recommended to be called. 2016-07-30 00:02:49 +03:00
Lasse Öörni
812afaeb8f Fix PBR material demo to operate similarly on AS, Lua, C++. Remove forcing of alpha to 1 from Zone::SetAmbientColor() & Zone::SetFogColor(). Change "Enable HDR" to "HDR rendering" in editor settings dialog for consistency. 2016-07-29 16:44:57 +03:00
urho3d-travis-ci
4eab3d177b Travis CI: API documentation update at 2016-07-28 23:19:06 UTC.
[ci package]

Commit: 2b0d4362ff

Message: Script bindings for reading/writing 64 bit values through Deserializer/Serializer.
2016-07-28 23:19:06 +00:00
Lasse Öörni
2b0d4362ff Script bindings for reading/writing 64 bit values through Deserializer/Serializer. 2016-07-29 02:06:08 +03:00
Loic Blot
694d637fd9 Add int64_t and uint64_t support for Serializer/Deserializer 2016-07-28 22:39:36 +02:00
Eugene Kozlov
014ef043ef Make HashMap::TryGetValue constant. 2016-07-25 23:26:42 +03:00
urho3d-travis-ci
79c7ded061 Travis CI: API documentation update at 2016-07-25 19:39:39 UTC.
[ci package]

Commit: 56ba0def78

Message: Add Graphics::SetDither(). Closes #1489.
2016-07-25 19:39:39 +00:00
Lasse Öörni
56ba0def78 Add Graphics::SetDither(). Closes #1489. 2016-07-25 19:03:43 +03:00
Lasse Öörni
786598f08d Merge remote-tracking branch '1vanK/master' 2016-07-25 18:37:40 +03:00
Lasse Öörni
c647ae7dfa Put zone texture to environment texture unit on OpenGL ES. Fix web build including texture unit mappings which are not included in the shaders. 2016-07-25 17:18:08 +03:00
1vanK
fafd921f32 String + number operator 2016-07-25 16:23:43 +03:00
Lasse Öörni
77cabf9bff Remove "PS" from Roughness & Metallic uniform names. 2016-07-25 01:39:15 +03:00
Lasse Öörni
dfd8939840 Squashed commit of the following:
commit 5de699c5399847dfad99a58323590f88436e1f68
Merge: d80b1d9 97c5fbf
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Sun Jul 24 18:28:50 2016 +0100

    Merge pull request #4 from hdunderscore/tweaks2

    Tweaks2

commit 97c5fbfe515a1c1ae86b059d86694a9f2c053ce6
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Sun Jul 24 22:50:11 2016 +1000

    - Removed inconsistency with roughness input.
    - Switched to a different mip map selection method for the IBL.
    - Extended the angelscript PBR sample to include a slider for ambient HDR scaling.
    - Removed an extra diffuse factor in lighting output.

commit d80b1d9b3c00a04e837324af1546f407311803fd
Merge: 53603fd 7f77574
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Jul 22 23:00:59 2016 +0100

    Merge branch 'pulls/2'

commit 7f775749a9229f5b8f1d313a2c72a88acc001b11
Merge: 53603fd b339da6
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Jul 22 22:57:26 2016 +0100

    Tweaks

    # Conflicts:
    #	bin/CoreData/Shaders/GLSL/Lighting.glsl
    #	bin/CoreData/Shaders/HLSL/Lighting.hlsl
    #	bin/Data/Scenes/PBRExample.xml

commit 53603fd7165fb90c485d6fd85e2d4c41e3e86213
Merge: f88b484 a21746f
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Wed Jul 20 22:52:41 2016 +0100

    Merge remote-tracking branch 'origin/master'

commit f88b48441965d5dbcee8667282e879c93bc31577
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Wed Jul 20 22:49:43 2016 +0100

    Fixed Inverse Square falloff and correction mistake with output color

commit a21746f5e2b540e4dae952e181d000dd8e8101f4
Merge: 89688e8 c33f75a
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Wed Jul 20 22:28:17 2016 +0100

    Merge pull request #3 from 1vanK/master

    Modify PBR example

commit c33f75a78369760ace1f817e9c8ed288a0418a30
Author: 1vanK <1vanK@users.noreply.github.com>
Date:   Thu Jul 21 00:16:05 2016 +0300

    Labels

commit efa757e0ee39daf4a4e03714828677e79ae5e4e2
Author: 1vanK <1vanK@users.noreply.github.com>
Date:   Wed Jul 20 17:14:06 2016 +0300

    Dynamic material in PBR example

commit b339da6fc992e49d1e4139d836654c8ce6befa24
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Thu Jul 21 00:09:47 2016 +1000

    - Adjusted light falloff.
    - Enabled HDR rendering in PBRMaterials.cpp

commit b233da5ccad3c1898a1f459bbc59459be525a16f
Author: 1vanK <1vanK@users.noreply.github.com>
Date:   Wed Jul 20 14:25:59 2016 +0300

    Remove unnecessary texture

commit ede652fcf39135350725c7eda5c6c9324ffb0c0a
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 15:49:27 2016 +1000

    Added missing xml's.

commit fd1b187f09f4478bd32375e4ca13900b6ec59f49
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 15:13:47 2016 +1000

    Minor fix to diffuse ibl calculation.

commit 1cee2d27e8abd69fe6f77d41e2a0d27dcac8624b
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 10:55:58 2016 +1000

    Changed the hdr scaling to be more versatile.

commit 35623b758b1e199116b1ba9594afeb3d1ecef7ba
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 09:27:46 2016 +1000

    - Fixed gamma correction
    - Added fake hdr to IBL and skybox which can be controlled via the zone ambient colour alpha channel.

commit 89688e81424eea030e5329cbd9d59b094ee02183
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 21:17:30 2016 +0100

    Renived unlicenced files

commit 70f39b0a40b50f317aef101ce29950185a2ee7e3
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 14:21:38 2016 +0100

    Removed gamma correction from PBR demo

commit 451f45c4d2ed360179640af31eabdf74b3673c6f
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 14:20:32 2016 +0100

    Added legacy BRDF for GL

commit 87316006297df9dda94178f7ab81f663862553a8
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 14:17:02 2016 +0100

    Added diffuse ibl and legacy features

commit 9f0fb0eaca4a53e49caf65661edfb9d85fe1b880
Merge: 1883a4c 4230e43
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 10:36:08 2016 +0100

    Merge remote-tracking branch 'origin/master'

commit 1883a4c42f228306dd723098869281a7025b5987
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 10:34:47 2016 +0100

    Changed model on the demo scene

commit 4230e4328d6ef47808a85f1b231f5116d8b99437
Merge: 900f203 607ab5c
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Tue Jul 19 00:07:17 2016 +0100

    Merge pull request #1 from Modanung/typo-fix

    Changed n to m in PBR example scene

commit 607ab5c414749f3d2dd85f2b7c441525b94a8fa3
Author: Frode Lindeijer <frode@lindeijer.nl>
Date:   Tue Jul 19 00:41:34 2016 +0200

    Changed n to m in PBR example scene

commit 900f20316da833868e6274aa7e7de01502a2a357
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Mon Jul 18 22:19:17 2016 +0100

    Fixed reverted changes

commit 49cc201a1e0956db82b1103d23b3a4059cacd374
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Mon Jul 18 21:58:36 2016 +0100

    PBR Rewrite

commit 262e18c71c08a5bade990f6ead0fd356732c38ee
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Mon Jul 18 21:48:28 2016 +0100

    Complete rewrite of PBR

commit b97469b2ab73deca0613d1963500f223a5956bf9
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sun Jul 17 09:49:52 2016 +0100

    Dissabled nolonger needed post processed gamma correction

commit 6e4ec5b4cdaba58678a21b8a90138eb2b8a5e9d4
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sun Jul 17 09:48:53 2016 +0100

    Fixed rendering issue in DirectX

commit fd57ed2bea5caad1fff65e35abfe65b227ddb13a
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 21:39:48 2016 +0100

    Fixed Spelling errors

commit 3dad639d48aee0d4d3a17ecd8d35f732b796d938
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 21:35:09 2016 +0100

    Made GGX distrabution physically correct

commit ffda95b2df1e042d8cef611add06989c5a0fd862
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 21:20:20 2016 +0100

    Removed redundent textures

commit 283f389951b0e29a2f3a6b445dfc3cab0e59920c
Merge: 7bbb0f6 ca6d6e5
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 19:34:26 2016 +0100

    Merge branch 'master' of https://github.com/urho3d/Urho3D

commit 7bbb0f68bb1c8f0fa5ccf39475a5997e82c18b62
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 18:57:49 2016 +0100

    PBR Gamma correctoin, and small prefernace changes to the demo scene
2016-07-25 00:54:21 +03:00
Lasse Öörni
63f71ab874 Remove assert from StringUtils ToVectorVariant() function and return empty variant in error case. Closes #1485. Convert assert in Log::SetLevel() to error logging, and remove assert from Log::Write(). 2016-07-23 19:00:31 +03:00
urho3d-travis-ci
896787c9dc Travis CI: API documentation update at 2016-07-23 14:52:19 UTC.
[ci package]

Commit: d506ab4288

Message: Add SetFontSize() to Text & Text3D. Fix comments of SetFont() referring to nonexistent parameter. Closes #1484.
2016-07-23 14:52:19 +00:00
Lasse Öörni
d506ab4288 Add SetFontSize() to Text & Text3D. Fix comments of SetFont() referring to nonexistent parameter. Closes #1484. 2016-07-23 17:16:33 +03:00
Lasse Öörni
515dfa760c Fix backbuffer not getting cleared in the situation where just the UI and rendertexture views are being rendered. (http://urho3d.prophpbb.com/topic2238.html) 2016-07-22 20:01:28 +03:00
Lasse Öörni
287c520810 Fix wrong UV index in Drawable OBJ export. Closes #1483. 2016-07-22 16:58:31 +03:00
Lasse Öörni
995fbd4213 Add public accessors for View's view rectangle & view dimensions. Explain that Viewport may return a zero rect, which means to dynamically use the rendertarget's full size. Add todo's related to Viewport::WorldToScreenPoint() && Viewport::ScreenToWorldPoint() potentially operating incorrectly for texture rendertargets. Closes #1482. 2016-07-22 00:35:15 +03:00
Yao Wei Tjong 姚伟忠
20da34f21b Auto-generate Urho3DAll.h header file. Close #1472. 2016-07-18 22:40:45 +08:00
Yao Wei Tjong 姚伟忠
c675421464 Normal comment to doxygen comment using regex + manual correction.
cd Source/Urho3D && git grep -lP '^\s+//[^/]+\.^M*$' -- '*.h' |xargs perl -pi -e 's|^(\s+)//([^/]+\.^M*)$|$1///$2|g'
Ctrl+M is one character.
2016-07-18 22:01:10 +08:00
Mike3D
238f09c53d Fixed TileMap2D::PositionToTileIndex() and use it in tile map sample 2016-07-18 13:18:57 +02:00
tommy3
808fd992c6 Normal comment to doxygen comment. 2016-07-16 15:30:09 +02:00
tommy3
6fbe9537f4 Normal comment to doxygen comment. 2016-07-16 14:57:28 +02:00
urho3d-travis-ci
d1802a9092 Travis CI: API documentation update at 2016-07-15 07:58:43 UTC.
[ci package]

Commit: 761afff122

Message: Fix dir manipulation off by one error in Android DirExists() function. Closes #1470.
2016-07-15 07:58:43 +00:00
Lasse Öörni
761afff122 Fix dir manipulation off by one error in Android DirExists() function. Closes #1470. 2016-07-15 09:26:19 +03:00
Lasse Öörni
af00713e12 Add Clone() to ParticleEffect & ParticleEffect2D. Closes #1469. 2016-07-15 01:32:33 +03:00
Yusuf Umar
b24bcb8928 No longer need to passing camera position to direction billboard vertex buffer because Urho3D already has default uniform to do the job. 2016-07-13 18:54:18 +07:00
Yao Wei Tjong 姚伟忠
fd9db884b4 Add template version of UIElement::GetChild() methods. 2016-07-11 19:17:52 +08:00
Yao Wei Tjong 姚伟忠
5e8ee79f2b Partial revert - use Object as base but keep lifetime management logic.
Avoid duplicate reference of "window" UI-element.
2016-07-11 15:25:54 +08:00
Lasse Öörni
9db4af58e5 Simplify returning a new MessageBox to AngelScript. Fix crash due to multiple handling of MessageBox acknowledge when modal status is manually reset. 2016-07-10 22:01:58 +03:00
urho3d-travis-ci
569314697b Travis CI: API documentation update at 2016-07-10 16:27:23 UTC.
[ci package]

Commit: 4485cb8fa4

Message: Remove unnecessary include.
2016-07-10 16:27:23 +00:00
Lasse Öörni
4485cb8fa4 Remove unnecessary include. 2016-07-10 19:10:22 +03:00
Lasse Öörni
c38d29a20c Make MessageBox a UIElement subclass for automatic lifetime management through the UI hierarchy. (Use MessageBox:new in Lua for safe operation.) Remove the "test all factories" feature in Engine class (Debug mode) since it would leave a MessageBox in the UI. Use UI root size for centering the MessageBox instead of Graphics resolution, since the UI might be scaled. Closes #1439. Closes #634. 2016-07-10 19:03:23 +03:00
fredakilla
10449971b9 get body properties when body exists 2016-07-08 21:18:11 +08:00
Lasse Öörni
96d256ed16 Refactor File internal operations to support package files also on Android. Closes #1455. 2016-07-07 15:25:46 +03:00
Lasse Öörni
28ed7c1706 Remove ambiguous WeakPtr initialization from Graphics class. Closes #1459. 2016-07-06 17:36:41 +03:00
Lasse Öörni
2c2c6d26b1 Merge branch 'api-agnostic-headers' 2016-07-06 13:51:17 +03:00
Lasse Öörni
28ad5d5dbd Fix ambiguous operations when C++11 Urho3D features are enabled by using WeakPtr default constructor instead. 2016-07-06 01:39:28 +03:00
Eugene Kozlov
c4424eb514 Make Vector::Buffer() and PODVector::Buffer() public. 2016-07-05 23:01:16 +03:00
Eugene Kozlov
7546a47497 Add initializer list constructor for PODVector. 2016-07-05 23:01:16 +03:00
Eugene Kozlov
5be488233a Add constructors from nullptr for SharedPtr and WeakPtr. 2016-07-05 23:01:16 +03:00
Lasse Öörni
46db9d1e07 Fix mip chain not being complete to 1x1, which could result in black textures on GLES2. 2016-07-05 14:50:20 +03:00
aster2013
270eabd226 Fix #1456. 2016-07-05 15:51:09 +08:00
urho3d-travis-ci
f99577523d Travis CI: API documentation update at 2016-07-04 23:28:16 UTC.
[ci package]

Commit: 03c95a1519

Message: Add contributor credit & minor edit.
2016-07-04 23:28:16 +00:00
Lasse Öörni
03c95a1519 Add contributor credit & minor edit. 2016-07-05 02:01:33 +03:00
Lasse Öörni
c611d4a069 Merge remote-tracking branch 'fredakilla/box2d' 2016-07-05 01:54:25 +03:00
Lasse Öörni
df2f7b06a0 When Button sends the Released event, make sure it's yet hovering if the mouse was released on top of it. See issue #1453. 2016-07-04 22:50:40 +03:00
fredakilla
39344c41fe Add b2Contact ptr to E_PHYSICSBEGINCONTACT2D and E_PHYSICSENDCONTACT2D events 2016-07-04 21:47:36 +02:00
Lasse Öörni
ecd3ab2f45 When an autolocalized Text is saved, make sure the stringId is saved instead of the localized text. Make sure the text gets localized even if autoLocalizable & text attributes are in swapped order in the UI xml. Fix Text3D attributes being AM_FILE mode instead of AM_DEFAULT for net replication. Closes #1451. 2016-07-04 20:49:09 +03:00
Lasse Öörni
4e198c2412 Fix wrong return value in HashMap Front() & Back(). 2016-07-04 18:33:38 +03:00
Lasse Öörni
fd5bac385a Since the SDL window is not API-specific, move it into Graphics from GraphicsImpl to simplify code. 2016-07-01 10:17:29 +03:00
Lasse Öörni
eb104906aa Remove API-specific Graphics class headers and code duplication. Closes #1422. 2016-07-01 09:38:39 +03:00
Yao Wei Tjong 姚伟忠
fb881c3360 Use CMake to auto-detect and define _TIMESPEC_DEFINED as necessary. 2016-06-30 21:01:41 +08:00
Lasse Öörni
bdce4b3dba Move API-specific Graphics class member variables to GraphicsImpl. Rename WindowMoved & WindowResized to OnWindow.. to match convention used elsewhere (eg. OnNodeSet) Change windowIcon_ member to WeakPtr to ensure safety in later access. Minor class comment fixes. 2016-06-30 02:11:19 +03:00
TheComet
7031ae8799 fixes #1444 2016-06-29 19:18:14 +02:00
Lasse Öörni
51b0a16f9a Remove API-specific RenderSurface class headers and RenderSurface code duplication. 2016-06-27 22:42:02 +03:00
Lasse Öörni
46b9a90fb1 Remove API-specific Texture subclass headers and code duplication for loading & SetSize(). 2016-06-26 23:26:14 +03:00
Lasse Öörni
26342ce69e Remove code duplication from checking max. mip levels on OpenGL. 2016-06-26 21:12:20 +03:00
Lasse Öörni
f452a16f2d Initial Texture class refactoring. Get rid of API-specific Texture header. 2016-06-26 20:35:51 +03:00
Lasse Öörni
11b1e2cc2d Shadow batches don't need a zone, since they shouldn't use ambient color or fogging settings. This also fixes a bug with erroneous fog settings when OpenGL constant buffers are used. 2016-06-25 19:52:17 +03:00
Lasse Öörni
6c77b75813 Cleanup ShaderParameter related code. 2016-06-25 17:58:37 +03:00
Lasse Öörni
f8d636426c Make ShaderVariation class header API-agnostic. 2016-06-25 16:00:44 +03:00
Lasse Öörni
9b51baa445 Separate ConstantBuffer to API-independent and -specific implementations, and unify the header. Add dummy D3D9 constant buffer implementation (that only logs error if used) so that user will not get link errors if attempting to use. 2016-06-24 20:50:05 +03:00
Lasse Öörni
6775038a44 Eliminate more duplication of API-independent index / vertex buffer code. 2016-06-24 15:15:02 +03:00
Lasse Öörni
db7f3bb56a Fix dynamic flag not being set for D3D9 vertex buffer. 2016-06-24 14:56:12 +03:00
Lasse Öörni
51b026f33d Unify IndexBuffer & VertexBuffer headers for all APIs. Move API-independent parts of vertex / index buffers to their own implementation files to eliminate code duplication. 2016-06-24 14:30:55 +03:00
Lasse Öörni
1ba87dae4c Get rid of API-specific GPUObject class header & implementation. 2016-06-24 02:17:06 +03:00
Yao Wei Tjong 姚伟忠
35a616448a Merge commit 'a1a9ce7817286783347acfbcce94bfd659915b66' into master. 2016-06-23 22:05:25 +08:00
Yao Wei Tjong 姚伟忠
993e82f9ec Fix cross-compiling builds using X11 shared libraries. 2016-06-23 20:08:34 +08:00
urho3d-travis-ci
c88891fa6f Travis CI: API documentation update at 2016-06-23 12:02:08 UTC.
[ci package]

Commit: e8559b316a

Message: Add events for node/component being cloned. These are sent by their owning scene after the cloning process (along with all attributes set) is complete.
2016-06-23 12:02:08 +00:00
Lasse Öörni
e8559b316a Add events for node/component being cloned. These are sent by their owning scene after the cloning process (along with all attributes set) is complete. 2016-06-23 14:52:06 +03:00
Yao Wei Tjong 姚伟忠
2f4ed29be8 For CI - attempt to fix broken multiarch support in older CMake.
This should be a non-issue when we have migrated to CMake 3.2.3 (now under development in refactor-buildsystem branch).
2016-06-23 00:23:12 +08:00
Yao Wei Tjong 姚伟忠
fff8b782b1 Fix cross-compiling builds using readline shared library. 2016-06-22 18:06:21 +08:00
Lasse Öörni
489356a29f Cleanup editor debug icon code to not do constant resizes of billboardsets to zero and back, and to use fixed screen size mode to eliminate need for manual sizing. BillboardSet::SetNumBillboards() is no-op if count remains same. Fix BillboardSet fixed size bug when changing between ortho & perspective camera. Do not care to resize scratch buffer smaller if it's below 1MB. Add scratch buffer debug messages also to OpenGL Graphics class for consistency. Closes #1434. 2016-06-21 22:19:42 +03:00
urho3d-travis-ci
618fd25691 Travis CI: API documentation update at 2016-06-21 16:05:19 UTC.
[ci package]

Commit: 4279990ea8

Message: Minor fixes. Add script bindings and documentation for the new renderpath command.
2016-06-21 16:05:19 +00:00
Lasse Öörni
4279990ea8 Minor fixes. Add script bindings and documentation for the new renderpath command. 2016-06-21 18:54:57 +03:00
Franck Poulain
332fe215f6 SendEvent new renderpath command 2016-06-21 14:15:53 +02:00
Franck Poulain
bcac85a0ac Tabs to spaces 2016-06-20 14:12:44 +02:00
Franck Poulain
f0775adfbc Change View::FindNamedTexture() function to be public 2016-06-20 14:10:18 +02:00
urho3d-travis-ci
9f90bdd571 Travis CI: API documentation update at 2016-06-16 18:56:49 UTC.
[ci package]

Commit: dc74d3dbc0

Message: Remove commented out lines, add MarkNetworkUpdate() to SetUpdateInvisible().
2016-06-16 18:56:49 +00:00
Lasse Öörni
dc74d3dbc0 Remove commented out lines, add MarkNetworkUpdate() to SetUpdateInvisible(). 2016-06-16 21:47:28 +03:00
Yusuf Umar
a9f7703f74 Add update invisible parameter to RibbonTrail and use it on the samples. 2016-06-16 18:09:09 +07:00
urho3d-travis-ci
797d33da94 Travis CI: API documentation update at 2016-06-16 05:39:07 UTC.
[ci package]

Commit: 239c0265a0

Message: Fix a typo in RibbonTrail's attribute and other minor cleanups.
2016-06-16 05:39:08 +00:00
Yao Wei Tjong 姚伟忠
239c0265a0 Fix a typo in RibbonTrail's attribute and other minor cleanups. 2016-06-16 13:28:02 +08:00
urho3d-travis-ci
54143eba49 Travis CI: API documentation update at 2016-06-15 18:51:59 UTC.
[ci package]

Commit: 6d046d57c8

Message: More minor code, comment and tab-to-spaces changes. Use the more specific TrailPoint struct name instead of Point, and export it in case a derived class wants to manipulate them. Add RibbonTrail to documentation's drawable class list.
2016-06-15 18:51:59 +00:00
Lasse Öörni
6d046d57c8 More minor code, comment and tab-to-spaces changes. Use the more specific TrailPoint struct name instead of Point, and export it in case a derived class wants to manipulate them. Add RibbonTrail to documentation's drawable class list. 2016-06-15 21:16:28 +03:00
Yusuf Umar
1f7c5c8a59 Delete some debug leftovers and fix big index buffer size. 2016-06-15 21:16:27 +03:00
Lasse Öörni
f6d413aee4 Minor comment and code convention edits. 2016-06-15 21:14:59 +03:00
Yusuf Umar
f9e65027e3 Implementing RibbonTrail 2016-06-15 21:14:58 +03:00
urho3d-travis-ci
bb658965c2 Travis CI: API documentation update at 2016-06-14 18:51:53 UTC.
[ci package]

Commit: 27f40f15be

Message: Add contributor credit.
2016-06-14 18:51:53 +00:00
Eugene Kozlov
c92894d250 Add support of custom per-instance data in batches. 2016-06-13 18:06:38 +03:00
Yao Wei Tjong 姚伟忠
224320d6d0 Add missing include for iOS build. 2016-06-11 23:34:53 +08:00
Yao Wei Tjong 姚伟忠
a5b4512966 Reduce direct exposure to SDL headers as much as possible. 2016-06-11 21:58:22 +08:00
Yao Wei Tjong 姚伟忠
eff1cd46b9 Sort samples list, just for consistency sake. 2016-06-11 20:43:33 +08:00
Lasse Öörni
3b4b354d51 If targeting 60 fps or above on iOS, skip the framelimiter sleep loop, since it could cause running below 60 fps even if the frame was executed fast enough. 2016-06-11 15:12:32 +03:00
Yao Wei Tjong 姚伟忠
d0bcac5fe0 Ensure iPhoneOS and iPhoneSimulator use the same code path.
This commit should also fix the issue reported in issue #1369.
2016-06-11 13:11:38 +08:00
Lasse Öörni
576216c3c2 Fix MOBILE_GRAPHICS define not being defined on iOS, which would break shadow rendering. 2016-06-11 04:31:36 +03:00
Lasse Öörni
f4f3ffde76 Improve comment for Renderer::SetDynamicInstancing(). 2016-06-11 03:48:14 +03:00
Lasse Öörni
391d93ced0 Use nanosleep instead of usleep. Closes #1413. 2016-06-10 23:51:09 +03:00
Loic Blot
ef949533c6 Update to SQLite 3.13.0 2016-06-10 22:04:35 +03:00
Yao Wei Tjong 姚伟忠
1243d8bcda Regex replace all the uppercase key bindings with their constants. 2016-06-11 02:56:39 +08:00
Lasse Öörni
8710de6197 Fix pause in NinjaSnowWar. Fix keycodes defined in screen joystick to conform to SDL keycodes (lowercase) 2016-06-10 20:30:40 +03:00
Yao Wei Tjong 姚伟忠
3ab69da3af Use __ANDROID__ compiler define consistently. 2016-06-10 20:28:07 +08:00
Yao Wei Tjong 姚伟忠
991b0c5986 Undefine first before redefine to suppress the compilation warnings. 2016-06-10 19:53:17 +08:00
Yao Wei Tjong 姚伟忠
5bdd519ce7 Another attempt to reenable AS wrapper for 64-bit ARM platform.
For CI - switch all the Android CI jobs to use Clang compiler toolchian instead of GCC compiler toolchain. The old GCC 4.9 is not able to handle C++11 standard for AS wrapper. Besides, the latest change log in Android NDK has marked GCC as deprecated and recommended developers to migrate to Clang.
2016-06-10 17:17:21 +08:00
Yao Wei Tjong 姚伟忠
64d975ba1a Add initial build support for generic ARM platform.
Add a new build option "ARM_ABI_FLAGS" for supplying additional ABI compiler flags when targeting generic arm.
Fix Linux build from using OpenGLES instead of GLEW, fix RPI build from using wrong OpenGLES library, fix iOS build from using arm-specific compiler flags directly which would cause problem in universal binary build containing iphonesimulator archs as well.
And other minor refactoring.
2016-06-10 17:17:21 +08:00
proller
0dc85f14a9 compile on arm arch with opengles2 2016-06-10 17:17:20 +08:00
Lasse Öörni
a1c458f28e Reduce amount of unnecessary Frustum::UpdatePlanes() calls. A default-constructed degenerate frustum no longer has its planes updated on construction, but instead the planes will remain in default-constructed state. 2016-06-10 02:09:50 +03:00
Lasse Öörni
d759a0e51b Call GainFocus() on Input initialization instead of just setting focusedThisFrame_ true. Fixes #1411. 2016-06-09 21:20:42 +03:00
Lasse Öörni
6033ffd116 Fix wrong bool check. 2016-06-09 20:02:57 +03:00
Lasse Öörni
7b18a9a8b2 Slider knob fixed size fix from Lumak. Closes #1412. 2016-06-09 18:47:38 +03:00
Yao Wei Tjong 姚伟忠
3afe44678c Set the compiler flags at the target level when enabling PCH.
We do not support disabling PCH per compilation unit anymore so we do not need to use custom compiler flags per compilation unit. Using this kind of configuration would result in unwanted target rebuild when the list of compilation unit gets changed due to new/deleted source files for the target in question.
2016-06-09 20:42:22 +08:00
Lasse Öörni
1535323815 Set default mobile shadow bias adjustments to ineffective since they no longer appear necessary. 2016-06-08 23:49:31 +03:00
Lasse Öörni
f36abeb57c Force highp for shadow related samplers, uniforms & varyings on GLES for better shadows on iOS. Note: may be incompatible for some mobile GPU's that don't support highp at all. 2016-06-08 21:30:31 +03:00
ArtemKulyk
cfec9a95bc fix for typo in UTF16 decoder 2016-06-07 18:41:07 +03:00
Lasse Öörni
0ed42d0f9d Fix letter accelerator keys not working. Closes #1403. 2016-06-06 11:01:35 +03:00
Yao Wei Tjong 姚伟忠
e260a3354c Revert back to temporarily disable AS wrapper for 64-bit ARM platform.
The earlier commit lacks the inclusion of logic to enable C++11 standard and boost preprocessor library. However, after locally tested it, it appears that Android NDK 4.9 is not able to able handle it. Need more time to experiment with it in another branch first.
[ci only: Android, OSX] [skip appveyor]
2016-06-05 23:55:55 +08:00
Yao Wei Tjong 姚伟忠
ccd9dac3c7 Also enable AS wrapper when targeting 64-bit ARM platform. 2016-06-05 22:42:01 +08:00
Yao Wei Tjong 姚伟忠
9345cff42e Remove custom memory adjustment as the default is set to 128 MB now. 2016-06-05 13:17:28 +08:00
Lasse Öörni
cc5761d09d Clean up the code to check for AS_MAX_PORTABILITY define so that it could also come from AS' own config. Minor typo fix. 2016-06-04 17:34:33 +03:00
Lasse Öörni
96451d891e Use the proper form of EMSCRIPTEN define throughout. 2016-06-04 12:33:02 +03:00
Lasse Öörni
fb508365af Fix logic for getting the script file name in web Urho3DPlayer in case arguments were already specified and the command line file is not used. 2016-06-04 12:26:36 +03:00
Lasse Öörni
f097224968 Avoid hardcoding the script file name on web platform Urho3DPlayer. Rather attempt to read from CommandLine.txt later once resources are initialized. Setup a default windowed resolution to match the executable web samples. 2016-06-04 00:21:54 +03:00
Lasse Öörni
98dfaf3c75 Add Boost Preprocessor library to Source/ThirdParty. Force C++11 for AngelScript / Emscripten combo. Default to CharacterDemo instead of NinjaSnowWar in Urho3DPlayer on Emscripten due to missing Network subsystem. 2016-06-02 20:55:52 +03:00
Lasse Öörni
0803320a9a Remove mention of AngelScript not being supported on Emscripten. Leave the generic call convention autohandle fix on at all times, since it doesn't hurt. Clarify CommandLine.txt not being able to be read on Emscripten. 2016-06-02 19:27:15 +03:00
Lasse Öörni
5e60325d5f Merge remote-tracking branch 'SirNate0/master' into emscripten-angelscript 2016-06-02 19:10:30 +03:00
urho3d-travis-ci
1cfe5f3967 Travis CI: API documentation update at 2016-06-01 19:15:40 UTC.
[ci package]

Commit: 37e3c8269d

Message: Added UIBatch::AddQuad overloads which allow defining a quad with arbitrary points & UVs, and optionally colors.
2016-06-01 19:15:40 +00:00
Lasse Öörni
37e3c8269d Added UIBatch::AddQuad overloads which allow defining a quad with arbitrary points & UVs, and optionally colors. 2016-06-01 22:03:58 +03:00
Lasse Öörni
a3023bf2b3 Add Lua binding for the new tile map type & add contributor credit. 2016-06-01 21:00:36 +03:00
Lasse Öörni
d278bd6a9a Merge remote-tracking branch 'tungsteen/master' 2016-06-01 20:36:11 +03:00
Yao Wei Tjong 姚伟忠
4b03614216 Minor documentation update to mark deprecated methods.
[ci only: master] [skip appveyor]
2016-06-01 23:35:58 +08:00
Lasse Öörni
31f608408d Minor documentation update on scene model. 2016-06-01 13:27:23 +03:00
Sergey Bosko
9c298beb54 Add O_HEXAGONAL type of 2D Map 2016-05-31 10:46:02 +02:00
nathan
618b37519a Fixed indentation of my change to Urho3DPlayer.cpp hardcoding NinjaSnowWar.as for the EMSCRIPTEN build. 2016-05-31 00:37:34 +02:00
nathan
30f9d91bdd Formatted stuff in a format more appropriate for Urho. See previous commit message for build instructions.
Note that I quadrupled the default emscripten memory size as I found the 32 MB was all but always too small.
2016-05-31 00:26:39 +02:00
nathan
d7b0604d93 Made Angelscript work on the Emscripten build. Not thoroughly tested!!!
-Has been tested by running Urho3DPlayer with the 12_PhysicsStressTest script
 (the file copied in place of NinjaSnowWar.as requested)
-built with "-std=gnu++14 -I/usr/include/boost" for the CMAKE_CXX_FLAGS
 and "-I/usr/include/boost" for the CMAKE_C_FLAGS.
  ** /usr/include/boost contains a simlink pointing to itself so that boost/
     preprocessor____ can be found
-Networking still doesn't work, so NinjaSnowWar shouldn't work
-Debug builds did not work for me: see http://urho3d.prophpbb.com/topic2151.html
-Defining FORCE_AS_PORTABLE can be used to force it to use the generic build
 with, for example, a gcc build (which should allow more apples-to-apples
 testing of the efficiency of the bindings)
-Discussion of this work originally at http://urho3d.prophpbb.com/topic2044.html
2016-05-30 22:32:48 +02:00
urho3d-travis-ci
0d4d9575cd Travis CI: API documentation update at 2016-05-30 17:58:08 UTC.
[ci package]

Commit: a794f9e59b

Message: Prefer key constants instead of ascii codes in keydown/keypress checks. (AngelScript & C++)
2016-05-30 17:58:08 +00:00
Lasse Öörni
a794f9e59b Prefer key constants instead of ascii codes in keydown/keypress checks. (AngelScript & C++) 2016-05-30 20:45:13 +03:00
Lasse Öörni
7b44ba098e Merge remote-tracking branch 'cosmy1/scancode-fix' 2016-05-30 20:08:12 +03:00
Lasse Öörni
a3a21a5c68 Merge remote-tracking branch 'cosmy1/escape-fix' 2016-05-30 20:07:59 +03:00
Lasse Öörni
ef212b9290 Fix BillboardSet & Text3D fixed screen size with multiple views. Remove unused variable. Fix potential bug with BillboardSet update LOD timer & fixed screen size (always force update) 2016-05-28 16:02:27 +03:00
1vanK
461a075501 Send elapsedTime to UI shader 2016-05-28 11:01:31 +03:00
cosmy
2c152977c9 Remove extra comment. 2016-05-28 02:30:09 +02:00
cosmy
945c231fd2 Use SDL character key constants. 2016-05-28 02:29:51 +02:00
cosmy
b057434bfa Make escape key name consistent between keycode and scancode. 2016-05-27 13:27:53 +02:00
Lasse Öörni
e6881956fa Fix erroneous wording in physics events. Node collision events aren't sent "to" nodes, rather "by" nodes. 2016-05-27 10:57:09 +03:00
Lasse Öörni
fce6c3162a More informative class description for RenderPath. 2016-05-27 10:42:53 +03:00
Lasse Öörni
6c5bda871f Only need to ensure stroke thickness doesn't go over font size, as negative values are already checked for. 2016-05-26 16:13:48 +03:00
Bengt Soderstrom
49727ce20c Text effect stroke thickness setter value is made absolute 2016-05-26 13:56:18 +02:00
Bengt Soderstrom
3d0ab6e2ca Stroke thickness attribute is kept positive 2016-05-26 13:16:52 +02:00
urho3d-travis-ci
520f50615c Travis CI: API documentation update at 2016-05-25 20:29:12 UTC.
[ci package]

Commit: f7ffdd8770

Message: Update LZ4 license text.
2016-05-25 20:29:12 +00:00
Lasse Öörni
eb7eed9ace Merge remote-tracking branch 'cosmy1/lz4-update' 2016-05-25 20:27:44 +03:00
Lasse Öörni
64b2a83869 Add fixed screen size option to Text3D. 2016-05-25 20:16:17 +03:00
urho3d-travis-ci
11557444be Travis CI: API documentation update at 2016-05-25 12:51:39 UTC.
[ci package]

Commit: caf663eac3

Message: Possibility for BillboardSet / ParticleEffect billboards to be fixed screen size. In this case the billboard size is measured in pixels.
2016-05-25 12:51:39 +00:00
Lasse Öörni
caf663eac3 Possibility for BillboardSet / ParticleEffect billboards to be fixed screen size. In this case the billboard size is measured in pixels. 2016-05-25 15:39:26 +03:00
Yao Wei Tjong 姚伟忠
d2fe7b1228 Remove "z" shortcut for console (consistent with scripting samples). 2016-05-25 16:39:50 +08:00
urho3d-travis-ci
5069a9b62f Travis CI: API documentation update at 2016-05-24 16:01:41 UTC.
[ci package]

Commit: c347cae4fa

Message: Add contributor credit.
2016-05-24 16:01:41 +00:00
Lasse Öörni
c8ea5fc74e Prevent crash from negative stroke thickness. Simplify non-round stroke code so that thickness=1 corresponds to the earlier nonadjustable stroke. 2016-05-24 18:36:54 +03:00
Lasse Öörni
2165b76506 Use const ref IntVector2 for the shadow effect offset. 2016-05-24 18:08:40 +03:00
Lasse Öörni
7e7ad78f5e Merge remote-tracking branch 'bengtsts/master' 2016-05-24 17:55:32 +03:00
cosmy
e0e43635a4 Update LZ4 compression library. 2016-05-24 16:53:28 +02:00
Bengt Soderstrom
d24a1af425 Text effect get functions placed consistantly with order of other get functions 2016-05-24 16:00:34 +02:00
Bengt Soderstrom
bcbaf08026 Text effect attributes accessible from Lua 2016-05-24 15:03:25 +02:00
Yao Wei Tjong 姚伟忠
30f793c747 Merge commit 'a7b0474d11d1bd88efa371581d1a30f7e231b1cd' into master. 2016-05-24 19:47:12 +08:00
Bengt Soderstrom
34bd347513 Text effect attributes accessible from Angel Script 2016-05-24 12:05:21 +02:00
Lasse Öörni
9e22d226c5 Add explanation of sceneless sound nodes to the documentation. Closes #1385. 2016-05-24 10:57:15 +03:00
Lasse Öörni
cac0d0e5aa Add note of potential bug on old GPU's and seamless cube map extension. 2016-05-23 22:37:51 +03:00
Bengt Soderstrom
19b69aad7e Text effect settings accessible through Text3D and minor variable name consistancy change in Text.h 2016-05-23 20:42:09 +02:00
urho3d-travis-ci
0aa4ec9e72 Travis CI: API documentation update at 2016-05-23 18:07:35 UTC.
[ci package]

Commit: 2ea850ff14

Message: Do not compile HttpRequestDemo sample if URHO3D_NETWORK is not defined. Fix HttpRequest class Lua bindings to not inherit Deserializer to avoid crash, instead expose read functions manually like File does. Fix string concatenation in HttpRequestDemo lua code.
2016-05-23 18:07:35 +00:00
Lasse Öörni
2ea850ff14 Do not compile HttpRequestDemo sample if URHO3D_NETWORK is not defined. Fix HttpRequest class Lua bindings to not inherit Deserializer to avoid crash, instead expose read functions manually like File does. Fix string concatenation in HttpRequestDemo lua code. 2016-05-23 20:37:02 +03:00
Bengt Soderstrom
73980249ee New text effect getters made const and removed executable status of Text and Text3D source files 2016-05-23 19:34:35 +02:00
Lasse Öörni
d50e15dc48 Merge remote-tracking branch 'cosmy1/http-req-demo' 2016-05-23 19:42:38 +03:00
cosmy
2b1118528b Simplify sample code. 2016-05-23 17:16:15 +02:00
cosmy
c2128e054e Clean C++ sample and add Lua version. 2016-05-23 14:35:06 +02:00
cosmy
e8d0d60a98 Fix Clang compilation errors. 2016-05-23 14:14:49 +02:00
cosmy
bdb5035eb4 Add C++ Http Request demo sample. 2016-05-23 13:01:04 +02:00
urho3d-travis-ci
90eccb6ac5 Travis CI: API documentation update at 2016-05-23 08:00:30 UTC.
[ci package]

Commit: 6c589286d0

Message: Merge pull request #1381 from cosmy1/json-fix

Add JSON method to deserialize from string and expose it to script interfaces.
2016-05-23 08:00:30 +00:00
Lasse Öörni
6c589286d0 Merge pull request #1381 from cosmy1/json-fix
Add JSON method to deserialize from string and expose it to script interfaces.
2016-05-23 10:49:52 +03:00
Lasse Öörni
ec05d239f3 Check seamless cubemap extension before trying to enable it on GL2. Related to #1380. 2016-05-23 01:09:54 +03:00
Lasse Öörni
6e78a22271 Fix NamedPipe compilation on Emscripten (make it a no-op) 2016-05-23 00:57:22 +03:00
cosmy
9bb620ad17 Add JSON method to deserialize from string and expose it to script interfaces. 2016-05-22 21:08:38 +02:00
Lasse Öörni
c4b40ae04c Lowercase Windows.h for MinGW. 2016-05-22 21:59:25 +03:00
Bengt Soderstrom
51a35a9556 Enhanced Text Effects: Drop shadow offset, custom stroke thickness and stroke roundness can be set in editor 2016-05-22 20:18:22 +02:00
urho3d-travis-ci
9e95e891c1 Travis CI: API documentation update at 2016-05-22 18:16:32 UTC.
[ci package]

Commit: 9a1d0a857f

Message: Eliminate end-of-line spaces from NamedPipe code, minor cleanup.
2016-05-22 18:16:32 +00:00
Lasse Öörni
9a1d0a857f Eliminate end-of-line spaces from NamedPipe code, minor cleanup. 2016-05-22 20:54:48 +03:00
Lasse Öörni
e7e0cb51a6 Take advantage of Deserializer::IsEof() being virtual to clean up HttpRequest code. Now position_ is no longer manipulated to fake the EOF behavior. 2016-05-22 20:50:55 +03:00
Lasse Öörni
0095fbb41e Unix named pipe support. Fixed GCC warning in OGLGraphics.cpp. Closes #1346. 2016-05-22 20:07:28 +03:00
Bengt Soderstrom
1d552092b4 Enhance Text Effects: Drop shadow can be offset in editor and custom stroke thickness can be set as well as stroke roundness 2016-05-22 17:32:48 +02:00
Bengt Soderstrom
46b9af52ec Added Text effect enhancement: Stroke generated procedurally 2016-05-22 15:30:30 +02:00
Bengt Soderstrom
3ecba5a52c Added Text effect enhancement: Stroke generated procedurally 2016-05-22 15:27:37 +02:00
Lasse Öörni
daef54490e Added NamedPipe class, Windows implementation. Make Deserializer::IsEof() virtual. 2016-05-22 14:41:22 +03:00
Lasse Öörni
83e3772a34 Halve default VSM softness. Scale VSM blurring to shadow resolution, so that low resolutions don't receive too much blur. Note: when using VSM, you should set all your large surfaces (such as floors or terrains) to cast shadows. Otherwise shadows will be unnaturally thin. The Urho builtin samples don't do this to avoid artifacts on mobiles where VSM can't be used, and the bias is tricky to get right. 2016-05-21 15:12:58 +03:00
Yao Wei Tjong 姚伟忠
d15553fce9 Fix building of PackageTool target due to inclusion of new class. 2016-05-21 12:02:53 +08:00
urho3d-travis-ci
cd692756e0 Travis CI: API documentation update at 2016-05-20 23:28:35 UTC.
[ci package]

Commit: 96e76164b8

Message: Update Civetweb license in root dir License.txt.
2016-05-20 23:28:35 +00:00
Lasse Öörni
94db13ed69 Merge remote-tracking branch 'cosmy1/civetweb-update' 2016-05-21 01:10:07 +03:00
Lasse Öörni
f3beda9164 Merge remote-tracking branch '1vanK/master' 2016-05-21 00:13:20 +03:00
1vanK
2d19a26743 ScrollBar base class from UIElement to BorderImage 2016-05-20 15:58:32 +03:00
Lasse Öörni
d17da2382c Merge pull request #1375 from cosmy1/warn-fix
Fix float casting.
2016-05-20 14:31:13 +03:00
cosmy
26d1b6cf54 Fix VS15 compilation error. 2016-05-20 13:06:34 +02:00
cosmy
ff745005ed Update Civetweb code. 2016-05-20 12:40:32 +02:00
cosmy
9a55d403be Update Civetweb documentation files. 2016-05-20 12:39:04 +02:00
cosmy
7647d43367 Fix float casting. 2016-05-20 12:34:41 +02:00
Lasse Öörni
cffdcb6ed8 Make Text3D private data protected instead to aid in subclassing (e.g. for more text effects.) 2016-05-20 12:14:24 +03:00
carnalis
55d2ed8e7c Add Urho3D namespace 2016-05-19 15:38:16 -04:00
Lasse Öörni
97bb1769d0 Rework renderpath quad commands to use same quad transform as deferred directional lights, with the camera projection set correctly. Set quad command's shader parameters last to allow overriding any engine shader parameter (except the quad's model transform.) Remove unused function parameters. Closes #1370. 2016-05-19 22:08:17 +03:00
urho3d-travis-ci
04dc4712d8 Travis CI: API documentation update at 2016-05-19 15:55:55 UTC.
[ci package]

Commit: d09f67f249

Message: Clean up Image::SavePNG() to use just Image::Save(). Fix jo & stbi_image_write to use wchar paths on Windows.
2016-05-19 15:55:55 +00:00
Lasse Öörni
d09f67f249 Clean up Image::SavePNG() to use just Image::Save(). Fix jo & stbi_image_write to use wchar paths on Windows. 2016-05-19 17:59:28 +03:00
Lasse Öörni
5ac188d459 Add event name subscription to AngelScript & Lua API's as a global function, so that script-defined events can work with EventProfiler. Simplify code to terminate EventProfiler block when event send ends. Also terminate EventProfiler block if event send is terminated abnormally (sender expired.) 2016-05-19 17:30:41 +03:00
Lasse Öörni
a090cd94fd Minor code convention & class documentation edit: put static variables to the beginning of .cpp file and don't use underscore. 2016-05-19 17:04:31 +03:00
Lasse Öörni
3fdaba3a68 Add missing consts to DebugHud.pkg. 2016-05-19 16:34:25 +03:00
Lasse Öörni
2ca6d16b28 Mention EventProfiler in the documentation. Simplify code in DebugHud to activate/deactivate event profiler. 2016-05-19 16:32:36 +03:00
Lasse Öörni
fcfb17a2b0 Merge remote-tracking branch 'svifylabs/f_EventProfiler' 2016-05-19 16:10:54 +03:00
Lasse Öörni
387f1346e2 Merge remote-tracking branch 'cosmy1/glew-update' 2016-05-19 15:47:05 +03:00
Lasse Öörni
5a04309fa5 Fix Material::SetUVTransform() adding an extra offset when repeat is adjusted. Fix SetUVTransform() rotation to be centered at any repeat value. 2016-05-19 15:36:49 +03:00
svifylabs
a91a6cf924 Added static bool to EventProfiler 2016-05-19 09:18:46 +02:00
svifylabs
16257f80c5 Revert "Testing static registration of subsystems"
This reverts commit 2a0a9df4dd.
2016-05-19 08:44:28 +02:00
cosmy
94fabf7287 Update GLEW to 1.13. 2016-05-18 23:41:17 +02:00
Lasse Öörni
187b343563 Remove cast since it wasn't consistent, and equality comparison doesn't produce a warning between signed/unsigned. 2016-05-18 17:05:56 +03:00
Lasse Öörni
8ebe1e2050 Write PNG first to memory, then to file to handle UTF8 paths correctly. Unfortunately stbi_image_write lacks the same API for TGA format, and jo_jpeg doesn't support memory write either. 2016-05-18 16:30:12 +03:00
Lasse Öörni
5d71f8012a Update documentation. Skip material / texture save in AssetImporter "anim" mode. 2016-05-18 16:24:54 +03:00
Lasse Öörni
77325b0ef0 Merge remote-tracking branch 'svifylabs/f_importAnim' 2016-05-18 15:15:53 +03:00
svifylabs
2a0a9df4dd Testing static registration of subsystems
dont know if its ok or really bad ...
2016-05-18 13:04:09 +02:00
Bengt Soderstrom
d6d2bc7433 Added multiple stroke thicknesses to Text effects which are more visible with larger font sizes 2016-05-18 12:48:05 +02:00
Lasse Öörni
250bfbaafe Merge pull request #1364 from cosmy1/fix
Initialize various missing class members.
2016-05-18 11:11:06 +03:00
svifylabs
d304d941d1 Add import only animation 2016-05-18 09:50:12 +02:00
svifylabs
bffb89b60d Added EventProfiler
- EventProfiler is based on the normal profiler
- encapsulated between URHO3D_PROFILING blocks
- added "EventProfiler" to the engineParameters and is default false
- can be activated and deactivated (should be reworked)

Added EventProfiler

- EventProfiler is based on the normal profiler
- encapsulated between URHO3D_PROFILING blocks
- added "EventProfiler" to the engineParameters and is default false
- can be activated and deactivated (should be reworked)
2016-05-18 09:44:49 +02:00
cosmy
385df5f101 Initialize all Image members. 2016-05-17 21:46:51 +02:00
cosmy
9b9d77f09c Initialize all ListBase members. 2016-05-17 21:38:33 +02:00
cosmy
dfb3c8409c Initialize all HashBase members. 2016-05-17 21:38:12 +02:00
urho3d-travis-ci
b39f1b30e7 Travis CI: API documentation update at 2016-05-17 16:13:08 UTC.
[ci package]

Commit: 7da8374a3b

Message: Option to override culling mode in pass. Closes #1363.
2016-05-17 16:13:08 +00:00
Lasse Öörni
7da8374a3b Option to override culling mode in pass. Closes #1363. 2016-05-17 18:58:32 +03:00
Yao Wei Tjong 姚伟忠
78a55a8422 Attempt to fix random segfault on CrowdNavigation demo.
Related to #1200.
2016-05-16 17:36:00 +08:00
Lasse Öörni
5e7a3b1265 Disable IRRMESH if IRR is disabled. Closes #1362. 2016-05-15 22:35:02 +03:00
Yao Wei Tjong 姚伟忠
4f72a673d9 Fix the compression ratio calculation. Suppress compilation warnings. 2016-05-14 22:57:14 +08:00
urho3d-travis-ci
83f254c317 Travis CI: API documentation update at 2016-05-14 07:19:37 UTC.
[ci package]

Commit: c28634c206

Message: Minor enhancement on the PackageTool to have output option.
2016-05-14 07:19:37 +00:00
Yao Wei Tjong 姚伟忠
c28634c206 Minor enhancement on the PackageTool to have output option. 2016-05-14 15:07:14 +08:00
Lasse Öörni
16997009c6 Send E_ANIMATIONFINISHED event also for AnimatedSprite2D animation loop/end. 2016-05-14 02:48:04 +03:00
Lasse Öörni
7b9e6aa436 Merge remote-tracking branch 'cosmy1/indent-fix' 2016-05-12 13:49:17 +03:00
cosmy
6bce856acf Fix code indent. 2016-05-12 12:31:42 +02:00
Yao Wei Tjong 姚伟忠
b29a9481c0 Mark the SDL source code changes to comply with its license. 2016-05-11 19:46:44 +08:00
Lasse Öörni
0d3ea5148d Merge remote-tracking branch '1vanK/master' 2016-05-11 12:21:15 +03:00
Yao Wei Tjong 姚伟忠
beb9bcd8c7 Fix memory leak in SDL library. 2016-05-11 16:55:37 +08:00
1vanK
d6f5f5d45c Fix gold coin animation 2016-05-11 11:27:29 +03:00
urho3d-travis-ci
1a060523e0 Travis CI: API documentation update at 2016-05-09 20:02:33 UTC.
[ci package]

Commit: a955725bd0

Message: Add the interpolation mode IM_NONE to ValueAnimation. Add animating UI element to LightAnimation example. Add ResourceRef constructor that takes type & name as strings for easier script bindings.
2016-05-09 20:02:33 +00:00
Lasse Öörni
a955725bd0 Add the interpolation mode IM_NONE to ValueAnimation. Add animating UI element to LightAnimation example. Add ResourceRef constructor that takes type & name as strings for easier script bindings. 2016-05-09 22:38:06 +03:00
Yao Wei Tjong 姚伟忠
965e646fb5 Minor clean up on build script. 2016-05-08 09:44:32 +08:00
urho3d-travis-ci
45d5854288 Travis CI: API documentation update at 2016-05-07 17:38:57 UTC.
[ci package]

Commit: 7220b37676

Message: Fix spotlight spot matrix in deferred rendering. Remove unused variables.
2016-05-07 17:38:57 +00:00
Lasse Öörni
7220b37676 Fix spotlight spot matrix in deferred rendering. Remove unused variables. 2016-05-07 20:22:59 +03:00
Lasse Öörni
44ba1f04b8 Enhance documentation related to normal offset. Add missing Lua property for mobileNormalOffsetMul. Closes #1347. 2016-05-07 20:20:45 +03:00
Lasse Öörni
f908fa4cfd Fix normal offset GLSL code for GLES. Set default mobile multiplier for normal offset to 2. 2016-05-07 20:20:44 +03:00
Lasse Öörni
a123794886 Normal offset support in GLSL. Fix deferred specular in GLSL. 2016-05-07 20:20:43 +03:00
Lasse Öörni
7160a0ab7c Normal offset shadow support for HLSL. Fix deferred specular calculation on HLSL. 2016-05-07 20:20:42 +03:00
Yao Wei Tjong 姚伟忠
83a1f3889b Enhance buildsystem to support MSVC to be used in other build tools.
Related to #1328.
2016-05-07 18:09:05 +08:00
urho3d-travis-ci
ed511aba60 Travis CI: API documentation update at 2016-05-06 17:38:03 UTC.
[ci package]

Commit: 8e8ee798a7

Message: New click / click end events sent by the UI element in question (see UIEvents.h.) Fix IsInside() check for the sprite UI element to allow accurate click detection. Register the full UIElement API for the Sprite element in AngelScript, though not all functions make sense. Clean up empty virtual functions from .cpp files in favor of defining them in headers. Closes #1343.
2016-05-06 17:38:04 +00:00
Lasse Öörni
8e8ee798a7 New click / click end events sent by the UI element in question (see UIEvents.h.) Fix IsInside() check for the sprite UI element to allow accurate click detection. Register the full UIElement API for the Sprite element in AngelScript, though not all functions make sense. Clean up empty virtual functions from .cpp files in favor of defining them in headers. Closes #1343. 2016-05-06 19:58:27 +03:00
urho3d-travis-ci
12ed42caeb Travis CI: API documentation update at 2016-05-06 12:51:53 UTC.
[ci package]

Commit: 6b680cd6ee

Message: Remove unused variable.
2016-05-06 12:51:53 +00:00
Lasse Öörni
6b680cd6ee Remove unused variable. 2016-05-06 15:36:27 +03:00
Lasse Öörni
74d6d5678c Ensure full Text3D material update if opacity or alpha changes from nonzero to zero. 2016-05-06 15:35:16 +03:00
Lasse Öörni
e023f448f1 Add missing opacity attribute for Text3D. Prevent illegal index access when amount of text batches is in mismatch with amount of Drawable batches. Closes #1350. 2016-05-06 15:30:00 +03:00
Lasse Öörni
53302819fa Improve error message in OcclusionBuffer when width is not a power of two. 2016-05-03 15:09:38 +03:00
Lasse Öörni
21bf5d4bea When deserializing a VariantMap from XML, also accept entries without "hash" attribute but a "name" attribute. Closes #1342. 2016-05-03 15:08:50 +03:00
urho3d-travis-ci
c0d023a8f0 Travis CI: API documentation update at 2016-05-02 19:49:47 UTC.
[ci package]

Commit: 551521212d

Message: Register HierarchyContainer into Lua bindings so that accessing a ListView's contentelement in hierarchy mode doesn't choke. Closes #1341.
2016-05-02 19:49:47 +00:00
Lasse Öörni
551521212d Register HierarchyContainer into Lua bindings so that accessing a ListView's contentelement in hierarchy mode doesn't choke. Closes #1341. 2016-05-02 21:19:11 +03:00
urho3d-travis-ci
d24d882bca Travis CI: API documentation update at 2016-05-02 17:47:52 UTC.
[ci package]

Commit: 7fbf89b728

Message: Add Clone() function to Animation. Expose Animation constructor in Lua.
2016-05-02 17:47:52 +00:00
Lasse Öörni
7fbf89b728 Add Clone() function to Animation. Expose Animation constructor in Lua. 2016-05-02 20:34:58 +03:00
Lasse Öörni
31e57e01fb Add PBR sample C++ version. 2016-05-01 13:41:18 +03:00
Yao Wei Tjong 姚伟忠
9baac62031 Improve NextPowerOfTwo().
Also make it consistent with IsPowerOfTwo() to treat 0 as if it is power of 2 (although mathematically it is not). NextPowerOfTwo(0) now returns 0.
In the old version when value is larger than 0x80000000 then the function returned 0x80000000 which is not exactly correct because it is not the "next" number. In the new version the function returns 0 in this case because the next number has overflow the unsigned data type.
2016-05-01 15:33:04 +08:00
Lasse Öörni
97bf7fa8a2 Fix crash when driver allows GL version 3.2 but doesn't support instancing. 2016-05-01 00:16:44 +03:00
Yao Wei Tjong 姚伟忠
1bcae0ca2b No-ops when VertexDeclaration.h is being included for OGL graphics API.
You may want to uncomment the #error compiler directive instead to flag out the occurrences.
2016-04-30 12:42:10 +08:00
Yao Wei Tjong 姚伟忠
e28e6e5c85 Quick fix to suppress confusing output msgs from SDL's CMakeLists.txt.
[ci skip]
2016-04-30 11:33:23 +08:00
Lasse Öörni
e7599463ba Improved IsPowerOfTwo(). Thanks to Y-way for initial PR. 2016-04-29 14:58:05 +03:00
Lasse Öörni
8d2c7230f0 Prevent Android / iOS reporting the mouse as grabbed. Closes #1337. 2016-04-27 18:28:03 +03:00
Yao Wei Tjong 姚伟忠
6abb199bc6 Use file symlink instead of directory for STB library.
Fix #1330.
2016-04-27 20:07:26 +08:00
Yao Wei Tjong 姚伟忠
a15abf5068 Avoid hard-coding of the sample list in the build script. 2016-04-27 12:23:35 +08:00
Yao Wei Tjong 姚伟忠
87f408be51 For CI - avoid hard-coding of the sample list in the build script.
Switch the build output verboseness to normal as the diagnostic mode also does not help to reveal any additional information on the crowd navigation sample when it segfaulted during test.
2016-04-26 13:25:45 +08:00
urho3d-travis-ci
29f2984d71 Travis CI: API documentation update at 2016-04-24 09:48:53 UTC.
[ci package]

Commit: 31d362f879

Message: Add new engine parameter for enabling/disabling high DPI window mode.
Temporary fix for issue #1252. The high DPI mode is disabled by default.
2016-04-24 09:48:53 +00:00
Yao Wei Tjong 姚伟忠
31d362f879 Add new engine parameter for enabling/disabling high DPI window mode.
Temporary fix for issue #1252. The high DPI mode is disabled by default.
2016-04-24 17:36:32 +08:00
Lasse Öörni
d492d32f41 When building input layouts, put VS element hash to the upper 32 bits to reduce possibility of collisions. 2016-04-23 15:39:10 +03:00
Lasse Öörni
2151426adc Use proper world space in deferred light shaders. This allows the cLightPos uniform and shadow matrices to behave the same in all passes (simplifies code.) Closes #1335. 2016-04-23 01:35:41 +03:00
Lasse Öörni
91b799d666 Change the signature of the new HashMap Insert() function. Do not allow user to specify findExisting flag. As the meaning of the bool return value is reverse to std::map::insert(), do not return it in a pair to avoid confusion, but rather in a separate bool value which is passed by reference. Add corresponding function to HashSet. Edit comments. 2016-04-21 01:58:02 +03:00
Lasse Öörni
25f1d1442a Merge remote-tracking branch 'svifylabs/ExtendContainer' 2016-04-20 23:34:32 +03:00
Lasse Öörni
d80e5f9a32 Simplify OpenGL code. 2016-04-20 23:15:01 +03:00
Lasse Öörni
eedb47f612 Merge remote-tracking branch 'svifylabs/basevertexindex' 2016-04-20 22:08:29 +03:00
svifylabs
e7db8ffeab renamed local variable (copy error) 2016-04-20 08:49:09 +02:00
svifylabs
b54b5b9ef7 add TryGetValue, Insert, EraseSwap, RemoveSwap 2016-04-20 07:34:49 +02:00
Lasse Öörni
ed8740428c Remove cCameraRot uniform. Instead derive from cViewInv as necessary. Closes #1163. 2016-04-19 23:18:07 +03:00
svifylabs
e94d00517c fix compile error and added runtime check 2016-04-19 18:22:34 +02:00
svifylabs
c09b638524 Add Graphics draw call with baseVertexIndex (offset)
only  supported for opengl 3  and direct3d
2016-04-19 16:06:31 +02:00
urho3d-travis-ci
03f355ca96 Travis CI: API documentation update at 2016-04-19 09:54:00 UTC.
[ci package]

Commit: 57389d42c2

Message: Minor documentation edit.
2016-04-19 09:54:00 +00:00
Lasse Öörni
c003af1114 Merge branch 'master' into vertexdeclaration 2016-04-18 22:34:00 +03:00
Lasse Öörni
cd19bf0939 Merge pull request #1327 from BlueMagnificent/ScriptInstance_Execute
Add additional Variant Types For ScriptInstance::Execute()
2016-04-18 10:29:58 +03:00
Blue, The Magnificent
0913210731 Add additional Variant Types that have objects exposed to AngelScript subsystem 2016-04-18 00:54:48 +01:00
Lasse Öörni
1ba0958fa7 Fix render-to-texture views (part of a material) not being updated on the first frame. 2016-04-17 21:35:32 +03:00
Lasse Öörni
3f861d67dd Enable seamless cubemap if possible on desktop GL (from 1vanK). Clarify meaning of Light::SetShadowIntensity(). 2016-04-17 16:58:41 +03:00
Lasse Öörni
c48b25abca Use the new model format in OgreImporter. 2016-04-16 21:11:42 +03:00
Lasse Öörni
19f3b0f120 Merge branch 'master' into vertexdeclaration 2016-04-16 14:58:30 +03:00
Yao Wei Tjong 姚伟忠
7a979cad3d Attempt to fix SDL OpenGLES auto-detection for Emscripten on Windows. 2016-04-16 12:29:03 +08:00
Yao Wei Tjong 姚伟忠
43bea49674 Fix the PBRDemo shell script. 2016-04-15 18:56:31 +08:00
urho3d-travis-ci
60a1416b2b Travis CI: API documentation update at 2016-04-14 21:11:19 UTC.
[ci package]

Commit: 39ca95b662

Message: Squashed commit of the following:

commit 8197605c1c6c660c71727db8472bf9a9ac2ae76d
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:55:05 2016 +0300

    Convert cubemap to DDS.

commit a06cf912e3a106f66137241722c7fd49c1805e2b
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:42:56 2016 +0300

    Fix D3D11 crash if trying to assign color texture as a depth stencil or vice versa. Remove mistaken assignment of the 4th rendertarget output from PBRDeferredHWDepth.xml.

commit de765127b10c8cef45689fd8117875930af7031a
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:17:37 2016 +0300

    Add possibility to configure default material technique in Renderer.

commit d876a081932f423a42adcc1371a6fac622e8d585
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:10:32 2016 +0300

    Refer to Utilities/Rotator.as script in the PBR scene.

commit 9e4078c9a1cfa4be040a523d3b51aaf55a332c40
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:06:00 2016 +0300

    Readd deleted Flare.dds.

commit 1f606cc883e89e15e32272f6d47877c6e511b74b
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 22:31:04 2016 +0300

    Remove NinjaSnowWar copypasta.

commit 745937646f3638a208e58c3cce76df7afbab8416
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 22:11:28 2016 +0300

    Separate skybox2 material. Remove unused materials. Fix typo in material name.

commit 258d0325d4bed282f28d8ec8364ee64700e4f025
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 22:04:48 2016 +0300

    Squashed commit of the following:

    commit a329abe9a2a0f77dcb415bafd15c6e309261e7cc
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 15:08:26 2016 +0100

        removed white space

    commit 434b1d8599ce2d0828acfc2939b94b33cd821fad
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 15:06:36 2016 +0100

        Updated Licence

    commit f89a2369c83791c43762ca2b34f8b3aeeb562b24
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 15:03:57 2016 +0100

        Converted texture formats

    commit 028cd1da4d7ac226e1943a70abfd6037912c86b0
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 14:55:31 2016 +0100

        Updated Licence

    commit ecc288b3cbc046a678bbc2d0df408b2f29220b30
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 13 00:02:34 2016 +0100

        Added basic licence

    commit ce34c0496e80043e3e79f4273468a66463ed13cb
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Tue Apr 12 14:00:52 2016 +0100

        Cleaned Up Data and Reverted Default Technique

    commit a9e08bbd3a4f08c09baa477a0ce06cef517d506e
    Merge: 53c53ae d009f11
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 9 11:10:30 2016 +0100

        Merge pull request #11 from hdunderscore/typoFix_Metallic

        Fix metallic typo

    commit 53c53aec4c1d935b31cbc0ce5eac93faaa5b9f89
    Merge: 851487e 9c1d728
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 9 11:08:17 2016 +0100

        Merge pull request #10 from cosmy1/patch-10

        Remove extra float casts

    commit d009f11865dfdf9634fa9c297f2cc339164724de
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Sat Apr 9 15:07:44 2016 +1000

        Fix metallic typo

    commit 9c1d728be919a74dfee8973b146f312121daed9e
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 9 04:50:36 2016 +0200

        Remove extra float casts

    commit 851487ea63c181eb45c5988eb71dd526e2c12852
    Merge: 3142270 8edbae9
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Fri Apr 8 19:32:06 2016 +0100

        Merge pull request #9 from hdunderscore/PBRChangesR

        Updates to IBL

    commit 8edbae92c5e454727126c444b49075ef07e36ab8
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Fri Apr 8 20:01:33 2016 +1000

        - Updated glsl shaders
        - Fixed a potential bug with direct lighting.
        - Introduced a new define 'PBRFAST' that will allow the IBL to take a short-cut for significantly higher frame-rate, but lower quality.

    commit e63a5d4faedb22710f28dbfdff3705fdfb3b1d22
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Fri Apr 8 10:06:18 2016 +1000

        Fixed a divide-by-zero in the CookTorranceBRDF, which was causing a visual issue in DX11.

    commit 37d30d906c93ebb2e4165f91db5adc7e7893edc4
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Fri Apr 8 00:30:26 2016 +1000

        Fixed specular IBL energy conservation.

    commit 4643342079dce76c3b26ac101745e49cabad7b68
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Thu Apr 7 21:27:16 2016 +1000

        - Exposed tangents and bi-tangents to the IBL.
        - Removed unused calculations in deferred first pass.
        - Added a simpler image sampling calculation.

    commit b7ea9b89fe455d8e9c62fc3a1dd441a8860c9708
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Wed Apr 6 22:44:09 2016 +1000

        - Fixed a few errors in the BRDF functions
        - Fixed the specular calculations
        - Small code refactor to allow for more consistency and easier experimentation.
        - Implemented the ImageSampling algorithm as described in Epic's 2013 paper, with improvements.
        - Implemented a true working deferred renderer.
        - Updated the concrete normal map (reversed the direction).
        - Changed the sRGB setting of the diffuse textures and cubemap, to perform calculations in linear space.
        - Added post-process effects to the PBR sample.

    commit 314227053b26c6ba70d7de32b2c5894d60d25784
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 6 01:35:52 2016 +0100

        Missing OpenGL changes (reverted from commit 4169cfca4abe7b23b5f2a84aa391992fe22e3a8b)

    commit 9cd441c413f4742bca3889d3cdf9f2c290462e3d
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 6 01:27:42 2016 +0100

        - Fix Metallic typo
        - Fix HLSL specular metallic bug
        - Fix indentation.
        - Fix BRDF typo.
        - Fix sample scene material to use normal maps.
        - Revert IBL Importance sample to use Epic described method.
        - Removed incorrect application of split sum on top of importance sample method.
        - Added diffuse IBL calculation. (reverted from commit 143379cee9968588974879e1ce53123f45d8741a)

    commit 143379cee9968588974879e1ce53123f45d8741a
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 6 01:10:37 2016 +0100

        - Fix Metallic typo
        - Fix HLSL specular metallic bug
        - Fix indentation.
        - Fix BRDF typo.
        - Fix sample scene material to use normal maps.
        - Revert IBL Importance sample to use Epic described method.
        - Removed incorrect application of split sum on top of importance sample method.
        - Added diffuse IBL calculation.

    commit fbba0f389b571d0b3814254c16b05279bfd29a58
    Merge: 4169cfc c9ba2ec
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Tue Apr 5 14:03:40 2016 +0100

        Merge pull request #5 from cosmy1/patch-6

        Update BDRF.hlsl

    commit 4169cfca4abe7b23b5f2a84aa391992fe22e3a8b
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 22:55:56 2016 +0100

        Missing OpenGL changes

    commit 62491b160cd356cdf4bc292815862fbdea2be22a
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 22:54:50 2016 +0100

        Fixed OpenGL PBR

    commit a453cfea1a061900c9de604b5d422d5915cf1712
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 02:37:53 2016 +0100

        Fixed IBL function taking metallic

    commit e33efba25b455a6c77679941c489619a02fa1098
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 02:35:28 2016 +0100

        Improve IBL and fixed specular color

    commit 4c7058f1c41bbed32c96df550cb93a14b17ec07d
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Sat Apr 2 01:43:18 2016 +0100

        Fixed HLSL

    commit 9d095a14ac64e34fa2c016e4503b2b076e64b025
    Merge: 2de2597 0a9ea24
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sun Apr 3 14:22:46 2016 +0100

        Merge pull request #6 from cosmy1/patch-8

        Update PBRExample.xml

    commit 2de259781a588c80117744892083065fbe5bb5c8
    Merge: 92ab68c 12bd826
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 2 20:51:30 2016 +0100

        Merge pull request #4 from cosmy1/patch-4

        Update IBL.glsl

    commit 92ab68ce3b94a092ad96d9cd0e577d1b7fedf61c
    Merge: 295a23e e1f5ac2
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 2 20:51:05 2016 +0100

        Merge pull request #3 from cosmy1/patch-3

        Update BRDF.glsl

    commit 0a9ea24b6681bac8e3deab58081ee9462b6ada31
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:54:33 2016 +0200

        Update PBRExample.xml

    commit c9ba2ec10f34da559c6148cb0d8d9cbc2ca62ff0
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:50:30 2016 +0200

        Update BDRF.hlsl

    commit 12bd826c73092b8e96782c91b9cc7d925e77708f
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:47:29 2016 +0200

        Update IBL.glsl

    commit e1f5ac27606295bf81c07d3d46fda1dae6f191a7
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:43:37 2016 +0200

        Update BRDF.glsl

    commit 295a23e96f3dcdf05aac8d4e9057e8e6c67b3607
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Sat Apr 2 00:19:01 2016 +0100

        Updated Example

    commit 9b105230ecd33082bb82a8963057d635ffbe41ac
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Sat Apr 2 00:15:55 2016 +0100

        Fixed IBL and indentation

    commit 185d31b6a0af7d084e7305d783e407d354274cac
    Merge: 6b7b5be dad5c04
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Fri Apr 1 23:55:46 2016 +0100

        Merge pull request #2 from cosmy1/patch-2

        Update BRDF.glsl

    commit dad5c042fc3272accbb9c26f2e17214ece66ebf8
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 00:39:35 2016 +0200

        Update BRDF.glsl

    commit 6b7b5bee9c56304aa92a4009d15282b6456d77c6
    Merge: a5b6b93 c398e82
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Fri Apr 1 23:34:40 2016 +0100

        Merge pull request #1 from cosmy1/patch-1

        Fix whitespaces in Material

    commit c398e82153ac0d0ab2b29f61d4345d747be3d40c
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 00:33:27 2016 +0200

        Fix whitespaces in Material

    commit a5b6b93b96a053f304b7326b4fa3930d60195051
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:33:52 2016 +0100

        fixed indentation

    commit 5b402e75092e680975435384ecb8b0af0292139d
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:32:35 2016 +0100

        Fixed issue with deletion of wrong values

    commit 4ca39ec5bfb905621de8c80999cf640a8ad6d5e0
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:28:59 2016 +0100

        removed nolonger needed licence

    commit d2ab0f9a048d594d7115c41c2dbea2ce2d39e31b
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:28:18 2016 +0100

        Improve PBR and moved forward PBR into new shader

    commit cdaae6e2cf234f28cef90f244e2e24e6b7d0d915
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:26:57 2016 +0100

        Removed remaining area lighting and fixed pbr in deferred rendering

    commit 6fca9d3b98fc2cacea2a11129eb1fc69a7e2fd2f
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 13:19:48 2016 +0100

        Replaced data folder with one from mater to avoid commit revert errors

    commit 543c30f0b3b035df13ce09cc127117fb160bfe5f
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Mar 31 20:52:47 2016 +0100

        Complete PBR work
2016-04-15 18:56:31 +08:00
Lasse Öörni
2e44b0b350 Squashed commit of the following:
commit 8197605c1c6c660c71727db8472bf9a9ac2ae76d
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:55:05 2016 +0300

    Convert cubemap to DDS.

commit a06cf912e3a106f66137241722c7fd49c1805e2b
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:42:56 2016 +0300

    Fix D3D11 crash if trying to assign color texture as a depth stencil or vice versa. Remove mistaken assignment of the 4th rendertarget output from PBRDeferredHWDepth.xml.

commit de765127b10c8cef45689fd8117875930af7031a
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:17:37 2016 +0300

    Add possibility to configure default material technique in Renderer.

commit d876a081932f423a42adcc1371a6fac622e8d585
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:10:32 2016 +0300

    Refer to Utilities/Rotator.as script in the PBR scene.

commit 9e4078c9a1cfa4be040a523d3b51aaf55a332c40
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 23:06:00 2016 +0300

    Readd deleted Flare.dds.

commit 1f606cc883e89e15e32272f6d47877c6e511b74b
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 22:31:04 2016 +0300

    Remove NinjaSnowWar copypasta.

commit 745937646f3638a208e58c3cce76df7afbab8416
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 22:11:28 2016 +0300

    Separate skybox2 material. Remove unused materials. Fix typo in material name.

commit 258d0325d4bed282f28d8ec8364ee64700e4f025
Author: Lasse Öörni <loorni@gmail.com>
Date:   Thu Apr 14 22:04:48 2016 +0300

    Squashed commit of the following:

    commit a329abe9a2a0f77dcb415bafd15c6e309261e7cc
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 15:08:26 2016 +0100

        removed white space

    commit 434b1d8599ce2d0828acfc2939b94b33cd821fad
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 15:06:36 2016 +0100

        Updated Licence

    commit f89a2369c83791c43762ca2b34f8b3aeeb562b24
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 15:03:57 2016 +0100

        Converted texture formats

    commit 028cd1da4d7ac226e1943a70abfd6037912c86b0
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Apr 14 14:55:31 2016 +0100

        Updated Licence

    commit ecc288b3cbc046a678bbc2d0df408b2f29220b30
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 13 00:02:34 2016 +0100

        Added basic licence

    commit ce34c0496e80043e3e79f4273468a66463ed13cb
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Tue Apr 12 14:00:52 2016 +0100

        Cleaned Up Data and Reverted Default Technique

    commit a9e08bbd3a4f08c09baa477a0ce06cef517d506e
    Merge: 53c53ae d009f11
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 9 11:10:30 2016 +0100

        Merge pull request #11 from hdunderscore/typoFix_Metallic

        Fix metallic typo

    commit 53c53aec4c1d935b31cbc0ce5eac93faaa5b9f89
    Merge: 851487e 9c1d728
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 9 11:08:17 2016 +0100

        Merge pull request #10 from cosmy1/patch-10

        Remove extra float casts

    commit d009f11865dfdf9634fa9c297f2cc339164724de
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Sat Apr 9 15:07:44 2016 +1000

        Fix metallic typo

    commit 9c1d728be919a74dfee8973b146f312121daed9e
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 9 04:50:36 2016 +0200

        Remove extra float casts

    commit 851487ea63c181eb45c5988eb71dd526e2c12852
    Merge: 3142270 8edbae9
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Fri Apr 8 19:32:06 2016 +0100

        Merge pull request #9 from hdunderscore/PBRChangesR

        Updates to IBL

    commit 8edbae92c5e454727126c444b49075ef07e36ab8
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Fri Apr 8 20:01:33 2016 +1000

        - Updated glsl shaders
        - Fixed a potential bug with direct lighting.
        - Introduced a new define 'PBRFAST' that will allow the IBL to take a short-cut for significantly higher frame-rate, but lower quality.

    commit e63a5d4faedb22710f28dbfdff3705fdfb3b1d22
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Fri Apr 8 10:06:18 2016 +1000

        Fixed a divide-by-zero in the CookTorranceBRDF, which was causing a visual issue in DX11.

    commit 37d30d906c93ebb2e4165f91db5adc7e7893edc4
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Fri Apr 8 00:30:26 2016 +1000

        Fixed specular IBL energy conservation.

    commit 4643342079dce76c3b26ac101745e49cabad7b68
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Thu Apr 7 21:27:16 2016 +1000

        - Exposed tangents and bi-tangents to the IBL.
        - Removed unused calculations in deferred first pass.
        - Added a simpler image sampling calculation.

    commit b7ea9b89fe455d8e9c62fc3a1dd441a8860c9708
    Author: hdunderscore <hdunderscore@gmail.com>
    Date:   Wed Apr 6 22:44:09 2016 +1000

        - Fixed a few errors in the BRDF functions
        - Fixed the specular calculations
        - Small code refactor to allow for more consistency and easier experimentation.
        - Implemented the ImageSampling algorithm as described in Epic's 2013 paper, with improvements.
        - Implemented a true working deferred renderer.
        - Updated the concrete normal map (reversed the direction).
        - Changed the sRGB setting of the diffuse textures and cubemap, to perform calculations in linear space.
        - Added post-process effects to the PBR sample.

    commit 314227053b26c6ba70d7de32b2c5894d60d25784
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 6 01:35:52 2016 +0100

        Missing OpenGL changes (reverted from commit 4169cfca4abe7b23b5f2a84aa391992fe22e3a8b)

    commit 9cd441c413f4742bca3889d3cdf9f2c290462e3d
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 6 01:27:42 2016 +0100

        - Fix Metallic typo
        - Fix HLSL specular metallic bug
        - Fix indentation.
        - Fix BRDF typo.
        - Fix sample scene material to use normal maps.
        - Revert IBL Importance sample to use Epic described method.
        - Removed incorrect application of split sum on top of importance sample method.
        - Added diffuse IBL calculation. (reverted from commit 143379cee9968588974879e1ce53123f45d8741a)

    commit 143379cee9968588974879e1ce53123f45d8741a
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Wed Apr 6 01:10:37 2016 +0100

        - Fix Metallic typo
        - Fix HLSL specular metallic bug
        - Fix indentation.
        - Fix BRDF typo.
        - Fix sample scene material to use normal maps.
        - Revert IBL Importance sample to use Epic described method.
        - Removed incorrect application of split sum on top of importance sample method.
        - Added diffuse IBL calculation.

    commit fbba0f389b571d0b3814254c16b05279bfd29a58
    Merge: 4169cfc c9ba2ec
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Tue Apr 5 14:03:40 2016 +0100

        Merge pull request #5 from cosmy1/patch-6

        Update BDRF.hlsl

    commit 4169cfca4abe7b23b5f2a84aa391992fe22e3a8b
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 22:55:56 2016 +0100

        Missing OpenGL changes

    commit 62491b160cd356cdf4bc292815862fbdea2be22a
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 22:54:50 2016 +0100

        Fixed OpenGL PBR

    commit a453cfea1a061900c9de604b5d422d5915cf1712
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 02:37:53 2016 +0100

        Fixed IBL function taking metallic

    commit e33efba25b455a6c77679941c489619a02fa1098
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Mon Apr 4 02:35:28 2016 +0100

        Improve IBL and fixed specular color

    commit 4c7058f1c41bbed32c96df550cb93a14b17ec07d
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Sat Apr 2 01:43:18 2016 +0100

        Fixed HLSL

    commit 9d095a14ac64e34fa2c016e4503b2b076e64b025
    Merge: 2de2597 0a9ea24
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sun Apr 3 14:22:46 2016 +0100

        Merge pull request #6 from cosmy1/patch-8

        Update PBRExample.xml

    commit 2de259781a588c80117744892083065fbe5bb5c8
    Merge: 92ab68c 12bd826
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 2 20:51:30 2016 +0100

        Merge pull request #4 from cosmy1/patch-4

        Update IBL.glsl

    commit 92ab68ce3b94a092ad96d9cd0e577d1b7fedf61c
    Merge: 295a23e e1f5ac2
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Sat Apr 2 20:51:05 2016 +0100

        Merge pull request #3 from cosmy1/patch-3

        Update BRDF.glsl

    commit 0a9ea24b6681bac8e3deab58081ee9462b6ada31
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:54:33 2016 +0200

        Update PBRExample.xml

    commit c9ba2ec10f34da559c6148cb0d8d9cbc2ca62ff0
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:50:30 2016 +0200

        Update BDRF.hlsl

    commit 12bd826c73092b8e96782c91b9cc7d925e77708f
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:47:29 2016 +0200

        Update IBL.glsl

    commit e1f5ac27606295bf81c07d3d46fda1dae6f191a7
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 11:43:37 2016 +0200

        Update BRDF.glsl

    commit 295a23e96f3dcdf05aac8d4e9057e8e6c67b3607
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Sat Apr 2 00:19:01 2016 +0100

        Updated Example

    commit 9b105230ecd33082bb82a8963057d635ffbe41ac
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Sat Apr 2 00:15:55 2016 +0100

        Fixed IBL and indentation

    commit 185d31b6a0af7d084e7305d783e407d354274cac
    Merge: 6b7b5be dad5c04
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Fri Apr 1 23:55:46 2016 +0100

        Merge pull request #2 from cosmy1/patch-2

        Update BRDF.glsl

    commit dad5c042fc3272accbb9c26f2e17214ece66ebf8
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 00:39:35 2016 +0200

        Update BRDF.glsl

    commit 6b7b5bee9c56304aa92a4009d15282b6456d77c6
    Merge: a5b6b93 c398e82
    Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
    Date:   Fri Apr 1 23:34:40 2016 +0100

        Merge pull request #1 from cosmy1/patch-1

        Fix whitespaces in Material

    commit c398e82153ac0d0ab2b29f61d4345d747be3d40c
    Author: cosmy1 <cosmy_rulezz@hotmail.it>
    Date:   Sat Apr 2 00:33:27 2016 +0200

        Fix whitespaces in Material

    commit a5b6b93b96a053f304b7326b4fa3930d60195051
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:33:52 2016 +0100

        fixed indentation

    commit 5b402e75092e680975435384ecb8b0af0292139d
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:32:35 2016 +0100

        Fixed issue with deletion of wrong values

    commit 4ca39ec5bfb905621de8c80999cf640a8ad6d5e0
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:28:59 2016 +0100

        removed nolonger needed licence

    commit d2ab0f9a048d594d7115c41c2dbea2ce2d39e31b
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:28:18 2016 +0100

        Improve PBR and moved forward PBR into new shader

    commit cdaae6e2cf234f28cef90f244e2e24e6b7d0d915
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 21:26:57 2016 +0100

        Removed remaining area lighting and fixed pbr in deferred rendering

    commit 6fca9d3b98fc2cacea2a11129eb1fc69a7e2fd2f
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Fri Apr 1 13:19:48 2016 +0100

        Replaced data folder with one from mater to avoid commit revert errors

    commit 543c30f0b3b035df13ce09cc127117fb160bfe5f
    Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
    Date:   Thu Mar 31 20:52:47 2016 +0100

        Complete PBR work
2016-04-15 18:56:19 +08:00
damu
15ae25cd62 Fixed compiler error in https://github.com/urho3d/Urho3D/pull/1321.
Close #1322.
2016-04-14 07:39:10 +08:00
damu
43515e1c91 Added template version of ReleaseResource similar to the GetResource function. 2016-04-13 19:43:58 +03:00
Lasse Öörni
2771411577 Fix OBJ export in Drawable class. Fix wrong indexing in writing vertex colors in AssetImporter. Minor addition to documentation. 2016-04-13 15:48:43 +03:00
Lasse Öörni
ede04a46f1 Added equality operator to VertexElement. Add multiple color & UV channel (up to 4) support to AssetImporter. Make editor's resource browser recognize the UMD2 model format. Closes #707. 2016-04-13 13:43:33 +03:00
Lasse Öörni
31f8ff69ec New model format that supports arbitrary vertex declarations. 2016-04-12 23:57:19 +03:00
urho3d-travis-ci
2933454a21 Travis CI: API documentation update at 2016-04-12 19:24:12 UTC.
[ci package]

Commit: 2b259e85e0

Message: Change Texture::SetData() to take a raw pointer instead of shared to match rest of the API and simplify script bindings.
2016-04-12 19:24:12 +00:00
Lasse Öörni
7b738c54ac Merge branch 'master' into vertexdeclaration 2016-04-12 22:20:09 +03:00
Lasse Öörni
2b259e85e0 Change Texture::SetData() to take a raw pointer instead of shared to match rest of the API and simplify script bindings. 2016-04-12 22:02:58 +03:00
Lasse Öörni
49400b4b19 Fix using SDL booleans instead of window flags in SDL_SetWindowFullscreen(). Does not change actual behavior since SDL_TRUE & SDL_WINDOW_FULLSCREEN both equal 1. 2016-04-12 22:02:57 +03:00
Orz
09292b415b Shader animation bug is fixed.
Changed the conditions when unsubscribes the shader animation events.
Or it will unsubcribe all the events if you call SetShaderParameterAnimation function twice. (For example, you need to animate texture U and V )
2016-04-13 00:41:35 +08:00
Yao Wei Tjong 姚伟忠
8d7027179e Refactor to move the map's populate logic to base class for code reuse. 2016-04-12 12:51:34 +08:00
Lasse Öörni
2203cd41a6 Hack fix for window always getting maximized after fullscreen -> windowed change on D3D9 & D3D11. 2016-04-12 00:56:04 +03:00
Lasse Öörni
181c24e380 Since D3D9/11 graphics systems don't initialize OpenGL, it's arguably incorrect to call SDL_GL_GetDrawableSize. Use SDL_GetWindowSize instead. Correct line endings in Drawable2D. 2016-04-11 23:55:35 +03:00
Lasse Öörni
9cd0cbb200 Prevent taking screenshot when device is lost. 2016-04-11 23:36:07 +03:00
Lasse Öörni
5dc030c1dd Prevent taking screenshot when device is lost. 2016-04-11 22:03:56 +03:00
Yao Wei Tjong 姚伟忠
422406c3e7 Add C++11 variadic template version of the SendEvent() method. 2016-04-11 16:06:42 +08:00
Lasse Öörni
44133d00d9 Fix typo. 2016-04-11 00:35:41 +03:00
Lasse Öörni
a8ed3dd3a5 Updated VertexBuffer Lua bindings + demonstrate arbitrary vertex elements in DynamicGeometry Lua example. 2016-04-11 00:27:55 +03:00
Lasse Öörni
25f039b7e1 Add GetElementOffset & HasElement function bindings to AS VertexBuffer API. 2016-04-10 22:46:16 +03:00
Lasse Öörni
c872d6d335 Fix missing offset member in VertexElement AS binding. 2016-04-10 15:56:49 +03:00
urho3d-travis-ci
63c4cfa443 Travis CI: API documentation update at 2016-04-10 12:46:31 UTC.
[ci package]

Commit: fcb687bd08

Message: For Travis CI - attempt to free up more space on OSX build environment.
2016-04-10 12:46:31 +00:00
Lasse Öörni
644eecfa7d Demonstrate defining non-legacy vertex elements in the DynamicGeometry C++ & AngelScript examples. 2016-04-10 15:37:48 +03:00
Mike3D
b606060b98 Revert Graphics API commits af42c37 and b751108 2016-04-10 14:21:47 +02:00
Yao Wei Tjong 姚伟忠
bb428a1c21 Minor clean up to remove unused struct member. 2016-04-10 12:57:11 +08:00
Lasse Öörni
35b516b866 AngelScript binding for VertexElement struct + related enums. 2016-04-10 03:13:41 +03:00
urho3d-travis-ci
78bfb744ab Travis CI: API documentation update at 2016-04-09 15:25:13 UTC.
[ci package]

Commit: 4c8bd3efdd

Message: When debug drawing NavigationMesh, use earlier collected areas. Fix typos. Do not skip areas with ID 0, as it isn't documented anywhere that the default ID should equal ineffective.
2016-04-09 15:25:14 +00:00
Lasse Öörni
4c8bd3efdd When debug drawing NavigationMesh, use earlier collected areas. Fix typos. Do not skip areas with ID 0, as it isn't documented anywhere that the default ID should equal ineffective. 2016-04-09 17:37:08 +03:00
MonkeyFirst
070957e9b6 add Clear() on rebuild navMesh 2016-04-09 17:37:07 +03:00
MonkeyFirst
46d084b4e5 delete old get 2016-04-09 17:37:07 +03:00
MonkeyFirst
2f3290be26 gcc space inbetweene 2016-04-09 17:37:06 +03:00
MonkeyFirst
81f949faa6 add forwardecl 2016-04-09 17:37:05 +03:00
MonkeyFirst
320e8dac5c prefer nearest navArea & weakPtr array 2016-04-09 17:37:04 +03:00
MonkeyFirst
f9dbe2930c fix-areaID 2016-04-09 17:37:03 +03:00
Yao Wei Tjong 姚伟忠
8ac6bc2666 Add new API to get joystick by its name. 2016-04-09 22:29:14 +08:00
urho3d-travis-ci
c8fdc6eb2c Travis CI: API documentation update at 2016-04-09 14:13:25 UTC.
[ci package]

Commit: 3b1ab0ffea

Message: Partially revert back changes from commit af42c37.
2016-04-09 14:13:25 +00:00
Yao Wei Tjong 姚伟忠
3b1ab0ffea Partially revert back changes from commit af42c37. 2016-04-09 22:01:19 +08:00
Mike3D
af42c37179 More AS bindings fixes for Graphics API 2016-04-09 11:36:53 +02:00
urho3d-travis-ci
b682f559b6 Travis CI: API documentation update at 2016-04-08 17:23:36 UTC.
[ci package]

Commit: b751108456

Message: Fixed AS bindings for Animation and AnimationState
2016-04-08 17:23:36 +00:00
Mike3D
b751108456 Fixed AS bindings for Animation and AnimationState 2016-04-08 19:13:58 +02:00
1vanK
49a25f787c OgreImporter: fix relative to absolute transform and Jack's walk animation 2016-04-07 18:45:24 +03:00
Lasse Öörni
e0b76920ea Merge branch 'master' into vertexdeclaration 2016-04-07 15:58:20 +03:00
Lasse Öörni
de956301a0 D3D11 arbitrary vertex attributes. Eliminate constant string manipulation when switching shaders on D3D11. 2016-04-07 14:36:42 +03:00
Lasse Öörni
d6ccd8a644 Reinstate the "null VBO" check to prevent crash from rendering with an uninitialized vertex buffer. 2016-04-07 00:59:05 +03:00
Lasse Öörni
8215c42e37 OpenGL arbitrary vertex attributes. Change GLSL attribute indexing to zero-based to match HLSL, so the second texcoord (lightmaps, billboard sizes) is now called texCoord1, and instancing texcoords are texCoord4,5,6. 2016-04-07 00:32:41 +03:00
Lasse Öörni
06d8ea602d Move legacy vertex element information to GraphicsDefs.cpp so that it doesn't have to be repeated for different graphics APIs. 2016-04-06 00:39:23 +03:00
Lasse Öörni
ab1902ad0a When creating a vertex declaration, do not go through current buffer's elements unnecessarily when looking for elements to override. 2016-04-06 00:16:12 +03:00
urho3d-travis-ci
1f2ee21135 Travis CI: API documentation update at 2016-04-05 11:40:12 UTC.
[ci package]

Commit: 0c10106cd8

Message: Dummy implementation for D3D9 Texture2DArray. Texture2DArray Lua bindings.
2016-04-05 11:40:12 +00:00
Lasse Öörni
0c10106cd8 Dummy implementation for D3D9 Texture2DArray. Texture2DArray Lua bindings. 2016-04-05 14:31:33 +03:00
Lasse Öörni
e0e5bb713a Special case check for LOG_RAW in Log::Write(). Closes #1307. 2016-04-05 12:21:17 +03:00
Yao Wei Tjong 姚伟忠
e6121551bc Refactor SIMD support. Related to #1293. 2016-04-05 06:35:47 +08:00
Lasse Öörni
6a3f61f770 Fix billboard rendering. Calculate legacy vertex element bitmask only once. When setting vertex data for directional billboards, query camera world position just once. 2016-04-05 01:19:26 +03:00
Lasse Öörni
9523a36334 Fix Lua bindings & declaration of legacy vertex elements. 2016-04-05 00:32:18 +03:00
Lasse Öörni
a458d30fd5 Initial freeform vertex declarations for D3D9. 2016-04-05 00:32:17 +03:00
Lasse Öörni
55d1d82784 Improved occluder sorting contributed by Enhex. Closes #1305. 2016-04-04 20:47:12 +03:00
Lasse Öörni
93927e39e6 Merge remote-tracking branch 'cosmy1/update-libcpuid' 2016-04-04 19:55:12 +03:00
Lasse Öörni
deaeb1d9fa Merge remote-tracking branch 'r-ku/c++11-events' 2016-04-04 19:31:06 +03:00
rokups
740ff3491a C++11 event binding (lambdas/std::bind).
Removed redundant EventHandler() constructor.
2016-04-04 16:43:33 +03:00
hdunderscore
ace93bd98a - Fix touch input bug (https://github.com/urho3d/Urho3D/issues/1303)
- Fix event name typo in script samples.
2016-04-04 19:36:53 +10:00
Yao Wei Tjong 姚伟忠
4d67a73bfc Adjust CMakeLists.txt as now STB is a header-only implementation.
Additionally, remove all the local changes as they are either not required as the bug has already been fixed upstream or there are other ways to do what we want to do without altering the original code.
2016-04-03 16:45:40 +08:00
Yao Wei Tjong 姚伟忠
81146fb816 Merge commit '5fa31a5194c0bf3a93662670a6e8f77cb6efddc0' as 'Source/ThirdParty/STB' 2016-04-03 16:44:10 +08:00
Yao Wei Tjong 姚伟忠
7a8986813f Replace Source/ThirdParty/STB subdirectory with subtree. 2016-04-03 16:44:06 +08:00
cosmy
b8054fc057 Update libcpuid to 0.2.2 2016-04-02 22:29:34 +02:00
Lasse Öörni
3cb270060f Fix compile for OpenGL ES 2.0. 2016-04-02 20:42:32 +03:00
urho3d-travis-ci
3ee4483e39 Travis CI: API documentation update at 2016-04-02 15:40:08 UTC.
[ci package]

Commit: b8e2df4373

Message: Merge pull request #1298 from cosmy1/patch-9

Use _WIN32 for code consistency
2016-04-02 15:40:08 +00:00
Lasse Öörni
b8e2df4373 Merge pull request #1298 from cosmy1/patch-9
Use _WIN32 for code consistency
2016-04-02 18:17:39 +03:00
Lasse Öörni
30fbe453ef Add AngelScript binding (when applicable) for Texture2DArray. 2016-04-02 18:10:50 +03:00
cosmy1
a6b9fb3f8b Use _WIN32 for code consistency 2016-04-02 16:12:53 +02:00
reattiva
e253afe756 Fixed D3D9 build. 2016-04-02 10:37:08 +02:00
reattiva
88d403b9b8 Added Texture2DArray. 2016-04-02 02:04:42 +02:00
Yao Wei Tjong 姚伟忠
c833a03b9f Fix sincosf() function detection. Hide new defines from Urho3D.pc. 2016-04-01 08:28:21 +08:00
Lasse Öörni
e9b094c8d2 Check for existence of sincosf / __sincosf instead of guessing. Closes #1294. 2016-03-31 23:33:50 +03:00
Lasse Öörni
9abc4712a6 Remove unneeded GetD3DColor() function from D3D11 code. 2016-03-31 11:45:02 +03:00
Yao Wei Tjong 姚伟忠
ce434a5057 Attempt to fix nanodbc library build using VS2015.
Disable URHO3D_DATABASE_ODBC build option when MSVC compiler version is less than 14.0 (VS2015).
[skip travis]
2016-03-31 13:29:51 +08:00
Lasse Öörni
a2d26d8797 AngelScript ScriptInstance attribute storage during hot reload. Also restores attributes for later use if hot reload resulted in an error and inability to recreate the object right away. Closes #1291. 2016-03-30 22:23:23 +03:00
Yao Wei Tjong 姚伟忠
929d8acbae Misc. bug fixes and refactoring in configuring SDL library build.
- Fix the regex to get the shared library soname correctly.
- Use the GCC_ATOMIC and CLOCK_GETTIME whenever they are available.
- Reorganize the if-else block in the SDL CMakeLists.txt to prevent Unix-like platforms (e.g. Android) from entering the block meant for genuine Unix/Linux.
- and more.
2016-03-30 07:15:20 +08:00
Lasse Öörni
d1096470d5 Execute DelayedStart() in ScriptInstance, LuaScriptInstance & LogicComponent before first FixedUpdate() if it comes sooner than Update(). Fix long-standing bug in NinjaSnowWar where the ninja orientation would be overwritten by yaw=0 from controls. 2016-03-29 21:45:18 +03:00
rokups
6fd0fa7a5b Aggregate initializers for container types. 2016-03-29 21:45:17 +03:00
rokups
6a9e2eaee7 Expose ValueAnimationInfo in shared library 2016-03-29 21:45:17 +03:00
urho3d-travis-ci
5e65eee41e Travis CI: API documentation update at 2016-03-29 17:43:44 UTC.
[ci package]

Commit: 5246f74984

Message: Merge remote-tracking branch 'hdunderscore/input_mousemode_update'
2016-03-29 17:43:44 +00:00
Lasse Öörni
5246f74984 Merge remote-tracking branch 'hdunderscore/input_mousemode_update' 2016-03-29 19:49:55 +03:00
Lasse Öörni
32904aefec Guard against drawable updates being inserted during threaded drawable update. Add these to separate container and process later. Inspired by PR work submitted by guijun. 2016-03-29 15:27:29 +03:00
Lasse Öörni
45d7509ed7 Remove unused variable from Octree. 2016-03-29 12:10:45 +03:00
Lasse Öörni
da906d5c7c Merge remote-tracking branch 'cosmy1/fix' 2016-03-29 11:31:25 +03:00
Lasse Öörni
28dc4ff557 Fix wrong true/false logic and unnecessary CString() in AnimatedSprite2D code. Closes #1289. 2016-03-29 11:18:14 +03:00
hdunderscore
467c4bd4e8 - Updated sample mouse mode setup.
- (Web) Removed some of the exit engine logic.
2016-03-27 20:01:22 +11:00
hdunderscore
97a94f9022 Updated mouse suppression and relative code. 2016-03-27 19:32:27 +11:00
cosmy
918f3fdcc6 Initialize all class members in DetourCrowd 2016-03-26 14:28:01 +01:00
cosmy
7f4ddfcd33 Add contributor name in file header 2016-03-26 14:25:46 +01:00
cosmy
8e4d21f6ae Initialize all class members in DetourTileCache 2016-03-26 14:04:02 +01:00
Frode Lindeijer
af2cf18229 Moved container begin and end from std to Urho3D namespace 2016-03-25 15:46:55 +02:00
Lasse Öörni
062856a26d Merge pull request #1283 from cosmy1/fix-warnings
Fix signed/unsigned mismatch in FontFaceFreeType.cpp
2016-03-25 12:57:01 +02:00
Yao Wei Tjong 姚伟忠
433a97a351 Follow the latest code convention for source code modification. 2016-03-25 10:16:46 +08:00
Lasse Öörni
ea3f05c1c5 Restore the explicit xpath_node copy constructor. 2016-03-24 23:49:20 +02:00
cosmy
ad7aeafa10 Use C style casting on numbers to keep code consistency 2016-03-24 22:18:31 +01:00
Lasse Öörni
3a51592493 Merge remote-tracking branch 'cosmy1/update_pugixml' 2016-03-24 23:15:25 +02:00
cosmy
6406996d6a Fix signed/unsigned mismatch in FontFaceFreeType.cpp 2016-03-24 21:15:43 +01:00
cosmy
ec3cbc37b6 Update pugixml from 1.5 to 1.7 2016-03-24 15:50:00 +01:00
cosmy
5bcc6663a4 Remove extra stb header 2016-03-24 15:46:55 +01:00
Lasse Öörni
152e090141 Alias Vector4 to Color if necessary in Variant::GetColor(). Closes #1278. 2016-03-24 16:31:33 +02:00
Lasse Öörni
382a7a35c5 Merge remote-tracking branch 'origin/sincos' 2016-03-24 14:48:35 +02:00
Lasse Öörni
9a1b92c892 Merge remote-tracking branch 'cosmy1/master' 2016-03-24 13:53:13 +02:00
Lasse Öörni
cfbe7a425a Include DebugNew.h last in Component.cpp to match convention used elsewhere. 2016-03-24 13:41:21 +02:00
Lasse Öörni
6a32b478e7 Merge pull request #1275 from cosmy1/patch-3
Fix macro ident space
2016-03-24 13:40:48 +02:00
cosmy
52d2ca5ee0 Remove unused STB headers 2016-03-24 05:22:06 +01:00
cosmy1
869e32ad6e Fix wrong directory path to JSONValue 2016-03-24 05:02:39 +01:00
cosmy1
123b600aae Fix macro ident space 2016-03-24 04:59:03 +01:00
Lasse Öörni
0378b245a9 Use __sincosf on OSX. 2016-03-23 15:21:16 +02:00
Lasse Öörni
b16fc6493b Add a function SinCos() which uses sincosf on GCC for optimized billboardset update, and falls back to separate sinf & cosf calls elsewhere. Todo: add for other cases. 2016-03-23 13:03:08 +02:00
Yao Wei Tjong 姚伟忠
72549e108d Merge commit '286f5cf9e60df25c409df07e1033478b62ddbe55' into master 2016-03-23 16:19:00 +08:00
Yao Wei Tjong 姚伟忠
bb59c16cac Merge commit 'd7560271d1699c7dc6762ca26a70f8f366491ad5' into master. 2016-03-23 16:18:31 +08:00
hdunderscore
54565005e2 Updated HTML5 behavior of the samples, mouse modes and UI cursor.
Updates:
- Exposed a new method to determine whether the mouse pointer is confined to window.
- E_MOUSEMODECHANGED now has a new parameter, P_MOUSELOCK, indicating whether the mouse pointer is locked.
- MM_ABSOLUTE now behaves more closely to the desktop equivalent (web)
- Changed some samples to use different mouse movement methods as test cases.
- Input class: suppressNextMouseMove_ now suppresses all movements within the tick.
- Added script bindings for the Input class changes.
- On Web platform, removed event polling and instead use event callbacks, allowing pointer-lock requests to occur in browser events.

Bug fixes:
- Fixed mouse jumps on entering and exiting pointer-lock (web)
- Fixed a bug that caused the UI cursor and OS cursor to fall out of sync (web)
- Fixed a bug that could allow pointer-lock to be acquired after a different mouse mode was requested. (web)
- Prevent most samples from exiting on Web platform
- Reverted previous fix to web platform touch events, as upstream SDL has corrected the corresponding bug.
2016-03-23 01:52:12 +11:00
Lasse Öörni
b7a7bdb705 Tabs to spaces, minor comment cleanup. Document new AssetImporter command line option. 2016-03-22 12:46:40 +02:00
Terence
d73be95692 AssetImpoter can import a subset animation frames. 2016-03-22 03:51:45 +08:00
Lasse Öörni
3743a3c102 Merge remote-tracking branch 'r-ku/CreateObject' 2016-03-21 12:21:45 +02:00
Lasse Öörni
e178939f33 Merge remote-tracking branch 'rikorin/sample-fix' 2016-03-21 12:09:34 +02:00
Lasse Öörni
1afdd26927 Remove IsNull() checks from JSON save. Closes #1265. 2016-03-21 11:47:50 +02:00
rikorin
51c7a94a04 Type mismatch in vehicle sample code 2016-03-21 13:18:42 +05:00
bit
d503a84e81 Convenience method Context::CreateObject<T>() for creating objects akin to Node::CreateComponent<T>(...) 2016-03-20 17:41:08 +02:00
Yao Wei Tjong 姚伟忠
adbbb08ab4 Pass extra CMake variable to external project when building tolua++. 2016-03-20 14:12:05 +08:00
Lasse Öörni
642f09817e Added contributor credit. Use "unsigned" data type consistently since it's guaranteed to be 32bit on the platforms Urho compiles on. 2016-03-19 14:11:58 +02:00
Lasse Öörni
2551e5698c Merge remote-tracking branch 'damu/master' 2016-03-19 13:38:54 +02:00
damu
1c80774106 Adapted code convention. 2016-03-19 12:14:43 +01:00
Lasse Öörni
4d3d2affbb Disable the in_title_click data & focus_click_pending tests for SDL windows mouse warp, as it seems to lead into issues when regaining focus. Closes #1258. 2016-03-19 12:10:08 +02:00
damu
8328a33de9 Optimized Image::Clear() for the four component case (ARGB). In my case this optimized Clear() only takes ~0.362ms compared to 14.853ms before, see http://i.imgur.com/8O7V77o.jpg http://i.imgur.com/qjhkaWw.jpg.
There could be an issue, see #1260.
2016-03-19 08:28:05 +01:00
Lasse Öörni
0631a8a9e2 Merge remote-tracking branch 'GKR/bugfix/sdl-wayland-undefined-references' 2016-03-19 01:16:14 +02:00
Lasse Öörni
aa1199ebf1 Add ODBC compile fix for Windows from lvshiling. Closes #1256. 2016-03-18 12:04:08 +02:00
urho3d-travis-ci
4a261b1f2c Travis CI: API documentation update at 2016-03-18 02:19:25 UTC.
[ci package]

Commit: ecb0ee38a2

Message: Added missing include.
2016-03-18 02:19:25 +00:00
hdunderscore
ecb0ee38a2 Added missing include. 2016-03-18 11:55:37 +11:00
Lasse Öörni
a973d8318d Implement pause/resume by sound type in Audio. Closes #1250. Demonstrate by pausing "Effect" type sounds in NinjaSnowWar when the game is paused. Cut quiet part from beginning of NutThrow sound to reduce perceived audio lag when attacking. 2016-03-17 23:01:55 +02:00
Gunnar Kriik
20c31802db Applied patch to fix undefined reference error when compiling for Wayland on Linux.
This has been fixed in SDL, but no SDL release has been made that includes this fix.

The SDL fix can be found here:
https://hg.libsdl.org/SDL/rev/330f500d5815

In the mean time, this fixes Urho3D compilation on Linux.
2016-03-17 19:04:09 +01:00
urho3d-travis-ci
8f4884f1fb Travis CI: API documentation update at 2016-03-16 14:36:03 UTC.
[ci package]

Commit: 3d9ea8eece

Message: Editor: fix some warnings
2016-03-16 14:36:03 +00:00
Ivan K
3d9ea8eece Editor: fix some warnings 2016-03-16 15:47:39 +02:00
urho3d-travis-ci
e9cd8db735 Travis CI: API documentation update at 2016-03-16 10:07:14 UTC.
[ci package]

Commit: a9625eae8a

Message: Add contributor credit, fix editor code comment.
2016-03-16 10:07:15 +00:00
Lasse Öörni
1877fb3b90 Minor space fix in code. Make editor stop itself when minimized and reduce defocused FPS to 10. Increase hierarchy window initial size to match inspector window initial size. 2016-03-16 11:51:17 +02:00
Lasse Öörni
cd920ccab8 Unify line break style in HashMap.h. 2016-03-16 11:26:28 +02:00
Lasse Öörni
cf64853faa Merge remote-tracking branch 'BlueMagnificent/global_variable' 2016-03-16 11:25:51 +02:00
Blue, The Magnificent
bfe39c6a3f Enhancement to global variable implementation 2016-03-15 23:08:01 +01:00
urho3d-travis-ci
385a1538fd Travis CI: API documentation update at 2016-03-15 18:11:17 UTC.
[ci package]

Commit: be2ae85427

Message: Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on iOS platform.
2016-03-15 18:11:17 +00:00
Yao Wei Tjong 姚伟忠
be2ae85427 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on iOS platform.
2016-03-16 01:45:09 +08:00
Yao Wei Tjong 姚伟忠
06bcfbeb7b Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on Web platform.
2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
3e40a5ebeb Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on Windows platform.
2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
f5fcfc48f1 Set CMake minimum version to 3.2.3 for Windows platform.
This is in preparation to use optional components feature of find_package() command for FindDirectX.cmake module (was FindDirect3D).
2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
71efb146cb Refactor the CPU instruction extensions detection mechanism.
Fix SDL build on the latest Raspbian Jessie release.
2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
14d4e0d378 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on Linux, Android, and RPI platforms.
2016-03-16 01:45:08 +08:00
Lasse Öörni
250bb0e7d1 Include <cstdio> unconditionally in FileSystem.cpp to fix remove() compile error on Emscripten. 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
a09a153f5e Integrate SDL's original CMakeLists.txt into Urho3D build system.
Close #1046. Close #1123. Close #1172.
2016-03-16 01:44:11 +08:00
Yao Wei Tjong 姚伟忠
fba647f7f8 Refactor to handle graphics restore similarly between iOS and Android. 2016-03-16 01:42:01 +08:00
Yao Wei Tjong 姚伟忠
ccf6648eb3 Utilize new SDLActivity's get arguments feature. 2016-03-16 01:42:01 +08:00
Yao Wei Tjong 姚伟忠
5bcd5e4b1d Merge SDL 2.0.4
- Revert back commits from PR #191. The media keys support on Linux/x11 platform will be reinvestigated later.
- Add additional include dir for RPI platform. This change is to keep the original SDL/src/video/raspberry/SDL_rpivideo.h header file happy. Previously we were using a slightly altered header file.
- Merge changes from SDL's android-project template.
- Add new source files for Android platform into SDL's CMakeLists.txt. Use new SDL hint to separate mouse and touch events on Android platform. Strangely though a similar hint does not exist on iOS platform, so we retain our local changes to suppress emulated events on iOS platform.
- Adjust OSX and iOS linker flags to include more frameworks.
- Turn ARC on when compiling Objective-C on iOS platform.
- Enable SDL_WINDOW_ALLOW_HIGHDPI on all Apple platforms. Replace all the SDL_WindowGetSize() call with SDL_GL_GetDrawableSize() call in all the graphics backend implementation classes. The former now returns the number in screen coordinates while the latter returns the number in pixels suitable for setting up the glViewport.
- Always use fullscreen mode for iOS platform. Revert back local changes in SDL src/video/uikit/SDL_uikitviewcontroller.m.
2016-03-16 01:09:49 +08:00
Yao Wei Tjong 姚伟忠
714014baff Merge commit '295b0a95b345c060ea489ab6111cb4fff13124fd' as 'Source/ThirdParty/SDL' 2016-03-16 01:05:38 +08:00
Yao Wei Tjong 姚伟忠
d8a39273da Replace Source/ThirdParty/SDL subdirectory with subtree. 2016-03-16 01:05:35 +08:00
Lasse Öörni
07ade6e110 Don't call DebugRenderer::SetView() if viewport debug rendering is off. Fixes #1244. 2016-03-15 11:40:32 +02:00
Blue, The Magnificent
864a455572 script scoped global variable not needed anymore 2016-03-15 06:47:08 +01:00
Blue, The Magnificent
f3b505ad26 Add binding for global variables getter and setter in angelscript and lua 2016-03-15 06:46:34 +01:00
Blue, The Magnificent
f1864f498a implement application wide global variable 2016-03-15 06:44:52 +01:00
urho3d-travis-ci
23bda782ca Travis CI: API documentation update at 2016-03-14 19:34:55 UTC.
[ci package]

Commit: 18f3204c14

Message: Change textureEdgeOffset to be pixels to work similarly regardless of texture size. Add AngelScript & Lua bindings for it. Change default offset to be 0 to not change existing behavior.
2016-03-14 19:34:55 +00:00
Lasse Öörni
18f3204c14 Change textureEdgeOffset to be pixels to work similarly regardless of texture size. Add AngelScript & Lua bindings for it. Change default offset to be 0 to not change existing behavior. 2016-03-14 21:17:32 +02:00
OvermindDL1
48346b278c Fix Sprite2D edge bleeding via new member variable. 2016-03-14 21:17:32 +02:00
Lasse Öörni
6869970375 Merge pull request #1240 from 1vanK/master
tabs to spaces
2016-03-14 00:11:41 +02:00
Ivan K
5f1f311535 tabs to spaces 2016-03-14 00:12:25 +04:00
Lasse Öörni
01cd737909 Hide tooltip if the target element becomes invisible. Possible fix for #1238. 2016-03-13 14:46:23 +02:00
ssinai1
ff4d5b4125 Fix terrain index data 2016-03-11 22:53:02 +01:00
urho3d-travis-ci
4cf41f1346 Travis CI: API documentation update at 2016-03-10 14:31:49 UTC.
[ci package]

Commit: 1fba0c80de

Message: Document additive animation blending.
2016-03-10 14:31:49 +00:00
Lasse Öörni
33bea5392d Rename AnimationBlendingMode to AnimationBlendMode for brevity and similarity with Graphics class BlendMode. Rename ABM_OVERRIDE to ABM_LERP. Implement weight to additive blending. Serialize blend mode over network for AnimationController. 2016-03-10 15:49:37 +02:00
Lasse Öörni
33d9dafc0c Merge remote-tracking branch '1vanK/master' 2016-03-10 14:42:51 +02:00
Lasse Öörni
aa48f333b3 Only update View3D rendertarget when it's visible in the UI. Closes #1228. 2016-03-09 15:07:23 +02:00
Lasse Öörni
49ce2984fe Generate skinning information if animated model has non-skinned subgeometries. Closes #1227. 2016-03-09 14:14:39 +02:00
Lasse Öörni
2e96545687 Output warning in AssetImporter when model has bones and consists of many submeshes, some of which don't have skinning information. 2016-03-09 00:38:47 +02:00
Ivan K
4e1eb4df74 AniamtionCotrol supports animation blending 2016-03-08 14:02:12 +04:00
Lasse Öörni
21e9ea07f2 Restore stb_image header credits. 2016-03-08 01:32:40 +02:00
Lasse Öörni
970ebe85db Merge remote-tracking branch 'dragonCASTjosh/STB_Update' 2016-03-08 01:31:31 +02:00
Lasse Öörni
6afb1bb164 Remove the uint overloads of Min() & Max() for now as they could lead to AngelScript ambiguous overload errors if the script author is not careful. 2016-03-06 15:30:48 +02:00
Lasse Öörni
d9a295a595 Re-enable the unsigned/signed mismatch warning. Code cleanup. 2016-03-06 15:10:34 +02:00
Lasse Öörni
039542e91c Warning, compile & script binding fixes related to MathDefs.h. Use multiple template parameters where necessary to allow e.g. Min() or Max() with mixed int and unsigned values. Silence repeated warnings in MathDefs.h on MSVC. 2016-03-05 23:47:49 +02:00
TheComet
f8760c8e5a Trig functions are now templated 2016-03-05 22:20:21 +02:00
TheComet
62d8143aa3 Template versions of math functions 2016-03-05 22:20:09 +02:00
Lasse Öörni
2cbff0669d Search for a common root up to the scene root node if necessary, if there seem to be multiple skeleton roots. Allow saving animations also when no geometry. To improve animation save in that case, prepend the output filename to animation filename in any case. Closes #1221. 2016-03-05 21:31:01 +02:00
Ivan K
1eeab3f2db Additive animation blending
Additive animation blending fix

Additive animation blending normalized rotation + bindings
2016-03-05 23:26:40 +04:00
urho3d-travis-ci
d0c35c2eaf Travis CI: API documentation update at 2016-03-05 14:56:06 UTC.
[ci package]

Commit: cf92a49696

Message: Since Variant::GetVectorBuffer() returns a new value copy, it doesn't need to be const. Fixes #1226.
2016-03-05 14:56:06 +00:00
Lasse Öörni
cf92a49696 Since Variant::GetVectorBuffer() returns a new value copy, it doesn't need to be const. Fixes #1226. 2016-03-05 16:37:01 +02:00
Yao Wei Tjong 姚伟忠
64dcd0e41a Do not build Urho3DPlayer when none of the script subsystem is enabled.
Fix #1224.
2016-03-05 21:03:29 +08:00
dragonCASTjosh
405e86db46 Removed Unused STB librarys and added Urho specific changes to STB 2016-03-05 12:27:26 +00:00
Lasse Öörni
6b5b6ab4b3 Document node & UI element tagging. Closes #1176. Fixes in scene model documentation. Tabs to spaces in Scene AngelScript API. 2016-03-05 13:13:50 +02:00
urho3d-travis-ci
3ccc22f63b Travis CI: API documentation update at 2016-03-05 10:56:18 UTC.
[ci package]

Commit: fc1f05f8dc

Message: Add script binding for SpriteSheet2D::SetTexture().
2016-03-05 10:56:18 +00:00
Lasse Öörni
fc1f05f8dc Add script binding for SpriteSheet2D::SetTexture(). 2016-03-05 12:45:14 +02:00
Lasse Öörni
89a1f84fd1 Code & API convention edits. 2016-03-05 12:32:26 +02:00
Lasse Öörni
d8ddc579c0 Squashed commit of the following:
commit a6fb2a3b49b52dfb559956a6dc3b2f59373f8487
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 15:19:38 2016 -0700

    Added a check to make TmxFile2D::SetInfo return false and do nothing if there is already layer data, likely to pretty well corrupt rendering and possible access invalid memory without it in worst-case.

commit a1e5150f993f92ae84a0513718ee2eee7bbbf2f0
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 15:16:34 2016 -0700

    Helps to return success, was planning for more functionality there, but TmxFile and Tilemaps need an overhaul.

commit 39618ce0713db0246a252e8f7ca8c03d39725338
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 13:44:33 2016 -0700

    Forgot a pointer...

commit 1f9e5caa3e888deedb7c3be48cfa3726adaaf4fd
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 13:43:34 2016 -0700

    Removed the .gitignore change, better to build out-of-tree in any case.

commit f56598abdebe33a125769c527495412e759ea532
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 13:31:51 2016 -0700

    Fix TmxFile2D::SetInfo

commit 108b0ccea1f842f676085a43c73613a8ed2bf786
Merge: 4b5d636 75fbe73
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:58:40 2016 -0700

    Added setter for SpriteSheet2D to actually be able to set a texture.  Closes urho3d/Urho3D#1202

commit 4b5d6364d67f26ad7ee38257fa2a6026750a93ff
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:56:27 2016 -0700

    Added setter for SpriteSheet2D to actually be able to set a texture.  Closes urho3d/Urho3D#1202

commit 75fbe730ef0d8fcc9db7b1831b602836e1093d14
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:56:27 2016 -0700

    Added setter for SpriteSheet2D to actually be able to set a texture.

commit 4352d1283b27665a3090145b6608bf724c73add5
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:41:55 2016 -0700

    Some setters for the Tilemap, but stopped, need to rewrite it to properly fix it, *way* too integrated with the TMX foramt for some reason...

commit 23dd624dbc7ed89658c394c9cac13d33c9d2df74
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:25:56 2016 -0700

    Fix gitignore to ignore a build directory

commit bfec381022e57f130b502f8c4877127460e6f351
Merge: 1851f27 281de05
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 11:52:00 2016 -0700

    Merge remote-tracking branch 'upstream/master'

commit 1851f27124b5eca2851771df7d4097f97d8d129d
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Sat Nov 15 00:22:39 2014 -0700

    Revert "Spelling fix:  curent -> current"

    This reverts commit 644eed43e9a61b7fedc01a21fb6a17244a815a51.

commit 644eed43e9a61b7fedc01a21fb6a17244a815a51
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Nov 14 23:43:49 2014 -0700

    Spelling fix:  curent -> current
2016-03-05 12:22:54 +02:00
dragonCASTjosh
5698f9205a Change towards getting STB working on shared 2016-03-04 21:01:59 +00:00
Lasse Öörni
6538f3bb4a Use glReadPixels() workaround to get texture data from rendertargets on GLES. For regular textures this cannot be used. 2016-03-02 18:16:58 +02:00
urho3d-travis-ci
65180c8b80 Travis CI: API documentation update at 2016-03-02 14:23:59 UTC.
[ci package]

Commit: 633a6fa512

Message: Add function to get a per-face image to TextureCube AngelScript API. Similar to GetImage for Texture2D, does not support block compressed formats.
2016-03-02 14:23:59 +00:00
Lasse Öörni
633a6fa512 Add function to get a per-face image to TextureCube AngelScript API. Similar to GetImage for Texture2D, does not support block compressed formats. 2016-03-02 16:14:14 +02:00
dragonCASTjosh
948f99bd6f Merge pull request #3 from urho3d/master
Update from master
2016-03-02 11:40:28 +00:00
Yao Wei Tjong 姚伟忠
3a29bc2f3c Suppress unnecessary debug log entry due to default autoload feature. 2016-03-02 17:46:54 +08:00
dragonCASTjosh
206176eb7a Changes to fix compile errors related to stb_vorbis 2016-02-29 12:59:00 +00:00
Lasse Öörni
84b41355a7 Fix compiling Urho3D without physics. Note that the editor would still be unable to run without physics support compiled in. Closes #1216. 2016-02-29 12:23:50 +02:00
dragonCASTjosh
10a92cd49a changes to CMake to add headers 2016-02-29 00:32:43 +00:00
dragonCASTjosh
f67f35f002 Changes to fix the compile error 2016-02-29 00:23:26 +00:00
dragonCASTjosh
4fb746bfd1 Removed code that no longer is needed (as far as i know) 2016-02-28 23:58:24 +00:00
dragonCASTjosh
103fe32dd1 Now working and Added initial .HDR support 2016-02-28 23:50:21 +00:00
dragonCASTjosh
eea684879b Add define for STB 2016-02-26 11:06:14 +00:00
TheComet
b64f4a7c2e Exposing AnimationTrack class as part of the public API 2016-02-24 22:48:56 +01:00
dragonCASTjosh
6313b6f80e Initial Work (May not work) 2016-02-24 11:46:18 +00:00
Lasse Öörni
8c839265f0 Use camera's frustum for Renderer2D culling always. Closes #1191. 2016-02-24 11:51:09 +02:00
Yao Wei Tjong 姚伟忠
6e0a447ebb Break fix for SDL library build when using Raspbian Jessie.
[ci only: RPI] [skip appveyor]
2016-02-22 23:26:41 +08:00
Lasse Öörni
86adac5ff7 When a 2D rigidbody is parented, make sure the transforms are applied in parent->child order. Also apply the world position also for a static or sleeping rigidbody when it's parented, to make sure the simulation and rendering transforms stay in sync. Fix possible issue with null weakptr during physics 2D update. Closes #1183. 2016-02-21 14:14:16 +02:00
urho3d-travis-ci
c070f76ad8 Travis CI: API documentation update at 2016-02-21 10:22:26 UTC.
[ci package]

Commit: 09e1330f5f

Message: Add Technique::Clone(). Improve Technique / Pass Lua bindings. Closes #1203.
2016-02-21 10:22:27 +00:00
Lasse Öörni
09e1330f5f Add Technique::Clone(). Improve Technique / Pass Lua bindings. Closes #1203. 2016-02-21 12:12:53 +02:00
Yao Wei Tjong 姚伟忠
3582dccabb Partially revert back changes in the FileWatcher class.
The thread needs to be stopped before closing the file watcher on OSX platform to avoid segfault.
Related to e1c5057bee.
2016-02-21 10:31:23 +08:00
Lasse Öörni
4b7307ca2f Always disable use of aligned structs in Bullet API. Closes #1193 and #1134. 2016-02-20 23:18:29 +02:00
Lasse Öörni
281de051a5 Remember to copy shader parameter hash when a material is cloned. Closes #1192. 2016-02-17 19:40:23 +02:00
Lasse Öörni
e1c5057bee Merge remote-tracking branch 'TheComet93/iss1196' 2016-02-17 19:10:26 +02:00
Lasse Öörni
9fa87d54b6 Similar implicit conversion for WeakPtr. 2016-02-15 17:58:35 +02:00
Lasse Öörni
01d98cdf2c Tab to space. Added contributor credit. 2016-02-15 17:46:46 +02:00
Lasse Öörni
67a7c3f2bc Merge remote-tracking branch 'AntonPetrov83/sharedptr-implicit-conversion' 2016-02-15 17:31:24 +02:00
Lasse Öörni
46e434141e Apply & further improve WorldToHeightMap() fix from Lumak. 2016-02-15 17:00:33 +02:00
TheComet
a48f0e57ad fixes #1196 - Filewatcher no longer gets stuck in read() 2016-02-13 01:53:48 +01:00
Антон Петров
a6015e921b Allow implicit conversions of SharedPtr objects. 2016-02-13 01:39:19 +03:00
Lasse Öörni
213be51f92 Fix 2D particle emitter case where it would potentially try to emit more particles than there is space reserved for. Thanks yiown. Closes #1190. 2016-02-11 17:32:35 +02:00
Lasse Öörni
30c9fcc8df Cleanup use of unsigned long from OBJ exporter code, as it's actually different sized on different platforms. 2016-02-10 11:11:23 +02:00
MonkeyFirst
4a9fb69f62 fix obj exporter bugs 2016-02-06 15:57:37 +06:00
Yao Wei Tjong 姚伟忠
b528268d81 Correct copy-paste error on Matrix2 header file.
[ci package]
2016-02-06 00:05:30 +08:00
urho3d-travis-ci
64877df1e3 Travis CI: API documentation update at 2016-02-05 12:05:57 UTC.
[ci package]

Commit: 45572769c6

Message: Merge remote-tracking branch 'TheComet93/matrix2'

# Conflicts:
#	Source/Urho3D/AngelScript/MathAPI.cpp
2016-02-05 12:05:57 +00:00
Lasse Öörni
45572769c6 Merge remote-tracking branch 'TheComet93/matrix2'
# Conflicts:
#	Source/Urho3D/AngelScript/MathAPI.cpp
2016-02-05 13:51:07 +02:00
TheComet
bfa6e3de91 Adding Lua bindings for Vector2::Angle() 2016-02-04 18:45:47 +01:00
TheComet
2281162d7a Adding AngelScript bindings for Vector2::Angle() 2016-02-04 18:44:27 +01:00
TheComet
d38c24d4f2 Wrote Angle() member function for Vector2 class 2016-02-04 18:42:45 +01:00
TheComet
217066baf2 Adding lua bindings for Matrix2 2016-02-04 18:41:38 +01:00
TheComet
a42299202c Adding AngelScript bindings for Matrix2 2016-02-04 18:41:23 +01:00
TheComet
ab2198ecb1 Added Matrix2 class 2016-02-04 17:20:52 +01:00
Yao Wei Tjong 姚伟忠
7c2be809c0 Don't use Clang color diagnostics when building LuaJIT_universal. 2016-02-03 15:40:40 +08:00
Yao Wei Tjong 姚伟忠
911d26674a Fix luajit (interpreter) target dependency.
It should just depend on LuaJIT_universal custom target instead of LuaJIT target when the custom target is available. This ensures parallel build always ends up in a deterministic/desired order. The issue was picked up thanks to Travis CI again.
[ci only: OSX] [skip appveyor]
2016-02-03 11:48:11 +08:00
Yao Wei Tjong 姚伟忠
1e311acb6a Speed up build for Debug configuration by building only active arch. 2016-02-02 22:19:57 +08:00
Yao Wei Tjong 姚伟忠
17026be8eb Expose RenderPathCommand and RenderTargetInfo as Urho public API. 2016-01-31 09:06:38 +08:00
Lasse Öörni
f651101a28 Merge master AnimatedModel bone bounding boxes from the other AnimatedModels in the same node to prevent culling errors. Closes #1179. 2016-01-30 15:30:35 +02:00
urho3d-travis-ci
dc91be4dd1 Travis CI: API documentation update at 2016-01-30 10:43:25 UTC.
[ci package]

Commit: dcdcccd541

Message: Added missing AS bindings for Quaternion
2016-01-30 10:43:25 +00:00
Mike3D
dcdcccd541 Added missing AS bindings for Quaternion 2016-01-30 11:25:26 +01:00
Lasse Öörni
6b775d7537 Refactor rendertarget update handling, to ensure both always-update and manual-update respect the order of backbuffer views rendering first. Closes #1171. 2016-01-27 20:45:30 +02:00
Lasse Öörni
e92a5c1c5f Merge remote-tracking branch 'TheComet93/c89_sdl_msvc2012_fix' 2016-01-26 17:01:30 +02:00
urho3d-travis-ci
1c72d5b10f Travis CI: API documentation update at 2016-01-26 14:15:06 UTC.
[ci package]

Commit: c4f6f315ff

Message: Travis CI: bump copyright to 2016.
[ccache clear]
2016-01-26 14:15:06 +00:00
urho3d-travis-ci
c4f6f315ff Travis CI: bump copyright to 2016.
[ccache clear]
2016-01-26 13:55:03 +00:00
TheComet
180fff7011 Using whitespace instead of tabs 2016-01-26 00:15:35 +01:00
TheComet
717f0d518c Fixes code that is not compliant with the C89 standard when compiling with MSVC 2016-01-26 00:08:31 +01:00
Lasse Öörni
45dfe368a5 Allow to call AnimatedModel::UpdateBoneBoundingBox() manually. Closes #1168. 2016-01-25 18:37:17 +02:00
Lasse Öörni
a2323a63a8 Fix missing return values in D3D9 Graphics::ResolveToTexture(). 2016-01-25 18:02:10 +02:00
Lasse Öörni
6bd8229819 Tabs to spaces. Fix copy-paste error in comment. 2016-01-25 17:23:11 +02:00
Yao Wei Tjong 姚伟忠
41b87b3690 Merge commit '3d5994381df631739187c89bd0c2752900ae6c2a' as 'Source/ThirdParty/nanodbc' 2016-01-25 15:59:30 +08:00
Yao Wei Tjong 姚伟忠
c1ae46ec41 Replace Source/ThirdParty/nanodbc subdirectory with subtree. 2016-01-25 15:59:26 +08:00
Yao Wei Tjong 姚伟忠
a68c36b7e5 Merge commit 'bcd587a1bef9d8ed0e37d38b0b00b4faf43cea6c' into master. 2016-01-24 13:25:41 +08:00
Yao Wei Tjong 姚伟忠
705e06dd1c Remove an unprintable \015 character in the cmake_codelite.sh.
The character had caused the script not operable.

For Travis CI and AppVeyor - bug fixes and improvement to make the CI builds more stable, hopefully.
2016-01-23 23:39:06 +08:00
urho3d-travis-ci
a5373fe83b Travis CI: API documentation update at 2016-01-22 17:55:28 UTC.
[ci package]

Commit: bd21208a5f

Message: Added contributor credit.
2016-01-22 17:55:28 +00:00
Lasse Öörni
474276fc17 Code convention & minor logic edits. Unify tag API between UIElement & Node. Use ; as the default tag separator to match the editor. Do not allow adding empty tags. 2016-01-22 17:51:31 +02:00
svifylabs
4297cdedd2 Added Simple String Multitag System
removed old implementation, no optimisation, scene caches tagged nodes
2016-01-22 17:51:31 +02:00
svifylabs
9bb980b8a1 Revert "multitag test"
This reverts commit 754210898c524c4d4275ef0ae1ccb0471f6c606c.
2016-01-22 17:51:30 +02:00
svifylabs
fd8b760330 multitag test 2016-01-22 17:51:30 +02:00
svifylabs
997906d55e added tag as a string for easy editing 2016-01-22 17:51:30 +02:00
svifylabs
41f5ff1a51 added node tags 2016-01-22 17:51:29 +02:00
urho3d-travis-ci
5e0701ad42 Travis CI: API documentation update at 2016-01-22 13:48:39 UTC.
[ci package]

Commit: a9e62241a7

Message: Unify fixed update source handling in ScriptInstance, LuaScriptInstance & LogicComponent. It can now be either PhysicsWorld or PhysicsWorld2D. Remove auto-creation of PhysicsWorld from ScriptInstance, as LogicComponent or LuaScriptInstance don't do that either, and the ScriptInstance can not known whether PhysicsWorld or PhysicsWorld2D should be created.
2016-01-22 13:48:39 +00:00
Lasse Öörni
a9e62241a7 Unify fixed update source handling in ScriptInstance, LuaScriptInstance & LogicComponent. It can now be either PhysicsWorld or PhysicsWorld2D. Remove auto-creation of PhysicsWorld from ScriptInstance, as LogicComponent or LuaScriptInstance don't do that either, and the ScriptInstance can not known whether PhysicsWorld or PhysicsWorld2D should be created. 2016-01-22 14:59:08 +02:00
Lasse Öörni
99c731db19 Merge remote-tracking branch 'ucupumar/particle-direction-fix' 2016-01-22 13:41:23 +02:00
Yao Wei Tjong 姚伟忠
d267c5ee3c Fix build system to find 32-bit readline package correctly on Debian. 2016-01-22 13:41:29 +08:00
Yao Wei Tjong 姚伟忠
1066c52fb6 Fix build system to find 32-bit packages correctly on Linux. 2016-01-22 12:01:23 +08:00
urho3d-travis-ci
cc6f1a3d81 Travis CI: API documentation update at 2016-01-21 19:58:41 UTC.
[ci package]

Commit: ff42717419

Message: Rename IsTagged -> HasTag. Pass tag scripts in Lua by value to match the other API bindings.
2016-01-21 19:58:41 +00:00
Lasse Öörni
ff42717419 Rename IsTagged -> HasTag. Pass tag scripts in Lua by value to match the other API bindings. 2016-01-21 21:42:18 +02:00
Ivan K
68668266d2 Add tags to UIElement 2016-01-21 21:42:17 +02:00
Yao Wei Tjong 姚伟忠
105aa2699e Use Readline library when it is found for Lua and isql. 2016-01-22 02:05:30 +08:00
Lasse Öörni
ca3f3ced4f Prefer to use camera's EffectiveWorldTransform for view inverse to avoid double inversing. 2016-01-21 18:44:02 +02:00
Lasse Öörni
1e8335d5a4 Merge remote-tracking branch 'hjmediastudios/AddViewMatrix' 2016-01-21 18:38:36 +02:00
Yusuf Umar
aa16b5003a Fixing some Coverity scan bug. 2016-01-21 22:49:08 +07:00
Yao Wei Tjong 姚伟忠
cff5fe2d3d For Travis CI - enable URHO3D_LUAJIT build option on iOS CI builds.
Upgrade to CMake 3.4.1 for OSX CI build jobs.
Close #1146
2016-01-21 19:28:02 +08:00
Yao Wei Tjong 姚伟忠
17734a1b77 Enable LuaJIT universal binary build on iOS platform. 2016-01-21 10:56:58 +08:00
Yao Wei Tjong 姚伟忠
44e7322e4e Enable LuaJIT universal binary build on OSX platform.
Enable universal binary executables by default when targeting 64-bit OSX platform.
2016-01-21 10:56:58 +08:00
Yao Wei Tjong 姚伟忠
50f64a88a1 Minor formatting correction. 2016-01-21 10:55:44 +08:00
Yao Wei Tjong 姚伟忠
da3a82979b Bake URHO3D_TESTING to ensure downstreams get consistent struct size. 2016-01-21 00:01:28 +08:00
Lasse Öörni
f721aea1d3 On D3D11, force dynamic textures to use 1 mip level, as more is not supported. Closes #1153. 2016-01-19 22:43:07 +02:00
Nick Royer
360328d2d1 Added inverse view matrix 2016-01-18 14:30:54 -06:00
Yao Wei Tjong 姚伟忠
0906da48ba Fix LuaJIT build for VS build to suppress unknown option warnings.
[ci only: AppVeyor]
2016-01-15 21:02:56 +08:00
Lasse Öörni
c46f414034 Reset SDL's internal in_title_click variable whenever a normal mouse up/down event is received. Fixes #1151. 2016-01-14 22:52:20 +02:00
urho3d-travis-ci
c3f336829e Travis CI: API documentation update at 2016-01-14 19:58:13 UTC.
[ci package]

Commit: 25ed4020a0

Message: Match the enum order in EmitterType edit field.
2016-01-14 19:58:13 +00:00
Lasse Öörni
25ed4020a0 Match the enum order in EmitterType edit field. 2016-01-14 21:14:43 +02:00
Lasse Öörni
e18f801103 Use GetStringListIndex() also for the emitter type. 2016-01-14 21:07:53 +02:00
Lasse Öörni
79f32fad0a Shorter name for the directional mode in XML serialization. Eliminate duplicate code from ParticleEffect. Eliminate manual string compare in favor of GetStringListIndex(). 2016-01-14 21:04:55 +02:00
Lasse Öörni
f5cee983f1 Code convention minor edits. Expose the new enum value to Lua. 2016-01-14 20:43:20 +02:00
Lasse Öörni
925b69ef4c Merge remote-tracking branch 'ucupumar/particle-editor' 2016-01-14 20:11:22 +02:00
Lasse Öörni
c04aadec58 Apply component ID save fix from vivienneanthony. Also verify that JSON save works similarly. Closes #1150. 2016-01-13 11:42:26 +02:00
Yao Wei Tjong 姚伟忠
e61cf6fc40 Upgrade to LuaJIT v2.1 (unstable) branch. 2016-01-13 01:22:01 +08:00
Yao Wei Tjong 姚伟忠
b36135489f Merge commit '643fa4aad86bba3567b3b7441e36c2cbd438d79c' into master 2016-01-13 01:21:26 +08:00
Yusuf Umar
a8d9308abe Moving billboard rotate computation from CPU to GPU. Particle with direction should run faster now. 2016-01-12 19:50:01 +07:00
Yusuf Umar
353c459e0d Adding direction for particle/billboard. It can create pseudo 3d effect inspired by Unity stretched billboard. Can be used by using face camera option 'Rotate Along Direction'. 2016-01-12 10:46:23 +07:00
urho3d-travis-ci
e5f07d790a Travis CI: API documentation update at 2016-01-11 15:19:32 UTC.
[ci package]

Commit: 5e780d9e8b

Message: Allow configurable minidump write location via ProcessUtils.h functions. Closes #1142.
2016-01-11 15:19:32 +00:00
Lasse Öörni
5e780d9e8b Allow configurable minidump write location via ProcessUtils.h functions. Closes #1142. 2016-01-11 17:06:38 +02:00
Lasse Öörni
4a6d39beee Implement missing applying of basepath to package file entries. Closes #1147. 2016-01-11 16:23:21 +02:00
Yao Wei Tjong 姚伟忠
5a97c68a49 Fix a regression issue caused by external project target renaming.
Close #1137.
2016-01-09 19:25:44 +08:00
Yao Wei Tjong 姚伟忠
d01bdbf2df Merge commit '68be709e44b87216b5c41a626571d8a8f44938e9' as 'Source/ThirdParty/LuaJIT' 2016-01-08 18:14:37 +08:00
Yao Wei Tjong 姚伟忠
7d65d52455 Remove LuaJIT subdirectory. It will be added back as subtree. 2016-01-08 18:13:52 +08:00
Yao Wei Tjong 姚伟忠
21b01fcd5b Refactor how the EXE and SHARED linker flags are being setup. 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
bc64b053a3 Bake URHO3D_LUAJIT as downstream project needs extra linker flags.
Without these extra linker flags the executable would most likely get a runtime error, especially when targeting 64-bit OSX platform.
2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +08:00
Yao Wei Tjong 姚伟忠
7252327e70 Minor code formatting on Variant.h file.
[ci skip]
2016-01-06 08:44:16 +08:00
Lasse Öörni
87a5e4fcb3 Simplify RigidBody code. Allow kinematic rigid body to set its initial transform in OnMarkedDirty() so that e.g. loaded prefabs in the editor don't appear to have their body in the wrong place initially. 2016-01-05 22:37:05 +02:00
Lasse Öörni
bdadb1b116 Fix missing export specifier for the specializations of Variant::Get<T>(). Closes #1138. 2016-01-05 22:20:44 +02:00
Lasse Öörni
087772c539 If AnimatedModel is temporary, make the bone nodes it creates temporary too. Closes #1135. 2016-01-05 11:27:56 +02:00
Lasse Öörni
dce2345b8a Disable BT_USE_SSE_IN_API in OSX debug mode. Closes #1132. 2016-01-04 22:07:18 +02:00
Lasse Öörni
05cd6f4346 Before rigidbody has simulated at least once, allow also setting the interpolation transform. Possible fix for #1128. 2016-01-04 15:57:23 +02:00
urho3d-travis-ci
4a0e883d7d Travis CI: API documentation update at 2015-12-28 18:44:03 UTC.
[ci package]

Commit: 7afc3cd9ce

Message: HasSubscribedToEvent() exposed to scripting. Closes #1122.
2015-12-28 18:44:03 +00:00
Lasse Öörni
7afc3cd9ce HasSubscribedToEvent() exposed to scripting. Closes #1122. 2015-12-28 20:32:52 +02:00
Yao Wei Tjong 姚伟忠
bf50a58a0a Fix clang-tools build.
[skip appveyor] [ci only: Annotate]
2015-12-27 15:51:28 +08:00
urho3d-travis-ci
e0d3b2339e Travis CI: API documentation update at 2015-12-26 21:42:23 UTC.
[ci package]

Commit: 9fccfe5417

Message: Fix error when serializing DropDownList. Fix scroll snap epsilon attribute default value. Closes #1121.
2015-12-26 21:42:23 +00:00
Lasse Öörni
9fccfe5417 Fix error when serializing DropDownList. Fix scroll snap epsilon attribute default value. Closes #1121. 2015-12-26 23:33:51 +02:00
Lasse Öörni
d2c47a14c4 Add hit fraction to PhysicsRaycastResult and set it for all physics cast tests. Similar to ConvexCast, set SphereCast result distance based on hit fraction. Closes #1120. 2015-12-26 22:03:53 +02:00
Yao Wei Tjong 姚伟忠
108705d0e2 Bake compiler defines used by the database subsystem.
The auto-discovered variables are removed as build options from cmake-gui when it is invoked by Urho3D downstream projects.
Still, ensure the auto-discovered variables prevail over conflicting values potentially specified by user manually or via CLI.
2015-12-26 19:38:17 +08:00
Lasse Öörni
1f4793031c Fix forced one-sample shadowing when hardware compare not supported (instead should be forced four-sample shadowing) 2015-12-25 15:24:54 +02:00
Yao Wei Tjong 姚伟忠
60b3d8af40 Fix GetCompilerDefines() for possibility of returning empty string.
[skip appveyor] [ci only: master, Emscripten]
2015-12-25 18:48:06 +08:00
Yao Wei Tjong 姚伟忠
5af983234f Check the compiler defines at the time when the lib is built instead. 2015-12-25 17:55:17 +08:00
Yao Wei Tjong 姚伟忠
68e2813298 Attempt to use try_run logic to auto-discover build options.
For AppVeyor - let URHO3D_D3D11 be auto-discovered when scaffolding.
Close #1066.
2015-12-25 10:37:56 +08:00
Lasse Öörni
b218aececc Sync AssetImporter documentation with the program's actual command line options. Simplify D3D9 uninitialization code with SAFE_RELEASE. Minor code convention edit. 2015-12-24 13:16:17 +02:00
yushli
86825b2ee8 add save as JSON option 2015-12-24 11:36:25 +08:00
urho3d-travis-ci
f4edf3fc15 Travis CI: API documentation update at 2015-12-23 14:52:21 UTC.
[ci package]

Commit: a3ba4d8ff6

Message: Check HRESULT and log error with it included in case of failure in D3D9/D3D11 code. Clean up releasing GPU objects. Clean up Texture3D to not have a RenderSurface, since it can't be rendered to. Fixed missing Lua Texture3D binding. Fixed binding of Texture3D SetSize() in AngelScript. Added checks to Texture2D/3D SetSize() that zero or negative size is not specified. Closes #1092.
2015-12-23 14:52:21 +00:00
Lasse Öörni
a3ba4d8ff6 Check HRESULT and log error with it included in case of failure in D3D9/D3D11 code. Clean up releasing GPU objects. Clean up Texture3D to not have a RenderSurface, since it can't be rendered to. Fixed missing Lua Texture3D binding. Fixed binding of Texture3D SetSize() in AngelScript. Added checks to Texture2D/3D SetSize() that zero or negative size is not specified. Closes #1092. 2015-12-23 16:43:43 +02:00
Lasse Öörni
04f46f9abc Fix bug in String::DecodeUTF16. Thanks graveman! 2015-12-23 11:41:02 +02:00
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: 65c8125 e1647d1
Author: NickRoyer <hjmediastudios@gmail.com>
Date:   Tue Dec 22 21:29:06 2015 -0600

    Merge pull request #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 姚伟忠
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: 6d2853d81d

Message: 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 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 姚伟忠
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
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
urho3d-travis-ci
d9c412f7e8 Travis CI: API documentation update at 2015-12-18 12:57:29 UTC.
[ci package]

Commit: 6a3bbb8aab

Message: 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 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
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
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
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
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 姚伟忠
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
Lasse Öörni
b49837f462 Added note of library modification. 2015-12-14 17:27:29 +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 姚伟忠
55286eb820 Fix host-tool building.
[skip appveyor]
2015-12-13 17:43:54 +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