Commit Graph

382 Commits

Author SHA1 Message Date
Lasse Öörni
e5dcfdafbb Merge remote-tracking branch 'dragonCASTjosh/master' 2017-06-17 00:08:03 +03:00
Iain Merrick
282f250e3a Add UI.FontHintLevel property
There are three levels: NORMAL (the default), LIGHT and NONE.
The LIGHT level makes FreeType align font outlines to pixel
boundaries vertically, but not horizontally.
2017-06-15 15:30:28 -05:00
Iain Merrick
db6f4f9029 AngelScript version of Typography sample program 2017-06-13 13:40:31 -05:00
dragonCASTjosh
53c36d25f9 Added PBR demo changes to LUA and AS 2017-06-13 19:25:40 +01:00
Lasse Öörni
392155397b Add / remove the vehicle Action when RaycastVehicle component is enabled or disabled. Closes #1954. Minor code reformatting in 46_RaycastVehicleDemo.as. 2017-06-03 23:22:29 +03:00
Lasse Öörni
94af133ca4 For increased sharpness and to avoid artifacts, switch UI texture to nearest filtering when scaling the editor UI. 2017-05-09 01:02:49 +03:00
1vanK
fa767d1dc1 40_Localization: Center mouse on start 2017-05-05 19:39:45 +03:00
Lasse Öörni
f413945c98 Fix editor UI resolution detection for whether to lay out the status text on 1 or 2 rows. 2017-05-03 02:00:53 +03:00
Lasse Öörni
d4df1937c8 Line breaks formatting for RaycastVehicle demo code. 2017-04-29 20:33:36 +03:00
Lasse Öörni
13cfad66ef RaycastVehicle code / comments formatting and AngelScript fix. RegisterRaycastVehicleLibrary function removed and class registration performed as part of Physics library initialization instead. 2017-04-29 20:21:55 +03:00
Sergey Lapin
e50ec947a8 RaycastVehicle AngelScript demo code 2017-04-25 13:45:09 +03:00
Lasse Öörni
5fecffe8bd Fix dialog centering in the editor to use UI root size instead of screen size, which may not be the same. 2017-04-22 13:03:06 +03:00
Yao Wei Tjong 姚伟忠
1d3c20aa70 Double up the editor UI when on High DPI display. 2017-04-14 19:57:16 +08:00
1vanK
150c4fb26d Export some consts to AngelScript 2017-04-09 22:17:34 +03:00
orefkov
1556605471 Clear tabs 2017-04-08 20:50:44 +03:00
orefkov
fa71240346 Add color wheel in editor for Text3D component. 2017-04-08 20:50:44 +03:00
Yao Wei Tjong 姚伟忠
8c9122ce25 Minor refactoring and cleaning on IK component's code. 2017-04-01 21:28:27 +08:00
Alex Murray
68f8d23411 Fixing issues raised by Mike3D (incorrect offset in sample, exposing auto solve) 2017-03-22 14:23:14 +01:00
TheComet
327965a40c Fixing build on windows, fixing segfault in release builds 2017-03-22 02:15:32 +01:00
TheComet
8fc0aa2866 Lua script bindings and CPP sample 2017-03-21 15:56:47 +01:00
TheComet
2be9286d38 Wrote AngelScript bindings, I'm still considering renaming a few things here and there 2017-03-21 15:56:47 +01:00
Lasse Öörni
5f2b2132d7 Fix use of fileSystem.programDir in the terrain editor. Use the resource system / scene resource path instead. Closes #1852. 2017-03-19 12:12:35 +02:00
Enhex
490d402d4f Updated sound effects AngelScript sample to use SetAutoRemoveMode() instead of nodes. 2017-03-15 01:10:47 +02:00
Lasse Öörni
48a1f3dcdd Take fix from AngelScript WIP version to fix temp variable corruption. Remove now unnecessary fix from Editor script code. Closes #1850. 2017-03-08 14:26:52 +02:00
Lasse Öörni
ac821d21c1 Fix editor resource browser preview camera position and failure to assign model by drag & drop. Closes #1848. 2017-03-07 17:25:17 +02:00
Lasse Öörni
9999c44809 Fix resource browser scene node addition/removal getting reflected in the editor hierarchy window. 2017-03-07 16:55:52 +02:00
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
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
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
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
Eugene Kozlov
48b82e136e Fix typo in Editor scripts. 2017-01-03 18:27:06 +03: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
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
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
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
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
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
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
Lasse Öörni
20af1aa85f Demonstrate listing the vertex + index buffers to Model so that it can be saved correctly. Lua bindings not added for now due to problem with serializing a vector of object pointers. Closes #1638. 2016-10-10 15:44:31 +03:00
Lasse Öörni
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
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
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
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
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
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
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
77cabf9bff Remove "PS" from Roughness & Metallic uniform names. 2016-07-25 01:39:15 +03:00
Lasse Öörni
dfd8939840 Squashed commit of the following:
commit 5de699c5399847dfad99a58323590f88436e1f68
Merge: d80b1d9 97c5fbf
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Sun Jul 24 18:28:50 2016 +0100

    Merge pull request #4 from hdunderscore/tweaks2

    Tweaks2

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

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

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

    Merge branch 'pulls/2'

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

    Tweaks

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

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

    Merge remote-tracking branch 'origin/master'

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

    Fixed Inverse Square falloff and correction mistake with output color

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

    Merge pull request #3 from 1vanK/master

    Modify PBR example

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

    Labels

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

    Dynamic material in PBR example

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

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

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

    Remove unnecessary texture

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

    Added missing xml's.

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

    Minor fix to diffuse ibl calculation.

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

    Changed the hdr scaling to be more versatile.

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

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

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

    Renived unlicenced files

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

    Removed gamma correction from PBR demo

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

    Added legacy BRDF for GL

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

    Added diffuse ibl and legacy features

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

    Merge remote-tracking branch 'origin/master'

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

    Changed model on the demo scene

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

    Merge pull request #1 from Modanung/typo-fix

    Changed n to m in PBR example scene

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

    Changed n to m in PBR example scene

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

    Fixed reverted changes

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

    PBR Rewrite

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

    Complete rewrite of PBR

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

    Dissabled nolonger needed post processed gamma correction

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

    Fixed rendering issue in DirectX

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

    Fixed Spelling errors

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

    Made GGX distrabution physically correct

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

    Removed redundent textures

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

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

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

    PBR Gamma correctoin, and small prefernace changes to the demo scene
2016-07-25 00:54:21 +03:00
Lasse Öörni
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
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