townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,836 Commits 3 Branches 3 Tags 168 MiB
upstream-octree
Commit Graph

9836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
6eaa8c4331 Fix autoload paths not appending the executable base path consistently. 2014-12-17 12:08:43 +02:00
aster2013
60caecbb70 Remove Drawable2D in destruct function, add root node for TileMap2D. 2014-12-17 13:52:28 +08:00
Lasse Öörni
a8f93ebb70 Fix ObjectAnimation example in docs. 2014-12-16 16:47:32 +02:00
urho3d-travis-ci
b6743cc884 Travis CI: API documentation update at 2014-12-16 13:04:56 UTC. 
[ci package]
 2014-12-16 13:04:56 +00:00
aster2013
dc0455d3cc Merge branch 'make-2d-faster' 2014-12-16 20:54:48 +08:00
aster2013
4dda12bcde Fix ParticleEmitter2D update. 2014-12-16 18:36:14 +08:00
aster2013
a170b6b599 Do not add Drawable2D to Octree, make 2D performance faster. 2014-12-16 18:18:20 +08:00
Lasse Öörni
d229f64549 Merge remote-tracking branch 'nemerle/shader_get_variation_simplify' 2014-12-16 11:47:01 +02:00
Lasse Öörni
3bf80a5aa2 Cleanup AttributeAnimation docs. 2014-12-16 11:46:49 +02:00
nemerle
47c788ed25 Simplify Shader::GetVariation code 2014-12-15 14:41:45 +01:00
urho3d-travis-ci
85af864e0f Travis CI: API documentation update at 2014-12-14 10:44:51 UTC. 
[ci package]
 2014-12-14 10:44:51 +00:00
Lasse Öörni
f585ed56b0 Nullcheck ScriptObject before storing inside Variant. Code convention fix. 2014-12-14 12:24:19 +02:00
Lasse Öörni
7ef80af21b Merge remote-tracking branch 'alexparlett/feature/variant-scripthandle' 2014-12-14 12:10:37 +02:00
Alex Parlett
ce28af5357 [Added] ScriptObject can be stored in Variant. There is a risk to this as the reference is not increased when storing it so it is only a weak reference so if the original handle is kept safe in the script it can be null 
[Changed] REgister ScriptObject interface much sooner
 2014-12-14 09:45:14 +00:00
Lasse Öörni
9619756c20 Allow to choose renderpath from the Editor Settings window. Closes #563. 2014-12-14 00:04:54 +02:00
Lasse Öörni
769f314c55 Update SoundSource's effective master gain on demand when master gains or sound type changes instead of in the mixing thread to avoid potential issues when the master gain map is being changed at the same time. 2014-12-13 20:13:07 +02:00
urho3d-travis-ci
4d399f9637 Travis CI: API documentation update at 2014-12-13 16:35:32 UTC. 
[ci package]
 2014-12-13 16:35:32 +00:00
Lasse Öörni
7318006d83 Fix UI element drags with DragDropContent defined showing a "not accepted" icon, yet succeeding when the drag is released. 2014-12-13 18:03:03 +02:00
Lasse Öörni
0e5f6e2070 Build and Lua bindings fixes. Return 1.0 for unknown master volumes. Change Audio::IsMasterGain() to Audio::HasMasterGain(). Change Audio::GetSoundSourceMasterGain() to use StringHash to avoid per-frame string compares. Guard against out of bounds array access when deserializing cursor's shape attributes. 2014-12-13 17:08:52 +02:00
Alex Parlett
c2110573c6 [Added] Documentation 
[Added] Sound Type saving in editor
[Changed] Refactored inline with discussion
 2014-12-13 09:09:56 +00:00
Alex Parlett
cd099df50f Added dynamic cursor definitions while keeping the original enum definitions for backwards compatibility, ui subsystems and sdl. Revised the serialization system for cursors as well which is a breaking change and requires wrapping each old style cursor definition in a <variant type="VariantVector></variant>. 2014-12-12 15:58:54 +00:00
Alex Parlett
d59a5b8bfb Fix for new serialization system and StringHashes 2014-12-12 15:58:44 +00:00
Alex Parlett
4414eeaeff Added Lua Bindings 2014-12-12 15:58:34 +00:00
Alex Parlett
5d12f5a521 Added editor sound type editor window, the user added ones can be dragged onto line edits which sets that line editor with the internal StringHash of the Sound Type. 
Added AM_READ for backwards compatibility to read old enum based sound types but not serialize them.
 2014-12-12 15:58:24 +00:00
Alex Parlett
5d94ebfc95 [Added] Angelscript Bindings 
[Fixed] SetSoundTypeAttr and GetSoundTypeAttr
 2014-12-12 15:58:08 +00:00
Alex Parlett
8123624ee1 [Added] C++ Implementation of dynamic audio sound types which maintains backward compatibility 2014-12-12 15:57:58 +00:00
Lasse Öörni
028d5c82f6 Reduce number of used texture units correctly regardless of the order in which texture units are cleared. 2014-12-12 17:28:58 +02:00
urho3d-travis-ci
ffa78ec4b3 Travis CI: API documentation update at 2014-12-11 17:57:57 UTC. 
[ci package]
 2014-12-11 17:57:57 +00:00
Lasse Öörni
8c8f18a961 Allow a material to refer to any texture unit. Optimize setting batch's material renderstate by only looping through the used texture units. Note: the material editor in the editor does not support the extra units yet. 2014-12-11 19:25:42 +02:00
Chris Friesen
cf2962c0b3 editor inspector lock 2014-12-10 13:01:54 -06:00
Lasse Öörni
65bec05611 Safeguard against the editor's user resource directory containing outdated Urho editor UI layouts, which can lead to exceptions in the editor. Note: some UI resources like fonts and textures may still be overridden by the user resource directory. 2014-12-10 18:34:30 +02:00
Yao Wei Tjong 姚伟忠
8b496896f2 Merge changes from Android/CMake upstream repo to support NDK r10d. 2014-12-10 21:46:59 +08:00
aster2013
c86d2239b2 Use string hash key to store sprites. 2014-12-10 20:10:06 +08:00
Chris Friesen
988240f9c8 editor: sorted resource filters, resource browser 2d animation set 2014-12-10 00:09:22 -06:00
aster2013
f89bd44f37 remove spaces.[ci skip] 2014-12-10 13:44:46 +08:00
aster2013
941dcb02e5 rename animation root node.[ci skip] 2014-12-10 13:44:45 +08:00
aster2013
3b9d82d729 Refactor 2D animation, make 2d animation more general. 2014-12-10 13:44:44 +08:00
Lasse Öörni
5f4879d387 Disable attribute intermediate edits for array/struct length attributes such as "Anim States Count". Otherwise emptying the line edit would apply the value 0. Fixes #559. 2014-12-09 16:38:06 +02:00
urho3d-travis-ci
a1986b0c2b Travis CI: API documentation update at 2014-12-09 12:41:35 UTC. 
[ci package]
 2014-12-09 12:41:35 +00:00
Lasse Öörni
1dc786f455 Fix missing Ray::HitDistance() with Plane in AngelScript bindings. 2014-12-09 14:29:08 +02:00
urho3d-travis-ci
da262f930a Travis CI: API documentation update at 2014-12-08 23:48:24 UTC. 
[ci package]
 2014-12-08 23:48:24 +00:00
hdunderscore
8258c105e0 Exposed autoDisableChildren to ListView in AngelScript. 2014-12-09 10:25:29 +11:00
Yao Wei Tjong 姚伟忠
e9167c3645 Fix 'rake scaffolding' task for Windows host. [ci skip] 2014-12-08 23:20:26 +08:00
Lasse Öörni
52762aee5e More informative error message if submesh bone limit exceeded. 2014-12-08 13:51:27 +02:00
hdunderscore
34dc78169e - Added support for duplication in the editor (Ctrl+D / menu / context). 
- Changed pasting default behavior to paste into the selected node, rather than the scene root (UI pasting was doing this already).
 2014-12-08 20:14:51 +11:00
aster2013
a4c5dd181e Add more comment to AnimatedSprite2D. 2014-12-06 22:04:22 +08:00
Lasse Öörni
78aed7adc1 Fix billboard facing and sorting when rendered from several views on the same frame. Closes #551. 2014-12-06 15:56:25 +02:00
urho3d-travis-ci
9d670a113e Travis CI: API documentation update at 2014-12-06 13:20:33 UTC. 
[ci package]
 2014-12-06 13:20:33 +00:00
Lasse Öörni
b8d8f9f78f Add uncompressed DDS support. Supports all bit configurations by a generic conversion to 8bit-per-pixel RGBA. Unify Image bindings between Lua & AngelScript. Closes #537. 2014-12-06 02:17:25 +02:00
Lasse Öörni
2f41bd4349 Merge remote-tracking branch 'hdunderscore/Editor_BitMaskSelector' 2014-12-05 10:33:11 +02:00