Resolve conflicts with master

This commit is contained in:
numzero
2023-03-25 10:42:11 +03:00
55 changed files with 474 additions and 7166 deletions

View File

@ -235,7 +235,6 @@ namespace irr
/** If this is set to a value other than 0, the Irrlicht Engine
will be created in an already existing window.
For Windows, set this to the HWND of the window you want.
For iOS, assign UIView to this variable.
The windowSize and FullScreen options will be ignored when using
the WindowId parameter. Default this is set to 0.
To make Irrlicht run inside the custom window, you still will