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

662 Commits

Author SHA1 Message Date
Lasse Öörni
4c877d98ee Merge remote-tracking branch 'luveti/editor-terrain' 2017-02-18 22:47:57 +02:00
luveti
1ce189361d Added brush visualizer to the TerrainEditor. 2017-02-16 23:16:12 -05:00
luveti
8d7b4b0b58 Make sure to clip undo / redo buffer bounds to the heightMap bounds in the TerrainEditor 2017-02-16 01:14:31 -05:00
luveti
7798f1f2ca Added basic undo / redo support 2017-02-15 23:21:37 -05:00
luveti
3511050a96 Updates to Terrain Editor 
+ Added settings for the currently selected tool. This includes brush size, brush opacity, and brush height
+ Improved the speed of the smoothing algorithm by removing the new Array that was being created
+ Ignore transparent pixels in the smoothing algorithm
+ The "Create Terrain" action now creates a new image, saves it to Textures folder and adds it to the scene
+ Hid the "Paint" tools, as they have yet to be implemented
 2017-02-14 00:52:49 -05:00
1vanK
4b901d2c05 Editor: F3 also toggle Physics2D debug geometry 2017-02-13 12:34:32 +03:00
luveti
79dc24003c More coding convention updates to Terrain Editor 2017-02-11 23:53:56 -05:00
luveti
d56ccd619d Use 4 spaces instead of tabs in Terrain Editor 2017-02-11 23:50:15 -05:00
luveti
6e250289a8 Merge remote-tracking branch 'github/master' into editor-terrain 
# Conflicts:
#	bin/Data/Scripts/Editor.as
#	bin/Data/Textures/Editor/EditorIcons.png
 2017-02-11 23:46:00 -05:00
luveti
6950ad7c7d Updated Terrain Editor UI to work with latest version of Urho3D. 2017-02-11 23:41:16 -05: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
337056b657 Squashed commit of the following: 
commit 53b7204fded9ce69fa69e96b0531a12161c1036d
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Tue Feb 7 13:52:27 2017 -0300

    Restore windows positions when viewportmode switch

    Now the hierarchy and inspector windows will be restored to original state if you switch between viewport_compact and others.

commit 8a15c06ea468fd42268fa3d937433ff624b03a42
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 15:04:43 2017 -0300

    Replaced tabs by spaces.

commit 9663fef07f5dcebc3a78d2e82c875736cb6d1a70
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:56:06 2017 -0300

    Replaced tabs by spaces.

commit 6fbea29b26491675d9783769cc9f01e8f925dabe
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:49:15 2017 -0300

    Replaced tabs by spaces.

commit 6dbe8b451e444391f82c642374f1bcba506035ce
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:48:30 2017 -0300

    Replaced tabs by spaces.

commit 1d3c98689183abcc99271a65fe9ec3d9be5b6ca0
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:19:00 2017 -0300

    Fixed stats text position.

commit 9632876aee4470d722872223f62a072cef1e8137
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:54:20 2017 -0300

    Prevent inspector hide if viewport_compact

commit 46775b205bb340dddcb2f1950d9c1912845d36aa
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:52:25 2017 -0300

    Prevent hierarchy hide if viewport_compact

commit b301b244a47c4f374ca7b97f6c06029f95531c5e
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:47:10 2017 -0300

    Replaced .visible by functions.

commit a30879d68d2145c6521a9ed9f7d282e9f63b4404
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:42:51 2017 -0300

    Enable hierarchy/inspector on compact viewport mode.

commit d6f9d2748e96d8f7b76ea875e5079385f4d9af60
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:30:18 2017 -0300

    Clean version of code

    Now the content of SetCompactMode is inside of SetViewportMode.
    Code commented.
    Now the code match the engine code convention.

commit 9777750d41f6f45701438b65fae20ea008db3f71
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Sat Feb 4 17:21:57 2017 -0300

    Update EditorView.as

commit e00dbbac2a528a535dab2e1bbc24fe91933caf3b
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Sat Feb 4 17:18:11 2017 -0300

    Added compact option to viewport mode list.
 2017-02-09 15:34:36 +02:00
Lasse Öörni
171896ddb4 Hide instead of skip UI element internal vars in AttributeEditor so that indexing works for user-added UI element variables (subindex 0 must always be found in current implementation.) Closes #1788. 2017-02-06 19:00:12 +02:00
Mateus Vendramini
78b77ed48f Fixing small typos in comments 2017-02-05 17:33:01 -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
1vanK
0c1c14871c Remake 'Anonymous Pro.sdf' font 2017-01-19 19:54:03 +03:00
1vanK
c4de7c004a Fix Kachujin BoundingBox 2017-01-17 23:32:37 +03:00
MonkeyFirst
0d91a1b412 minor fixes: sizes, font, adjust offsets, b.mode key 2017-01-17 23:56:49 +07:00
MonkeyFirst
8828740464 Use Ctrl instead Alt for deselecting with PaintSelection 2017-01-17 19:25:21 +07:00
MonkeyFirst
b0cade9697 add global handlers 2017-01-17 06:24:55 +07:00
MonkeyFirst
984ba731bb PaintSelection and Origins 2017-01-17 06:23:21 +07:00
Lasse Öörni
314a3af082 Fix artifacts in SDF text effects when supersampling is off. 2017-01-10 11:46:03 +02:00
1vanK
51c6fb5e2d SDF supersampling 2017-01-08 16:56:32 +03: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
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
Yao Wei Tjong 姚伟忠
8fd264c73e Fix minor typo in editor resource browser script. 2017-01-07 13:02:36 +08:00
Lasse Öörni
c548d8ed24 Merge remote-tracking branch 'arnislielturks/console-update' 2017-01-04 16:05:28 +02:00
Lasse Öörni
e93fa4d7b3 Replace small version of old logo with slightly larger picture. For now editor does not display a logo in the top bar, since the new logo would become mostly illegible. 2017-01-04 14:39:14 +02:00
Arnis Lielturks
e89a769a76 console text highlighting, style detection by log level improved 2017-01-04 10:50:19 +02:00
Eugene Kozlov
48b82e136e Fix typo in Editor scripts. 2017-01-03 18:27:06 +03: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
496b2d39f8 Merge remote-tracking branch 'Modanung/new-icon' 2017-01-02 19:16:53 +02:00
Lasse Öörni
b5a7d764bd Replace "***" with a divider element. 2017-01-02 18:11:12 +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
Modanung
c17a63dd57 Switched to new icon 2017-01-02 11:47:22 +01:00
Konstant
c70b6cf7ae Fix another misspelling. 2017-01-02 11:23:52 +02: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
f0e05cb7e1 Console auto complete 2017-01-01 22:35:14 +02:00
Konstant
40907e4ec1 Return " >areaCost" variables to AttributeEditor. 2017-01-01 20:29:14 +02:00
Konstant
7244503cef Update AttributeEditor. 2017-01-01 20:24:09 +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
Lasse Öörni
adf96469ef Replace LogoLarge.png with new logo & redirect README.md back to it, since svg doesn't appear properly on the project page. 2016-12-19 20:02:05 +02:00
Lasse Öörni
790772ec79 Squashed commit of the following: 
commit 79d66503554c716c6a3c31f6c9e0aed46832c6bb
Author: Modanung <frode@lindeijer.nl>
Date:   Mon Dec 19 02:45:45 2016 +0100

    More clearly defined character edges in FishBoneLogo.png

commit fbfa9285f78819b4f1f3c42673f61f55c5ce5d06
Author: Modanung <frode@lindeijer.nl>
Date:   Mon Dec 19 02:27:07 2016 +0100

    Removed alpha anomaly in FishBoneLogo.png

commit 07161d555ed3ab3a13ac7c2f8ae0c0abfc7688a8
Author: Modanung <frode@lindeijer.nl>
Date:   Mon Dec 19 02:21:27 2016 +0100

    Improved lighting on FishBoneLogo.png

commit 5ec68be44517a4fd0ebd19b7bc73b98117af5f62
Author: Modanung <frode@lindeijer.nl>
Date:   Mon Dec 19 01:05:58 2016 +0100

    Tuned down alpha to zero for low-alpha areas

commit 55fc6df7302597f2e8281283748b5f3723297362
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 23:12:32 2016 +0100

    Increased size of black and white fish bone logo

commit 2c3ef9af05df91149132a3ac137e51a424be98f6
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 23:11:03 2016 +0100

    Updated black and white fish bone logo

commit 47adbcf0463937726b406c1ee7deead3d568bf63
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 23:08:51 2016 +0100

    Replaced logo in readme and samples
 2016-12-19 19:49:17 +02:00
luveti
ba5e3a3097 Moved Editor resources into correct bin folder 2016-12-18 20:18:47 -05:00
luveti
4e87e746f2 Merge remote-tracking branch 'github/master' into editor-terrain 
# Conflicts:
#	Bin/Data/Textures/Editor/EditorIcons.png
#	bin/Data/Scripts/Editor.as
#	bin/Data/Scripts/Editor/EditorScene.as
#	bin/Data/Scripts/Editor/EditorUI.as
#	bin/Data/UI/EditorIcons.xml
 2016-12-18 20:15:52 -05: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
Lasse Öörni
3e4ca7ae33 Move VSM shadow z/w divide to pixel shader so that e.g. shadowed point lights will work much better. Related to #1716. 2016-12-17 01:27:51 +02:00
gleb
43b579feb6 Line primitives. Could be very useful models for debug, user interface etc. 2016-12-08 22:48:58 +00:00
gleb
feb9cd071d Material preview model 2016-12-04 22:55:39 +00:00
Lasse Öörni
16eea39499 Fix rotation of UV's in the plane model so that 10_RenderToTexture sample looks as expected. 2016-12-03 23:53:03 +02:00
Lasse Öörni
d7cf72563c Fix recent shader change for GLES. 2016-11-19 22:28:37 +02: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
f1cb469a34 Fix getting world-space tangent for billboards. Closes #1678. 2016-11-09 22:57:34 +02: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
Eugene Kozlov
a8f4728951 Optimize object spawn via script in Editor. Closes #1664. 2016-11-05 19:54:33 +03:00
Lasse Öörni
d7f0c06644 Fix mistakenly disabled depth test in "shrinking" soft particle techniques. Remove unnecessary abs() function in soft particle shaders when on the "shrinking" path. 2016-11-03 20:45:26 +02: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
5482ae7396 Optimize Editor work with temporary objects, part 2. 2016-11-01 09:09:13 +03:00
Lasse Öörni
352a62536c Initialize depth in Deferred & Prepass renderpaths to allow sampling the depth buffer even if no opaque geometry has been rendered. Documentation edits. 2016-10-31 19:06:13 +02:00
Lasse Öörni
a04bf5629a Refactored soft particle handling to not use unique renderpath files. Closes #1670. 2016-10-31 18:25:54 +02:00
Eugene Kozlov
7a24d5b2c7 Optimize Editor work with temporary objects. 2016-10-30 00:21:59 +03:00
Johnathan Jenkins
d78fc4020f minor typos 2016-10-28 13:07:14 -07:00
Lasse Öörni
fe65264301 Added "expanding" option for soft particles, which requires hardware depth test off. Improve soft particles documentation on the renderpath page. Closes #1623. 2016-10-28 22:19:37 +03:00
Lasse Öörni
f7b0a04666 Merge remote-tracking branch '1vanK/master' 2016-10-28 14:45:50 +03:00
1vanK
b8acdcb42d Add vertex colors to standart primitives 2016-10-28 13:57:54 +03:00
Lasse Öörni
5804347ab2 Reverse saturation fix also for GLSL. 2016-10-28 12:46:32 +03:00
Lasse Öörni
3564686a34 Fix DeferredSP & PrepassSP renderpaths not clearing depth. Fix reverse saturation of faded billboard on D3D11. Fix depth shader compile error on D3D11 when alphamasked. 2016-10-28 12:27:17 +03:00
Lasse Öörni
861a85fb1f Separate unlit particle shaders & techniques for optional soft particle support. Soft particles versions of renderpaths. Soft particle shaders adapted from work by 1vanK & MonkeyFirst (https://github.com/1vanK/Urho3DSoftParticles). Fix Shadow shader failing for billboards. Fix ForwardHWDepth renderpath unnecessarily rendering depth in a separate pass. Closes #1623. 2016-10-28 08:36:50 +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
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
0e0066ad21 Merge remote-tracking branch 'victorholt/master' 2016-10-11 19:30:55 +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
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
Eugene Kozlov
b47a5cbd6d Fix error in Skybox.hlsl when instancing is forced on. 2016-10-08 10:41:28 +03:00
Lasse Öörni
bca26b74eb Fix color wheel being created outside the screen in small resolutions. 2016-10-05 10:57:02 +03:00
Lasse Öörni
f8ebf2dbc9 Line antialiasing support in Graphics, Material, DebugRenderer classes. Closes #1627. 2016-10-05 00:17:05 +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
7658ad39c7 Remove commented out shader code. 2016-09-29 20:49:40 +03:00
Lasse Öörni
f13a10cb0c Fix behavior of SoundSource debug icons in editor. Closes #1620. 2016-09-27 20:21:16 +03:00
Lasse Öörni
1017e82fd9 Ignore files with no filename component for XML parsing in EditorResourceBrowser. .gitignore etc. 2016-09-24 19:36:03 +03:00
Lasse Öörni
08b083b323 Tightening of shadow related function signatures on GLES. Related to #1607. 2016-09-22 16:33:43 +03:00
Lasse Öörni
90efa3b976 Specify high precision for water shader varyings on GLES to fix shaky reflection/refraction texture sampling. Closes #1593. 2016-09-17 00:26:32 +03:00
Lasse Öörni
97eba580b5 Fix implicit conversion in normal offset shadow calculations. Closes #1586. 2016-09-15 16:35:33 +03:00
1vanK
bba9766c66 39_CrowdNavigation: animation sync 2016-09-14 11:24:20 +03: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
golden
5f7ef278be fix skydome glsl error 2016-09-11 13:27:47 +08: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
63043ebdf3 Demonstrate alpha mask, render order change & occlusion disable with a new example material in the SceneLoadExample demo scene. Porting note added related to missing techniques. 2016-09-06 12:00:50 +03:00
Lasse Öörni
695f75099e Remove specific AlphaMask & NormalPacked techniques, in favor of adding the necessary shader defines in the material instead. 2016-09-06 11:47:42 +03: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
1vanK
61f8fb5205 Draw navigation debug geometry in Editor 2016-09-03 14:05:24 +03:00
Lasse Öörni
3d48522eb4 Refresh attribute inspector only for script reload, not for other resources. Related to #1557. 2016-09-01 23:23:56 +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
b3964e21c5 Demonstrate Z fighting elimination by depth bias in 10_RenderToTexture sample. Closes #1543. 2016-08-30 21:21:10 +03:00
Lasse Öörni
9d5380bc10 Remove extraneous f from GLSL code to satisfy the compiler. 2016-08-29 19:25:49 +03:00
Lasse Öörni
05f1883873 Allow drag-drop of generic (unrecognized) XML files from resource browser into attribute edit fields. Do not put slash in beginning of root folder resources in resource browser. Closes #1539. 2016-08-26 01:36:40 +03:00
Lumak
e0a18c0692 added final mutant animations 2016-08-23 10:10:25 -07:00
Scellow
3ba1c8023b Make LineEdit text and cursor to be always vertucaly centered 
I believe that it is how it should be by default, it is not a MultiLineEdit so it should be centered Vertically

http://i.imgur.com/qjAYO0f.png
 2016-08-21 13:39:38 +02:00
Lumak
910c14654e more mutant anims 
-renamed Jump1 anim as JumpStop and changed Jump1 to jump-to-fall
 2016-08-20 19:12:42 +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
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
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
Mike3D
ef6284c938 Fixed mouse mode for sample #36 [ci skip] 2016-08-03 08:15:34 +02:00
Lasse Öörni
c817428fb7 When multiple source nodes selected in the hieranchy window, disable the drag/drop reorder function, as ctrl-click can be used to multiselect, and user might be still holding ctrl down after that. Fix component hierarchy items created as not draggable; components would not be reorderable after being reordered once. 2016-07-31 18:12:26 +03: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
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
b29979742f Lowercase "HDR" in the editor config for consistency, as everything else is lowercase as well. 2016-07-29 16:49:04 +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
joshua Nuttall
e635ad2ed7 Removed Bloom from PBR demos, set zone texture ambleint to 1, and added HDR option in editor settings (needed for PBR in editor) 2016-07-28 22:16:30 +01:00
Lasse Öörni
06b0dbba76 Fix compile errors in PBR shaders on GLES. Fix mismatches in PBR techniques where IBL compile define would be present for pixel shader but not vertex shader (causes shader linking error) 2016-07-25 15:28:48 +03:00
Lasse Öörni
3b6e59d466 Reduce directional light brightness in the PBR scene. 2016-07-25 14:03:01 +03:00
dragonCASTjosh
1c5ce961da Revert mip selection method 2016-07-25 02:02:00 +03:00
Lasse Öörni
77cabf9bff Remove "PS" from Roughness & Metallic uniform names. 2016-07-25 01:39:15 +03:00
Lasse Öörni
6ca0aafd27 Use cAmbientColor.rgb where necessary. 2016-07-25 01:31:51 +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
4ce51e3cc0 Add gamma correction postprocess toggle to the editor. 2016-07-22 17:51:39 +03:00
Mike3D
238f09c53d Fixed TileMap2D::PositionToTileIndex() and use it in tile map sample 2016-07-18 13:18:57 +02:00
Lasse Öörni
ccf1abec81 Cleanup cameraPos function parameter from GLSL directional billboard code. Fix directional billboard face camera rotation calculation when billboards are in model space (relative to node). Related to #1471. 2016-07-15 22:23:38 +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
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
Yusuf Umar
a9f7703f74 Add update invisible parameter to RibbonTrail and use it on the samples. 2016-06-16 18:09:09 +07:00
Yao Wei Tjong 姚伟忠
239c0265a0 Fix a typo in RibbonTrail's attribute and other minor cleanups. 2016-06-16 13:28:02 +08:00
Frode Lindeijer
d534b3376b Refined RibbonTrail icon. 2016-06-15 21:14:59 +03:00
Yusuf Umar
08fdf0dda0 Fixing corrupted textures. 2016-06-15 21:14:58 +03:00
Yusuf Umar
f9e65027e3 Implementing RibbonTrail 2016-06-15 21:14:58 +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
Lasse Öörni
ed048b7293 Transmit shadow position to GetShadow() as highp to fix remaining shadow accuracy issue on Android. 2016-06-08 22:50:49 +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
Lasse Öörni
c98d52c0a3 Prefer to put the instance transform before output variables. 2016-06-06 22:26:37 +03:00
Lasse Öörni
09845225b7 Merge remote-tracking branch 'tungsteen/shaders-merge' 2016-06-06 21:56:10 +03:00
Lasse Öörni
5fa3cff841 Prevent unnecessary fullupdate when node attributes are edited. 2016-06-06 21:30:13 +03:00
Lasse Öörni
b386b76c23 Fix "Is enabled" checkbox getting moved on gizmo / cursor key node editing. Closes #1401. 2016-06-06 20:13:34 +03:00
Sergey Bosko
683ebbdc08 Fix instancing for HLSL water shader 2016-06-06 12:02:59 +02: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
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
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
cosmy
2b1118528b Simplify sample code. 2016-05-23 17:16:15 +02:00
cosmy
1b661b8a9b Fix wrong delete object. 2016-05-23 14:49:20 +02:00
cosmy
c2128e054e Clean C++ sample and add Lua version. 2016-05-23 14:35:06 +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
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
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
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
ed8740428c Remove cCameraRot uniform. Instead derive from cViewInv as necessary. Closes #1163. 2016-04-19 23:18:07 +03:00
Lasse Öörni
88acae8c77 Fix instancing texcoord in the PBR HLSL shader. 2016-04-18 22:47:34 +03:00
Lasse Öörni
c003af1114 Merge branch 'master' into vertexdeclaration 2016-04-18 22:34:00 +03:00
hdunderscore
310252fa25 Re-ordered the deferred g-buffer to allow GL3 to receive the material roughness. 2016-04-18 16:53:37 +10:00
hdunderscore
076eaca13e Update PBR techniques, fixed an issue with normal maps not showing with PBRDiffNormal.xml 2016-04-18 09:09:06 +10:00
hdunderscore
42cbca8b26 Fix an issue in the PBR shaders that was causing noise. 2016-04-17 12:26:43 +10:00
hdunderscore
ede6383c27 Reduced an artifact in the PBR IBL shader, simplified the code, renamed PBRFAST to IBLFAST and reduced unnecessary iterations when IBLFAST is defined. 2016-04-17 11:19:38 +10:00
Lasse Öörni
b5489bdf9b Fix second texcoord input attribute in the PBRLitSolid.glsl shader to conform with the new vertex semantic system. 2016-04-16 15:20:25 +03:00
Lasse Öörni
19f3b0f120 Merge branch 'master' into vertexdeclaration 2016-04-16 14:58:30 +03:00
Yao Wei Tjong 姚伟忠
43bea49674 Fix the PBRDemo shell script. 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
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
7b738c54ac Merge branch 'master' into vertexdeclaration 2016-04-12 22:20:09 +03: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
644eecfa7d Demonstrate defining non-legacy vertex elements in the DynamicGeometry C++ & AngelScript examples. 2016-04-10 15:37:48 +03:00
1vanK
49a25f787c OgreImporter: fix relative to absolute transform and Jack's walk animation 2016-04-07 18:45:24 +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
9fd22d3323 Fix instance texture coordinate in HLSL shaders. 2016-04-05 00:32:17 +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
Lasse Öörni
5246f74984 Merge remote-tracking branch 'hdunderscore/input_mousemode_update' 2016-03-29 19:49:55 +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
cosmy
d11a1980ac Add missing commas in EditorStrings 2016-03-24 16:39:04 +01:00
cosmy
f2c13b2fb0 Add missing Italian localization entries 2016-03-24 16:09:19 +01: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
Ivan K
f27c48616d Editor russification 2016-03-16 15:47:38 +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
Ivan K
8842604c80 Fix ToolTip border; EditorHierarchyWindow: tabs to spaces, fix ResetButton ImageRect 2016-03-15 03:36:04 +04:00
Lasse Öörni
a2b05dc0fd Add "Tags" Russian localization from 1vanK. 2016-03-09 11:49:36 +02:00
cosmy1
9f59f28aad Add missing translation in editor strings (FR, IT) 2016-03-09 03:40:58 +01:00