Commit Graph

674 Commits

Author SHA1 Message Date
Jérôme Leclercq 1601849a00 Sdk/BaseWidget: Add HasFocus method 2017-11-23 13:23:11 +01:00
Jérôme Leclercq 6c8b3eb319 Sdk/Entity: Add Disable shortcut 2017-11-23 13:22:38 +01:00
Jérôme Leclercq 0a5cbe656f Math/VectorI: Make array/pointer constructor explicit 2017-11-23 13:21:51 +01:00
Jérôme Leclercq b83a9b60e7 Sdk/World: Fix destruction retrieval while world clear 2017-11-22 10:26:33 +01:00
Faymoon 06ac8cf904 Add AddImpulse for PhysicsComponent2D (#141)
* Update PhysicsComponent2D.hpp

* Update LuaBinding_SDK.hpp

* Update LuaBinding_SDK.cpp

* Update LuaBinding_SDK.cpp

* Add : AddImpulse

* Add : AddImpulse

* Add : binding of PhysicsComponent2D

* add : handle

* fix alphabetical order

* complete PhysicsComponent2D binding

* Update LuaBinding_SDK.cpp

* Update LuaBinding_SDK.hpp

* Update PhysicsComponent2D.hpp

* Update PhysicsComponent2D.inl

* forgot : use namespace Nz and open namespace Ndk

* Update PhysicsComponent2D.hpp

* Add Addimpulse

* Update PhysicsComponent3D.hpp
2017-11-21 12:17:11 +01:00
Gawaboumga f991a9529e General bug fixes (#142)
* Core/Bitset: Fix TestAll method

* Fix documentation

* Fix color and their conversions

* Core/ByteStream: Fix return of Write

* Fix compiler warnings

* Math/Algorithm: Fix angle normalization

* Math/BoundingVolume: Fix lerp

* Math: Fix relation between Matrix4 and Quaternion

* More tests

* X11/Window: Fix mouse moved event generated when doing Mouse::SetPosition

* Update ChangeLog

* Should fix compilation on Windows

* Should fix compilation on Windows

Forgot to include array for Windows
2017-11-21 12:16:46 +01:00
Lynix 4fc076325c Sdk/StateMachine: Fix instantaneous state change 2017-11-19 17:09:56 +01:00
Jérôme Leclercq 16d4a6ac1c Sdk/BaseWidget: Fix compilation, for real 2017-11-15 10:48:30 +01:00
Lynix 14924f0e74 Sdk/BaseWidget: Fix compilation on Linux 2017-11-15 01:25:33 +01:00
Lynix 55bbc282db Sdk/TextAreaWidget: Fix compilation 2017-11-11 18:53:51 +01:00
Lynix 0487b282d7 Sdk/TextAreaWidget: Show cursor as long as focus is active 2017-11-11 18:42:30 +01:00
Lynix f136530a74 BaseWidget: Renamed GrabKeyboard to SetFocus, added ClearFocus and focus virtual methods 2017-11-11 18:38:11 +01:00
Lynix f5b639ec0f Sdk/TextAreaWidget: Fix detail about cursor
When moving cursor to the left when already at the beginning of a line, make it move to the upper line
2017-11-11 18:19:44 +01:00
Lynix 2b88d81294 Sdk/TextAreaWidget: Refactor cursor position
In order to have only one cursor instead of two
2017-11-11 18:18:44 +01:00
Jérôme Leclercq 79338c7177 Sdk/TextAreaWidget: Fix issues when deleting characeters 2017-11-10 13:38:06 +01:00
Jérôme Leclercq e3f21b7268 Sdk/TextAreaWidget: Add OnTextChanged signal 2017-11-10 13:13:33 +01:00
Jérôme Leclercq bb6e032b60 Sdk/TextAreaWidget: Add support for EchoMode 2017-11-10 13:12:04 +01:00
Jérôme Leclercq 5eec06b0ea Sdk/Canvas: Fix crash on keyboard event 2017-11-09 12:39:25 +01:00
Jérôme Leclercq a8651846ae Sdk/World: Fix movement not taking waiting entities into account 2017-11-08 13:14:00 +01:00
S6066 2ed9691c80 Added ImageWidget (#139)
* Added ImageWidget

* Remove useless ResizeToContent function

* Add ResizeToContent function

* Forgot operators

* Added textures & colors functions

* oops
2017-11-06 16:50:52 +01:00
Lynix d688cecbde Renderer: Replaced RenderTarget::Get[Height|Width] by RenderTarget::GetSize
Utility: Removed Window::Get[Height|Width] methods
2017-10-28 23:26:22 +02:00
Lynix be38aee1fa Fix some warnings 2017-10-18 22:02:21 +02:00
Jérôme Leclercq 10a92dcb18 Sdk/LuaAPI: Add Ndk::Entity* handling for parameters 2017-10-16 11:57:38 +02:00
Lynix 2cac137066 Sdk: Remove systems clone (and thus need for copy constructor) 2017-10-14 14:41:55 +02:00
Lynix a39ed47ef4 Regenerate global headers 2017-10-10 21:52:34 +02:00
Jérôme Leclercq 10e2d3008a Sdk/Algortihm: Fix 64bits shift 2017-10-10 21:52:34 +02:00
Jérôme Leclercq 84537fcfb8 Sdk: Fix segfault when deleting hovered widget 2017-10-10 21:52:33 +02:00
Lynix d1eac591f5 Graphics: Prepare dynamic reflections 2017-10-10 18:28:15 +02:00
Lynix c763dea4e1 Merge branch 'master' into reflection-mapping 2017-10-02 21:11:15 +02:00
Gawaboumga bbac0838dd Include-What-You-Use (#137)
* IWYU Core

* IWYU Noise

* IWYU Utility

* IWYU Audio

* IWYU Platform

* IWYU Lua

* IWYU Network

* IWYU Physics2D

* IWYU Physics3D

* IWYU Renderer

* IWYU Graphics

* IWYU NDKServer

* IWYU Fix

* Try to fix compilation

* Other fixes
2017-10-01 11:17:09 +02:00
Lynix bccbc0dbf1 Move warning fixes! 2017-09-30 15:23:05 +02:00
Lynix 508554fcb1 Fix some more warnings 2017-09-30 15:00:42 +02:00
Lynix fb354b1204 Fix compilation warnings 2017-09-30 14:54:08 +02:00
Lynix f95fc332f1 Sdk/BaseSystem: Fix udpate with max update rate + unit tests 2017-09-22 21:01:25 +02:00
Jérôme Leclercq 9a665bbff6 Sdk/BaseSystem: Rename UpdateRate to FixedUpdateRate and add MaximumUpdateRate 2017-09-22 15:22:19 +02:00
Jérôme Leclercq 37896e2401 Sdk/BaseWidget: Add CenterHorizontal and CenterVertical() methods 2017-09-21 14:40:03 +02:00
Jérôme Leclercq bf98297233 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine 2017-09-19 15:14:26 +02:00
Jérôme Leclercq 5afe321b5c Widgets/ButtonWidget: Fix position 2017-09-19 15:14:24 +02:00
S6066 3d4585ec4a Added functions to customize ButtonWidget (#133)
* Made ButtonWidget more usable

* Fix static functions

* Reorder static functions

* Deteriorate ButtonWidget
2017-09-16 14:19:11 +02:00
S6066 9f52932327 Added Reserve function in Ndk::EntityList (#134) 2017-09-03 20:11:28 +02:00
Lynix a85ded1262 Sdk/World: Fix movement 2017-08-31 19:39:45 +02:00
S6066 81f7e943df Add Progress Bar Widget (#132)
* Started Checkbox Widget (buggy)

* Added features

* Added enabling feature

* Almost finished Checkbox

* Bugfix

* Bugfixes

* Use a better name

* Optimizations

* Added explicit colors

* ...

* changed lots of things

* Almost finished CheckboxWidget

* Almost almost finished

* Use better UTF8 box

* Edited encode resources script to encode SDK resources

* Finished checkbox widget

* Forgot to delete old function

* Forgot to delete todo comment

* Fix Travis compilation

* Fix Travis compilation a second time

* Fix Travis Compilation a third time

* Fix indentation

* Fix Files encoding

* Moved CheckboxState enum in (new) Enum.hpp

* Probably looks like more generated now

* Reorder CheckboxWidget members

* Reorder checkbox state members

* Reorder members 2...

* Oops

* Reorder members functions

* Fix encoding

* Fix files encoding

* Forgot to fix one file encoding

* Fix SDK Server

* Fix encoding again -_-

* Oops

* Added ProgressBarWidget

* Finished (?) Progress Bar Widget

* Optimize Checkbox Widget

* Fix .gitignore

* Removed .vs in gitignore

* Moved Enums into Widgets folder

* Bugfix

* Fix Encode Resources script

* Remove double line feeds

* Rename SetNextState to SwitchToNextState

* Added ProgressBarWidget

* Finished (?) Progress Bar Widget
2017-08-30 15:17:54 +02:00
S6066 55ca4a84ea Added CheckboxWidget (#130)
* Started Checkbox Widget (buggy)

* Added features

* Added enabling feature

* Almost finished Checkbox

* Bugfix

* Bugfixes

* Use a better name

* Optimizations

* Added explicit colors

* ...

* changed lots of things

* Almost finished CheckboxWidget

* Almost almost finished

* Use better UTF8 box

* Edited encode resources script to encode SDK resources

* Finished checkbox widget

* Forgot to delete old function

* Forgot to delete todo comment

* Fix Travis compilation

* Fix Travis compilation a second time

* Fix Travis Compilation a third time

* Fix indentation

* Fix Files encoding

* Moved CheckboxState enum in (new) Enum.hpp

* Probably looks like more generated now

* Reorder CheckboxWidget members

* Reorder checkbox state members

* Reorder members 2...

* Oops

* Reorder members functions

* Fix encoding

* Fix files encoding

* Forgot to fix one file encoding

* Fix SDK Server

* Fix encoding again -_-

* Oops

* Optimize Checkbox Widget

* Fix .gitignore

* Removed .vs in gitignore

* Moved Enums into Widgets folder

* Bugfix

* Fix Encode Resources script

* Remove double line feeds

* Rename SetNextState to SwitchToNextState
2017-08-30 10:25:42 +02:00
Gawaboumga 5aa072cee3 New module: Platform - Split window management from Utility module (#128)
* New module: Platform - Split window management from Utility module

Final touch

* NDK/SDK: Bring back initialization of Utility
2017-08-30 10:22:50 +02:00
Gawaboumga 41a1b5d493 Physics2D tests (#129)
* Quaternion: Fix singularity on Z axis when converting to euler angles

* CollisionComponent2D: Add method to retrieve AABB

* Collider2D: Fix constructor for Box with Vector2

* Physics2D: Fix rotation (Chipmunk works with radian and Nazara degrees) and copy constructor of RigidBody2D

* Colider2D: Add New for convex and tests for the new classes
2017-08-20 21:47:23 +02:00
Lynix f363420ebe Sdk/ParticleEmitterComponent: Fix Enable inline option 2017-08-20 21:34:12 +02:00
Jérôme Leclercq 5531e81e65 Core: Add CRC64 and regenerate global headers 2017-08-15 12:32:19 +02:00
Jérôme Leclercq 061b358857 Sdk/ButtonWidget: Fix layout not triggering when updating text 2017-08-08 16:34:22 +02:00
Lynix 4e9508e23a TextAreaWidget: It feels natural now *.* 2017-08-06 23:40:41 +02:00
Lynix 5aa2efc737 TextAreaWidget: Add support for 2D cursor 2017-08-06 23:37:35 +02:00
Lynix d2b74cd3be Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine 2017-08-05 20:51:52 +02:00
Lynix 732c37a194 Sdk/BaseWidget: Begin doc 2017-08-05 20:51:48 +02:00
Jérôme Leclercq 80ddfd1fbe Sdk/World: Fix Clear not clearing everything 2017-08-04 13:38:23 +02:00
Jérôme Leclercq adf7bb15cf Save your files kids.. 2017-07-27 14:50:08 +02:00
Jérôme Leclercq b64ab862fe Fix warnings 2017-07-27 14:39:48 +02:00
Jérôme Leclercq 2b36516758 Fix compilation 2017-07-27 14:39:34 +02:00
Jérôme Leclercq 326fb930af Sdk/LuaBinding: Add support for component binding without default constructor (will throw a lua error) 2017-07-27 11:41:13 +02:00
Jérôme Leclercq d4532ce7ff SDK/Lua: Bind HasComponent method 2017-06-15 11:07:21 +02:00
Jérôme Leclercq 86fa6c5009 SDK/LuaBinding: Bind IsValidHandle for handled types 2017-06-13 15:05:55 +02:00
Lynix 9efcfb54ac SDK/LuaBinding: Fix compilation 2017-06-10 22:53:11 +02:00
Lynix 487bd64bcf Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping 2017-06-10 22:33:03 +02:00
Lynix 713f7dfd5b SDK/LuaBinding: Fix TextureManager binding 2017-06-10 22:32:51 +02:00
Lynix cea89abc51 Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here 2017-06-09 01:47:33 +02:00
Jérôme Leclercq a8129b218b Refactor LuaInstance to prepare coroutine handling 2017-06-07 21:18:07 +02:00
Lynix 3b914422c8 SDK/EntityList: Fix warning on GCC 2017-05-30 00:50:28 +02:00
Jérôme Leclercq 09bace0f28 Sdk/LuaBinding: Bind UdpSocket 2017-05-18 11:44:28 +02:00
Lynix 7425993d2d SDK/World: Fix waiting entities not being cleared on time 2017-05-15 10:11:42 +02:00
Lynix bb3eebb9cc Sdk/EntityList: Automatically remove entities from lists on destruction 2017-05-14 22:13:31 +02:00
Lynix 3d25501f9f Sdk: Fix compilation 2017-05-13 20:00:15 +02:00
Lynix 4a0cb4e1f1 Sdk/World: Get rid of now useless trick in Clone method
EntityHandle can no longer move in memory until a world update
2017-05-11 21:26:01 +02:00
Lynix c9969d1b57 Sdk/BaseComponent: Disable implicit copying 2017-05-11 21:21:25 +02:00
Lynix 75d57b3c29 Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping 2017-05-11 20:52:04 +02:00
Lynix dd4466081f Merge branch 'entitylist-refactor' 2017-05-11 20:35:09 +02:00
Lynix 19f9191815 SDK/World: Improve doc 2017-05-11 20:14:58 +02:00
Lynix 1b66948213 Merge branch 'entitylist-refactor' of https://github.com/DigitalPulseSoftware/NazaraEngine into entitylist-refactor 2017-05-11 20:13:57 +02:00
Lynix 064ffd2945 SDK/EntityList: Improve documentation 2017-05-11 19:46:57 +02:00
Lynix 52a4a590e1 Graphics/Material: Fix depth sorting flag handling for meshes 2017-04-22 17:13:51 +02:00
Lynix e3514db87f Sdk/GraphicsComponent: Add methods to update local matrix and render order 2017-04-22 17:11:42 +02:00
Lynix 5211d899dd Merge remote-tracking branch 'refs/remotes/origin/master' into entitylist-refactor 2017-04-22 12:59:18 +02:00
Lynix ec310b9577 Sdk/Entity: Fix removed components sometimes not being removed 2017-04-22 12:59:06 +02:00
Lynix 0708531f6c Sdk/World: Inline GetEntity and KillEntity 2017-04-22 12:58:39 +02:00
Lynix c1e9fe7b04 Merge remote-tracking branch 'refs/remotes/origin/master' into entitylist-refactor 2017-04-21 22:08:13 +02:00
Lynix 4f6706284e Sdk/World: Fix entity block handling 2017-04-21 21:27:27 +02:00
Lynix 3c99782643 Sdk/EntityList: Fix empty() behavior 2017-04-21 21:27:07 +02:00
Lynix 203509f141 Sdk/BaseSystem: Reuse EntityList 2017-04-21 01:02:46 +02:00
Lynix 53b92106ff Sdk/World: Fix block pointers 2017-04-21 01:02:23 +02:00
Lynix 48b348135e Refactor EntityList and prevent World to invalidate its own handles between updates 2017-04-20 23:42:45 +02:00
Gawaboumga eb70453574 State machine as a stack (#123)
* State machine as a stack

* Fix comments linked to code review

* I will think to compile, next time
2017-04-20 12:30:43 +02:00
Lynix 1305e8434a Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping 2017-04-17 23:42:21 +02:00
Lynix 5eccfefc05 Fix compilation 2017-04-17 23:42:20 +02:00
Lynix f7cd52d947 Small update 2017-04-17 17:39:26 +02:00
Lynix 5702e5202c Components/GraphicsComponent: Add DoesRequireRealTimeReflections method 2017-03-29 18:58:41 +02:00
Lynix 6851428c3c Components/GraphicsComponent: Watch every used material to handle reflective information 2017-03-28 23:36:08 +02:00
Lynix 02508fb99d Sdk/BaseComponent: Add GetEntity method 2017-03-20 07:49:01 +01:00
Lynix 62fd66a159 Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping 2017-03-18 17:23:12 +01:00
Lynix cdf7c11ef8 Fix crash when RigidBody2D is moved while having poststeps 2017-03-09 18:20:18 +01:00
Jérôme Leclercq 4ea43e0b0b Sdk/Entity: Fix problem when moving entities 2017-03-08 17:36:13 +01:00
Jérôme Leclercq 0818a2187b Sdk/Entity: Fix OnDetached being called after OnEntityRemove when destructing 2017-03-08 16:32:08 +01:00
Jérôme Leclercq 9c7b2ed4b8 Sdk/World: Fix entity ids being reused before destruction 2017-03-08 15:52:59 +01:00
Lynix 3fe54ff777 Sdk/Entity: Add OnEntityDestruction callback 2017-03-03 17:52:19 +01:00
Lynix 605e5c2fd0 Sdk/BaseComponent: Add OnEntityDestruction callback
Also fixes physics component callbacks (OnContactEnd by example) being
fired while entity is destroyed
2017-03-03 17:52:07 +01:00
Lynix 55d9a22665 NDK/BaseWidget: Children widgets are now automatically parented to their parent 2017-02-23 00:09:39 +01:00
Lynix 496cdfd32c Merge branch 'master' into reflection-mapping 2017-02-23 00:08:57 +01:00
EloD10 ce6eb1d6d9 Update Console.cpp (#117)
* Update Console.cpp

Deleting a semicolon

* Update ButtonWidget.cpp

Removing empty fuction

* Update ButtonWidget.hpp

Removing unnecessary variable
2017-02-22 17:54:00 +01:00
Gawaboumga c2e4ccaf72 Various little fixes (#118)
* Add missing override qualifier

* Mostly shadowing, virtual destructor and other little things
2017-02-19 23:15:13 +01:00
Lynix ead54e1c30 Merge branch 'master' into reflection-mapping 2017-02-18 15:07:17 +01:00
Jérôme Leclercq 4df5ec776c Sdk/Entity: Fix entity destruction not calling Component::OnDetached 2017-02-08 16:27:55 +01:00
Lynix 7d5d21f025 Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping 2017-01-21 15:56:37 +01:00
Lynix 174feda1e9 Sdk/TextAreaWidget: Make cursor sprite black 2017-01-20 20:03:17 +01:00
Lynix cf286e0413 Sdk/Widgets: Add possibility to set cursor when mouse hover a widget 2017-01-20 20:03:00 +01:00
Lynix bb3f395319 Revert "Spoilers.."
This reverts commit e00d00931c.
2017-01-20 19:40:54 +01:00
DrLynix 18862fd1ba Forgot to save those two files 2017-01-20 13:02:19 +01:00
DrLynix f383eca19a Update copyright year 2017-01-20 12:58:35 +01:00
DrLynix e00d00931c Spoilers.. 2017-01-20 10:07:20 +01:00
Lynix 6ba35700bf Sdk/BaseWidget: Cleanup canvas index 2017-01-19 23:09:23 +01:00
Lynix 439f8d0033 Sdk/Canvas: Little cleanup 2017-01-19 21:44:53 +01:00
Lynix 27b000470d Sdk/Canvas: Fix warning and optimize integer to float conversion 2017-01-18 23:39:22 +01:00
Lynix ec795269ad Sdk/TextAreaWidget: Add signals (allowing for controlling the cursor/keys) 2017-01-18 23:38:29 +01:00
Lynix 5d39d60f94 Sdk/TextAreaWidget: Fix commit fail 2017-01-18 23:36:19 +01:00
Lynix 36bcdcdb8c Sdk/Widgets: Make the canvas aware of itself as a widget 2017-01-18 23:35:43 +01:00
Lynix c1dfc5c4b8 Sdk/Widgets: Properly fixes padding 2017-01-18 23:06:31 +01:00
Lynix 679f599c79 Sdk/Console: Fix crash 2017-01-16 21:25:23 +01:00
Lynix c9458eeb17 Sdk/BaseWidget: Add visibility control 2017-01-15 12:13:29 +01:00
Lynix e1e290808a Sdk/Canvas: Fix crash at Canvas destruction 2017-01-15 12:12:58 +01:00
Lynix 5865679891 Sdk/BaseWidget: Add a way to change background color 2017-01-15 12:11:59 +01:00
Lynix 14e327c603 Sdk/TextAreaWidget: Add SetTextColor 2017-01-15 12:11:15 +01:00
Lynix fd923ed58b Sdk/BaseWidget: Add Destroy method 2017-01-11 19:14:32 +01:00
Lynix 6acf101d77 Sdk/BaseWidget: Fix crash at Canvas destruction 2017-01-11 19:14:21 +01:00
Lynix d57498be10 Sdk/BaseWidget: Widget::Add now returns a pointer (easier to use) 2017-01-11 19:13:40 +01:00
Lynix 4f1438f0f1 SDK/BaseWidget: Add OnParentResized method 2017-01-11 18:27:32 +01:00
Lynix 6b949afb9b Graphics: Add support of skins to InstancedRenderable + big clean up 2017-01-09 01:52:00 +01:00
Lynix d2ee4744a9 Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping 2017-01-06 17:29:54 +01:00
Lynix e36374dfc4 SDK/Lua: Fix EulerAngles constructor 2016-12-19 18:23:24 +01:00
Lynix 37d36a89a6 Graphics: Add basic reflection mapping 2016-12-18 01:18:48 +01:00
Lynix e66e0dfdce SDK/TextAreaWidget: Add multiline option 2016-12-06 16:34:23 +01:00
Lynix 7dc600fb34 SDK/TextAreaWidget: Add ReadOnly option 2016-12-06 16:33:55 +01:00
Lynix c781f7cb45 SDK/TextAreaWidget: Improve glyph selection 2016-12-05 20:39:33 +01:00
Lynix d3e3e9cbe2 SDK/TextAreaWidget: Expose cursor 2016-12-05 20:39:13 +01:00
Lynix 6138c02b9b SDK/TextAreaWidget: Make Write public 2016-12-05 16:48:29 +01:00
Lynix 2960157f8f SDK/TextAreaWidget: Fix insertion with accents 2016-12-05 16:10:48 +01:00
Lynix 60fee4bba6 SDK/TextAreaWidget: Add getters methods 2016-12-05 15:22:01 +01:00
Lynix e3e254532d SDK/TextAreaWidget: Add Clear() method 2016-12-05 15:21:47 +01:00
Lynix d6e02d486b SDK/TextAreaWidget: Fix cursor position after inserting special characters 2016-12-05 15:17:11 +01:00
Jérôme Leclercq 58866fd4ac SDK/LuaBinding: Fix File binding 2016-12-03 11:01:57 +01:00
Lynix 85c5f4b48b SDK/TextAreaWidget: Make character erasing work with cursor
Adds support for delete key
2016-12-03 00:41:27 +01:00
Lynix 6c03803c5e SDK/TextAreaWidget: Add cursor shifting by left and right arrows 2016-12-03 00:40:31 +01:00
Lynix d28dab2e36 SDK/TextAreaWidget: Fix cursor handling 2016-12-03 00:39:19 +01:00
Lynix cfa9b4bf2f SDK/Widgets: Add OnKeyPressed/OnKeyReleased callbacks 2016-12-03 00:35:39 +01:00
Lynix e6e4a437bd Merge remote-tracking branch 'refs/remotes/origin/master' into gui 2016-11-30 13:08:08 +01:00
Lynix 3c5594c206 Merge remote-tracking branch 'refs/remotes/origin/master' into culling 2016-11-28 17:27:12 +01:00