Merge branch 'uiZ-3.0-dev'

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+# Contributing
+
+Hi there! Thank you for being interested in uiZ. As you may know, this asset is distributed in multiple ways:
+
+* Once under the GPL for free, open source or personal use.
+* Once under a proprietay example for open source.
+
+This means there have to be some rules and GPL exceptions for contributing. Therefore, I (TtheCreator) as manager and creator of this project retain the possiblity to sell seperate copies of this program for personal use. You do not.
+
+If you have contributed a considerable amount, and would like to use this in your game then I may grant you a commercial use license if you ask nicely enough. (Though this is not a right of yours)
+
+If you do not agree to the license, you cannot merge to this repository.
+
+## License.
+
+As a special exception to the GPL (GNU GENERAL PUBLIC LICENSE Version 3), Thomas Saedt (also known as the online user name "TtheCreator"), the original author of Software Product "uiZ", a ui framework for GameMaker is granted permanent and irrevocable permission to use this code for any purpose, and to modify, distribute and sublicense it under any terms of his/her choosing. For clarification: This includes code or other data or information that you, the contributor, have written, submitted, merged or were in any other manner involved with to this repository.

CONTRIBUTORS LICENSE AGREEMENT

@@ -1 +1 @@
-As a special exception to the GPL (GNU GENERAL PUBLIC LICENSE Version 3), Thomas Saedt (also known as the online user name "TtheCreator"), the original author of Software Product "uiZ", a ui framework for GameMaker is granted permanent and irrevocable permission to use this code for any purpose, and to modify, distribute and sublicense it under any terms of his/her choosing. For clarification: This includes code that you, the contributor, have written, submitted or merged to this repository.
+As a special exception to the GPL (GNU GENERAL PUBLIC LICENSE Version 3), Thomas Saedt (also known as the online user name "TtheCreator"), the original author of Software Product "uiZ", a ui framework for GameMaker is granted permanent and irrevocable permission to use this code for any purpose, and to modify, distribute and sublicense it under any terms of his/her choosing. For clarification: This includes code or other data or information that you, the contributor, have written, submitted, merged or were in any other manner involved with to this repository.

README.md

@@ -0,0 +1,21 @@
+# uiZ
+Fully Fledged Game Maker GUI Framework
+
+Welcome to the uiZ wiki page!
+
+uiZ is GameMaker: Studio's most complete ui framework there is. 
+It has:
+* A parent-child hierarchy system
+* An advanced positioning and sizing system
+* Structures like framesets and grids
+* Windows support (not the OS, but the concept of a draggable window)
+* Many UI widgets
+* Much more
+
+To get started, look around in the wiki, or watch the video tutorials: https://www.youtube.com/playlist?list=PLsLUTEpFp6ryglXhtJQeXBkEEMR7yjL57
+
+## Licensing
+
+This framework is dual-licensed. Once under the GPL for free, non-commercial use, and once under a proprietary license for commercial use.
+This means that you may not sell copies of your game if licensed under GPL for free. Any time you distribute your game without commercial license, you also have to publish your code under the GPL.  
+To use this asset for commercial uses, purchase a copy on the marketplace: https://marketplace.yoyogames.com/assets/4821/uiz-ultimate-gui-framework

uiZ.gmx/Configs/Default.config.gmx

@@ -246,11 +246,11 @@
     <option_html5_google_analytics_enable>0</option_html5_google_analytics_enable>
     <option_html5_google_tracking_id></option_html5_google_tracking_id>
     <option_html5_icon>Configs\Default\html5\fav.ico</option_html5_icon>
-    <option_html5_index>-1</option_html5_index>
+    <option_html5_index>0</option_html5_index>
     <option_html5_interpolate>-1</option_html5_interpolate>
     <option_html5_jsprepend></option_html5_jsprepend>
     <option_html5_loadingbar>-1</option_html5_loadingbar>
-    <option_html5_localrunalert>True</option_html5_localrunalert>
+    <option_html5_localrunalert>False</option_html5_localrunalert>
     <option_html5_outputdebugtoconsole>True</option_html5_outputdebugtoconsole>
     <option_html5_outputname>index.html</option_html5_outputname>
     <option_html5_scale>-1</option_html5_scale>
@@ -259,7 +259,7 @@
     <option_html5_texture_page>2048</option_html5_texture_page>
     <option_html5_use_test_ads>0</option_html5_use_test_ads>
     <option_html5_usebuiltinparticles>True</option_html5_usebuiltinparticles>
-    <option_html5_usesplash>False</option_html5_usesplash>
+    <option_html5_usesplash>True</option_html5_usesplash>
     <option_icon>nil</option_icon>
     <option_in_app_purchase_sandbox_mode>0</option_in_app_purchase_sandbox_mode>
     <option_information></option_information>
@@ -499,7 +499,7 @@
     <option_tvos_splash_time>0</option_tvos_splash_time>
     <option_tvos_texture_page>2048</option_tvos_texture_page>
     <option_use_fast_collision>False</option_use_fast_collision>
-    <option_use_new_audio>True</option_use_new_audio>
+    <option_use_new_audio>False</option_use_new_audio>
     <option_variableerrors>False</option_variableerrors>
     <option_version>100</option_version>
     <option_version_build>0</option_version_build>