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

375 Commits

Author SHA1 Message Date
cosmy
b057434bfa Make escape key name consistent between keycode and scancode. 2016-05-27 13:27:53 +02: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
cosmy
2b1118528b Simplify sample code. 2016-05-23 17:16:15 +02:00
cosmy
969ae27b78 Add AngelScript Http Request demo sample. 2016-05-23 01:00:07 +02:00
Lasse Öörni
fcfb17a2b0 Merge remote-tracking branch 'svifylabs/f_EventProfiler' 2016-05-19 16:10:54 +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
1vanK
d6f5f5d45c Fix gold coin animation 2016-05-11 11:27:29 +03: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
Lasse Öörni
e048afa496 Cleanup drag-instantiate code. Use mouse raycast position if possible. 2016-05-06 14:01:12 +03:00
Lasse Öörni
bf860499bd Remove unused function. 2016-05-06 14:01:11 +03:00
Golden Li
b463ed5a05 align to aabb bottom 2016-05-06 14:01:10 +03:00
Golden Li
3e35bb0afa support resource drag to scene 2016-05-06 14:01:09 +03:00
Lasse Öörni
c197bf726a Merge remote-tracking branch '1vanK/master' 2016-05-02 19:08:22 +03:00
1vanK
65b639af13 Editor: info about selected model (thanks MonkeyFirst for idea) 2016-05-01 20:43:07 +03:00
Lasse Öörni
6deb0780f8 Fix comments in 42_PBRMaterials.as. Add Lua version of the PBR sample. 2016-04-30 02:20:12 +03:00
Lasse Öörni
19f3b0f120 Merge branch 'master' into vertexdeclaration 2016-04-16 14:58:30 +03: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
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
44133d00d9 Fix typo. 2016-04-11 00:35:41 +03:00
Lasse Öörni
644eecfa7d Demonstrate defining non-legacy vertex elements in the DynamicGeometry C++ & AngelScript examples. 2016-04-10 15:37:48 +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
Lasse Öörni
8af9f4785e Remove the special script attribute storage mechanism. 2016-03-30 20:54:43 +03: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
hdunderscore
467c4bd4e8 - Updated sample mouse mode setup. 
- (Web) Removed some of the exit engine logic.
 2016-03-27 20:01:22 +11: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
Ivan K
086cfa1687 Editor: fix all warnings; Complete UITemplate 2016-03-19 20:01:41 +04: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
Ivan K
3d9ea8eece Editor: fix some warnings 2016-03-16 15:47:39 +02:00
Lasse Öörni
a9625eae8a Add contributor credit, fix editor code comment. 2016-03-16 11:53:14 +02: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
Yao Wei Tjong 姚伟忠
ccf6648eb3 Utilize new SDLActivity's get arguments feature. 2016-03-16 01:42:01 +08:00
Lasse Öörni
27a290bf66 Add .hdr to image & texture picker filter lists. 2016-03-08 01:48:06 +02:00
dragonCASTjosh
103fe32dd1 Now working and Added initial .HDR support 2016-02-28 23:50:21 +00:00
Lasse Öörni
3e15c400ff Fix uninitialized bool variable in editor script. Closes #1189. 2016-02-11 17:24:11 +02:00
MonkeyFirst
17a8d6c450 fix-for-ui-typing-in-b.mode 2016-02-08 04:34:56 +06:00
MonkeyFirst
ff24dc3a12 fix double adding tag from scene 2016-01-29 00:11:16 +06:00
MonkeyFirst
f6ba2b1195 Add tags menu for editUIElement 2016-01-28 00:55:13 +06:00
MonkeyFirst
31e2f56808 tags menu 2016-01-27 23:40:02 +06:00
Lasse Öörni
a3411274f3 Node tag editing. 2016-01-22 17:51:32 +02: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
Ivan K
3774bef4f7 Add comments about tags to samples 2016-01-22 02:38:37 +04:00
Ivan K
68668266d2 Add tags to UIElement 2016-01-21 21:42:17 +02:00
Lasse Öörni
25ed4020a0 Match the enum order in EmitterType edit field. 2016-01-14 21:14:43 +02: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
Yao Wei Tjong 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +08: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
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
Nick Royer
10bad1e36a Added JSON animation triggers as well as a few quick file filter 
settings for the editor and documentation changes.
 2015-12-10 14:31:05 -06:00
Ivan K
21d8906e7c Editor: set RenderPath for particle editor 2015-12-07 02:09:31 +04:00
Ivan K
044bb17208 editor: more space in status text 2015-12-02 19:57:55 +04:00
Ivan K
372c5b3481 editor: fix positioning of status text 2015-12-02 19:14:32 +04:00
Lasse Öörni
7901b9cae5 Cleanup unused node var names from the scene. Closes #1068. 2015-12-01 12:05:31 +02:00
Lasse Öörni
74e7d027b0 Code convention edits. Added contributor credit. 2015-11-26 18:16:33 +02:00
Yusuf Umar
8eac7a3d01 Updating particle editor with these changes: 
- Adding grid with option to hide it
- Gizmo now always visible in the left corner
- Change particle preview viewport camera to behave more predictably
 2015-11-26 18:06:27 +02:00
Lasse Öörni
29e62526eb Added event for sound playback finished. Deprecate SoundSource::SetAutoRemove() and change samples + NinjaSnowWar to not use it. Fix network replication of SoundSource to work with repeated playback on the same source. 2015-11-25 22:50:19 +02:00
Lasse Öörni
88c07f952d If the original node is still selected in paste, behave as if duplicating. Closes #1034. 2015-11-21 13:31:23 +02:00
Lasse Öörni
30a26fcfc5 Code formatting. Use node pointer in compare instead of node id. 2015-11-12 12:02:55 +02:00
Vladimir
bf34fc8afb Urho3D Editor: Spawn on selected node in Spawn Editor 2015-11-11 19:51:35 +10:00
Lasse Öörni
2cd28f10a8 Merge remote-tracking branch 'cin/master' 2015-11-09 21:09:51 +02:00
Lasse Öörni
304c866dd0 Separate functions to toggle/show/hide editor sub-windows to prevent mistaken action e.g. when editing a material. Update changelog. 2015-11-09 21:03:01 +02:00
Vladimir
48e62be7ca Urho3D Editor: Local offset for Spawn Editor 2015-11-09 21:01:46 +10:00
JSandusky
f0da08b140 Urho3D Editor: Correct misnaming of function call for hiding spawn editor 2015-11-08 20:18:09 -05:00
JSandusky
80ba2ed375 Urho3D Editor: Show "Window" commands now toggle visibility 
example: CTRL + I, will show the inspector if not visible and hide it if
it is visible
 2015-11-08 19:54:41 -05:00
JSandusky
ec7aebfa2d Urho3D Editor: Enter/return executes first Quick Action in the quick action results 2015-11-08 19:53:38 -05:00
Lasse Öörni
cb0e6caa24 Apply material list in CreateModelWithStaticModel() & CreateModelWithAnimatedModel(). Closes #1018. 2015-11-08 13:12:03 +02:00
Lasse Öörni
77603f30df Exclude .atlas file type from resource browser XML parsing attempt. 2015-11-04 13:52:53 +02:00
Lasse Öörni
af985e0df1 Alternative O key to create obstacles in the navigation demos. Closes #995. 2015-10-31 22:01:04 +02:00
Lasse Öörni
385493f39a Explain that touch input is needed for multiple dragging. Closes #997. 2015-10-31 16:48:25 +02:00
Yao Wei Tjong 姚伟忠
c0d8415ae8 Fix the spawn button label in CrowdNavigation demo. 
[ci skip]
 2015-10-31 14:41:26 +08:00
Lasse Öörni
94a7f4ef63 Make UI element layouting not modify the user assigned minSize. Instead keep record of the min.size required by layout separately. Fix HelloGUI sample to the new behavior. Closes #955. 2015-10-29 17:22:53 +02:00
Lasse Öörni
13bc777ab6 Fix using old attribute name in the editor. Closes #979. 2015-10-25 20:57:05 +02:00
Lasse Öörni
19027b4ae4 Merge remote-tracking branch 'JSandusky/MemoryReporting' 2015-10-23 11:55:20 +03:00
JSandusky
83d0f9a23c Add Z-up and handedness options to OBJ export 2015-10-22 22:44:28 -04:00
JSandusky
8e39692ef3 Show "Memory usage" DebugHud in all samples (F3 key) 2015-10-22 19:49:49 -04:00
Jukka Jylänki
bf9111b862 Make Jacks not walk in synchronized lockstep timing in 06_SkeletalAnimation sample. 2015-10-11 19:05:51 +03:00
Lasse Öörni
4bdd80775b Add accelerator keys for reset pos/rot/scale also in editor standard mode. Add reset transform function (Alt-Q). 2015-10-10 01:09:06 +03:00
Lasse Öörni
57310eed00 Fix editor to load the produced temporary scene correctly if AssetImporter -b option is specified. 2015-10-01 18:23:17 +03:00
Lasse Öörni
65d36e4db2 Fix crash / null exception in CharacterDemo which would result if the character node did not exist after loading the scene. 2015-09-30 16:34:24 +03:00
Lasse Öörni
b362c9a953 Remove unnecessary enum qualification. 2015-09-30 10:45:05 +03:00
Lasse Öörni
3859d6dd8c Do not export editor debug geometry to OBJ. 2015-09-29 20:52:52 +03:00
Lasse Öörni
04d74d3f33 Fix Color::BLACK to just BLACK in Localization AngelScript sample. Thanks JSandusky. 2015-09-29 20:24:34 +03:00
JSandusky
4a16d34367 Implement OBJ export functionality in editor 
- Global utility method for writing Drawables to an OBJ in Drawable
- AllContentOctreeQuery added
- Minor fixes to Octree query angelscript bindings
 2015-09-29 20:24:33 +03:00
Lasse Öörni
69f4a405b7 Removed mention of missing functionality from CrowdNavigation help text. Fixed double -> float conversion warning. 2015-09-19 13:29:37 +03:00
Lasse Öörni
dc7eb0d17a Make the editor's cube map save path setting relative to the scene resource path, instead of being a relative filesystem path. Ensure that the generated cube map XML does not have double slashes and uses resource path relative filenames. Minor code cleanup. 2015-09-14 23:42:26 +03:00
JSandusky
ebd3e67776 Correction of cubemap XML face names. 
- Minor refinements to the camera
- Prevention of rendering debug/editor visualization
 2015-09-10 13:09:10 -04:00
JSandusky
da0463ec49 Add cubemap generation capability to the Urho3D editor 2015-09-10 00:13:38 -04:00
aster2013
5d50ad4b71 Change SetAnimtion function in AnimatedSprite2D. 2015-09-06 20:37:15 +08:00
aster2013
0f6983b3fe rename variable. 2015-09-05 22:57:48 +08:00
aster2013
0cded698e4 Merge from spine-spriter branch. 
Main changes:
     Make spriter as a lib
     Enable spine support in AnimatedSprite2D and Animation2D.
 2015-09-05 22:23:35 +08:00
Lasse Öörni
5bd672f02a Add missing Lua bindings to SplinePath. Make hierarchy & inspector windows the same width on editor startup. Remove unnecessary attributes from EditorHierarchyWindow.xml. 2015-09-02 18:07:42 +03:00
MonkeyFirst
77c7460342 add one space after "if" and fight with other spaces 2015-09-02 18:07:35 +03:00
MonkeyFirst
150865c3ee change icons default size 2015-09-02 18:07:35 +03:00
MonkeyFirst
f484bfe915 add for B.mode distance related camera move 2015-09-02 18:07:34 +03:00
MonkeyFirst
4ee86ced6f revert group-types-clear-commits 2015-09-02 18:07:34 +03:00
MonkeyFirst
7c403d88d9 collapse hierarchy then loading new scene 2015-09-02 18:07:34 +03:00
MonkeyFirst
50502df4a4 add option for IDs show and oneclick button for collapse tree to scene-root scope 2015-09-02 18:07:33 +03:00
MonkeyFirst
3232b79cbe clear old updateIcons placement 2015-09-02 18:07:33 +03:00
MonkeyFirst
14f35757cd add SplinePath check for length 2015-09-02 18:07:33 +03:00
MonkeyFirst
06e186bd73 fix-ghost-icons 2015-09-02 18:07:33 +03:00
Lasse Öörni
56b218a236 Fix indent & if statement space. 2015-08-27 09:45:16 +03:00
MonkeyFirst
46aa0c52e1 fix-m-typing 2015-08-26 23:51:13 +06:00
Lasse Öörni
47fe410d06 Suppress scene changes while toggling the debug icons visibility during preview camera render so that the attribute editor doesn't constantly refresh, making attributes uneditable. Closes #854. 2015-08-24 11:48:21 +03:00
Lasse Öörni
0e3c778f34 Fix using null handle when updating temporary component state. Closes #848. 2015-08-19 18:33:22 +03:00
Yao Wei Tjong 姚伟忠
ac0a712f0b Refactor to rename 'filter type' to 'query filter type'. 
Minor clean up on the NavBuildData class.
 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
27cc9c4277 Add filter and obstacle avoidance type attribute to CrowdManager class. 
Enhance Editor to have functionality to edit the CrowdManager's filter and obstacle avoidance type attributes.
 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
c9bc4cbae3 Add new event for crowd agent formation. 
Add convenient methods for querying point, path, raycast, etc using crowd's extent and filter type configuration.
 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
549b6fd8be Add crowd update callback support. Remove redundant vectors. 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
2c3033d62a Limit interface to use only crowd agent's parameters and public APIs. 2015-08-16 15:43:12 +08:00
Lasse Öörni
70b871ebfa Code convention edits. Removed unused variable. Make debug icons use Basic shader for no fog. Do not render debug icons to camera preview viewport. Fixed Basic shader with VERTEXCOLOR define on D3D11. 2015-08-14 23:09:53 +03:00
Lasse Öörni
54649e7bb0 Merge remote-tracking branch 'monkeyfirst/debug-component-icons' 2015-08-14 22:25:04 +03:00
MonkeyFirst
baedabf443 freeze icon's size in 2d 2015-08-14 02:30:19 +06:00
MonkeyFirst
bbe7b8f965 del empty lines 2015-08-13 23:51:03 +06:00
MonkeyFirst
cb6039a2b9 arrayed BS, blend & discard icons by distance 2015-08-13 23:34:13 +06:00
MonkeyFirst
43f2c2d618 fix icons min size 2015-08-13 01:12:04 +06:00
MonkeyFirst
aa673321dc add footprint for splinepath 2015-08-12 23:17:50 +06:00
MonkeyFirst
9c6164e4fd add trigger, custom geometry, particle emitter icons 2015-08-12 22:20:37 +06:00
Lasse Öörni
c254205bce Recognize OTF files without going to XML parsing (which fails). Closes #830. 2015-08-12 10:57:38 +03:00
MonkeyFirst
10c117c1bb avoid update icons when debug icons not visible 2015-08-12 10:07:21 +06:00
MonkeyFirst
fc37f268fb increase update time for splinepath 2015-08-12 09:38:55 +06:00
MonkeyFirst
9c0ab25999 add begin and end of splinepath coloring 2015-08-12 09:21:02 +06:00
MonkeyFirst
8670dd6f3c add show spline path debug 2015-08-12 08:34:34 +06:00
MonkeyFirst
886668ab13 add debug temp container(node) and clear scene's scope 2015-08-12 01:35:00 +06:00
MonkeyFirst
4424b98715 add debug icons 2015-08-12 00:45:17 +06:00
Yao Wei Tjong 姚伟忠
842de2fe48 Exposed the database subsystem API to scripting. 
Add AngelScript version of the database demo.
Add Lua versio nof the database demo. WIP.
 2015-08-10 01:51:26 +08:00
Lasse Öörni
b53b584123 8-bit render order support in materials. This adjusts the drawing order within a scene pass, and takes precedence over both state & distance sorting. 2015-08-06 16:42:52 +03:00
Lasse Öörni
d9d09909d4 Removed commented out code. Minor editor code formatting & typo fixes. 2015-08-05 21:28:47 +03:00
MonkeyFirst
99ad65844f add more event to main editor handlers 2015-08-05 15:43:15 +06:00
MonkeyFirst
5da0bea816 global-editor-handlers 2015-08-05 04:21:39 +06:00
Lasse Öörni
fba5948ab0 Allow to disable rendering of the whole UI (except for the cursor and modal elements) by setting the UI root to not visible. Added new function UIElement::IsVisibleEffective() which checks for propagated visibility. Make sure to clear focus also if a child element (that has focus) becomes effectively invisible. Closes #811. 2015-08-04 17:47:46 +03:00
MonkeyFirst
038ec8c286 fixed missing event handler from color wheel after layer use 2015-08-02 03:08:23 +06:00
Lasse Öörni
c14d6ba4b7 Editor code convention edits. Use Alt+W for color wheel in both hotkey modes. 2015-07-31 22:00:48 +03:00
Lasse Öörni
5344d386b0 Merge remote-tracking branch 'monkeyfirst/hsv-color-wheel' 2015-07-31 21:23:54 +03:00
MonkeyFirst
b42cb1ed2a simplify menu localization 2015-07-31 02:46:23 +06:00
Lasse Öörni
9977ee909b Fix line height in the included .sdf font files. Force reevaluation of material when font changed from ttf to sdf or vice versa. Added .sdf to attribute editor font picker. Closes #801. 2015-07-30 23:27:31 +03:00
MonkeyFirst
c3b52a9e47 hsv-color-wheel 2015-07-30 01:57:16 +06:00
Lasse Öörni
61a7d65393 Explicitly set alpha blend mode for toolbar icons. See #799. 2015-07-27 17:52:07 +03:00
Lasse Öörni
b74c2360f8 Restored original controls in standard hotkeys mode. The MMB pan option (standard hotkeys mode only) now changes the behavior of shift in relation to pan & orbit only. Editor code cleanup & code convention edits. 2015-07-27 17:35:10 +03:00
Lasse Öörni
50013c85d4 Merge remote-tracking branch 'monkeyfirst/hotkeys-smg-instances' 
Conflicts:
	bin/Data/EditorStrings.json
 2015-07-27 16:26:42 +03:00
Ivan K
e91ddb3e58 Localization: fix string IDs conflict 2015-07-27 14:50:26 +04:00
Ivan K
15001acdb8 Russification: Particle Editor 2015-07-27 13:55:15 +04:00
Ivan K
6308da0c63 Russification: Material Editor 2015-07-27 13:28:10 +04:00
Ivan K
d0424bdf87 Russification: Attribute Inspector, resource picker buttons 2015-07-27 12:37:24 +04:00
Ivan K
77be3c88c4 Russification: FileSelector 2015-07-27 11:36:03 +04:00
MonkeyFirst
f1625c6fc7 WeakHandle for last... some polishing for B.mode delete 2015-07-26 22:04:27 +06:00
MonkeyFirst
7807e88e30 default pan for 2d, viewCloser for 2d , alt+scroll-zoom 2015-07-26 04:24:01 +06:00
Lasse Öörni
148bd67938 Do not attempt to localize MRU scene list in editor. 2015-07-25 22:27:17 +03:00
MonkeyFirst
7cf954d4fd delete unused variables 2015-07-25 22:53:54 +06:00
MonkeyFirst
8fc2ae9436 some fixes for smart duplicate 2015-07-25 22:47:02 +06:00
MonkeyFirst
c35ddfedcf fix ViewCloser camera placement 2015-07-25 01:31:09 +06:00
MonkeyFirst
ea02dcf9d1 delete unused action 2015-07-24 23:55:48 +06:00
MonkeyFirst
74f416b92c fixed with StaticModels and renamed into smart duplicate 2015-07-24 23:35:39 +06:00
MonkeyFirst
892a353c2f add B.mode view closer on kp_period 2015-07-24 16:54:55 +06:00
MonkeyFirst
df91bae159 add force to selecting node instead component in view port 2015-07-24 03:59:56 +06:00
MonkeyFirst
7de2a25206 auto instance 2015-07-24 02:45:05 +06:00
Lasse Öörni
9e978e767c Merge remote-tracking branch 'monkeyfirst/material-editor-few-model-preview' 
Conflicts:
	bin/Data/Scripts/Editor/EditorView.as
 2015-07-23 15:40:41 +03:00
MonkeyFirst
85e34c5b20 add B. mode rotation when no selection & dox controls2 fix 2015-07-23 15:40:32 +06:00
Ivan K
345954d5aa Editor: automatic creating language list 2015-07-22 16:09:40 +04:00
Ivan K
d00438c224 Editor: select language in preferences 2015-07-22 15:40:35 +04:00
MonkeyFirst
8a1c80796c bledner mode mmb pan, flymode off by rmb or esc 2015-07-22 02:42:49 +06:00
MonkeyFirst
276937d054 blender mode add strafe in ortho w shift & ctrl 2015-07-22 01:44:46 +06:00
MonkeyFirst
3f8cb158d4 blender mode fixes: select w shift , strafe, pan 2015-07-22 01:30:18 +06:00
Ivan K
eb2457ce6a editor russification, add warnings to Localization::LoadJSON 2015-07-21 23:12:20 +04:00
MonkeyFirst
c3f6f1c423 fixed camera move on shift-d 2015-07-21 23:26:00 +06:00
MonkeyFirst
5907f6c22b Add mask selector, bits inversion, scroll types 2015-07-21 20:55:39 +06:00
Lasse Öörni
87c8a0874a Merge remote-tracking branch '1vanK/improvements' 2015-07-21 13:46:06 +03:00
Lasse Öörni
14fe2ad334 Remove unused variable that was moved & renamed elsewhere. 2015-07-20 18:14:22 +03:00
MonkeyFirst
43df9f2e7c fix include in editor.as 2015-07-20 04:00:17 +06:00
MonkeyFirst
9c8ba2e2b0 Add EditLayerWindow for fastest mask view change (with children nodes) 2015-07-20 02:59:22 +06:00
Ivan K
d540f79eec Localization: fixes, adding comments, reworking samples, partial russification of editor 2015-07-19 16:07:24 +04:00
MonkeyFirst
64e7435eca fix "standard" word 2015-07-19 17:07:14 +06:00
MonkeyFirst
1f519959aa Add feature that allow to enable all hidden before nodes on one hotkey 2015-07-19 06:03:27 +06:00
MonkeyFirst
c9910c8c96 Add feature to parent selected nodes into last selected node 
Add feature to parent selected nodes into last selected node
Standart key mode - U-key
Blender key mode - P + Ctrl
 2015-07-19 04:44:11 +06:00
MonkeyFirst
f5e1e10b6a Add hotkeys mode switching between standart & blender 2015-07-19 01:41:23 +06:00
Ivan K
1d845712c8 Internationalization: initial commit 
Localization
 2015-07-18 14:43:51 +04:00
MonkeyFirst
6b927e8533 add few models for preview 2015-07-18 03:05:20 +06:00
MonkeyFirst
721f121c91 init blender-keys-branch 2015-07-18 00:23:34 +06:00
Lasse Öörni
0fc4cdf12c Tabs to spaces. Moved MMB pan setting from Preferences dialog to Settings dialog to match the rest of the camera options. Added contributor credit. 2015-07-17 18:08:57 +03:00
julyfortoday
e10aef79cf Save/load mmbpan setting to/from xml, fixed naming 2015-07-17 09:07:25 -04:00
julyfortoday
6d8e057a7e Added togglable setting for changing the behavior of the MMB, allows panning by default instead of rotation/orbit 2015-07-16 22:26:51 -04:00
julyfortoday
0981492802 Center camera on selected object using the HOME key 2015-07-16 18:25:00 -04:00
Mike3D
a25f596e08 Added missing file formats to Editor's resource browser 2015-07-16 07:52:47 +02:00
Lasse Öörni
37f13c91d9 Remove double semicolon. 2015-07-15 00:59:12 +03:00
Lasse Öörni
9b629b2a36 Editor functionality to assign child nodes as a spline path. Contributed by MonkeyFirst. Closes #781. 2015-07-15 00:57:55 +03:00
Ivan K
f317df2961 Adding a button 'Reset Viewport' and checkbox 'Show Axes' for particle editor 2015-07-14 11:56:53 +04:00
Ivan K
8d37ae8e3d Fix scaling particle preview 2015-07-13 16:14:53 +04:00
Ivan K
0532ea5c6f Big particle preview and scaling preview with LMB + LShift 2015-07-13 15:50:58 +04:00
Lasse Öörni
ffa0b96e85 Fix typo. Ensure new node positioning uses world position in case the new node is parented. 2015-07-12 16:19:39 +03:00
Ivan K
8adcd0a965 Editor new node position 2015-07-12 13:48:24 +04:00
Lasse Öörni
986c4ca6fc If CollisionShape trimesh or convex shape assigned without a collision model, try to get it from the StaticModel in the same node. Closes #769. 2015-07-11 21:18:50 +03:00
Lasse Öörni
4219b7b157 Revert mistaken change to 20_HugeObjectCount.as. 2015-07-24 17:11:10 +03:00
Lasse Öörni
e8af02f453 Add double serialization support to Variant, Deserializer/Serializer, XMLElement & JSONValue. Use double to store a Lua object's number attributes. Add editing of double attributes to the editor. Closes #758. 2015-06-29 22:36:12 +03:00
Lasse Öörni
6b6447eb8c Detect presence of AssetImporter in either tool subdirectory or in the executable directory. 2015-06-09 21:23:04 +03:00
Yao Wei Tjong 姚伟忠
88d86548a4 Further minor clean up the CrowdAgent class. 
Revise the sample so Jack walk and turn more naturally.
 2015-05-28 17:52:12 +08:00
Yao Wei Tjong 姚伟忠
6b72c4412a Minor code clean up and bug fixes for DetourCrowd implementation. 
Avoid using multiple vectors to hold the same set of objects in the DetourCrowd sample.
 2015-05-27 21:51:10 +08:00
Mike3D
e166e7a84d Added moving obstacles and teleportation to sample 39. Also various behavior tweaks and ground texture modified to break monotony and discriminate with sample 15. If something doesn't appeal it can be reverted. 
Also set default mask and areaID at OffMeshConnection initialization.
 2015-05-23 09:27:39 +02:00
Mike3D
7f3a6ef86b Added off-mesh connections to sample 39 2015-05-20 10:56:32 +02:00
Yao Wei Tjong 姚伟忠
e7e2c262e5 Make button slider not focusable so it is easier to tab around. 2015-05-19 15:33:59 +08:00
Lasse Öörni
f9f920964f Remove agents & obstacles on OnNodeSet(null), similar to Drawables. Do not allow adding an agent when node is already null. Added missing enum in AngelScript navigation API. Do not keep a persistent array of agent handles in the AngelScript crowd example, as that keeps the agents alive even past removal from scene. Closes #729. 2015-05-17 16:54:57 +03:00