Browse Source

Applying MIT license

Josh Engebretson 9 years ago
parent
commit
d9f59ebc7f

+ 1 - 6
Resources/EditorData/AtomicEditor/editor/ui/about.tb.txt

@@ -4,8 +4,7 @@ TBLayout: axis: y
 		id tabcontainer
 		tabs
 			TBButton: text: "About"
-			TBButton: text: "Editor and Tool License"
-			TBButton: text: "Runtime License"
+			TBButton: text: "Atomic Game Engine License"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "External Tool Licenses"
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: about_text, readonly: 1, adapt-to-content: 0
@@ -16,10 +15,6 @@ TBLayout: axis: y
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			text: "..."
-		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_runtime_license, readonly: 1, adapt-to-content: 0
-			font: size: 12
-			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
-			text: "..."			
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: thirdparty_license, readonly: 1, adapt-to-content: 0
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512

+ 1 - 6
Resources/EditorData/AtomicEditor/editor/ui/eulaagreement.tb.txt

@@ -3,18 +3,13 @@ TBLayout: axis: y
 		gravity all
 		id tabcontainer
 		tabs
-			TBButton: text: "Editor and Tool License"
-			TBButton: text: "Runtime License"
+			TBButton: text: "Atomic Game Engine License"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "External Tool Licenses"
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_license, readonly: 1, adapt-to-content: 0
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			text: "..."
-		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_runtime_license, readonly: 1, adapt-to-content: 0
-			font: size: 12
-			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
-			text: "..."			
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: thirdparty_license, readonly: 1, adapt-to-content: 0
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512

File diff suppressed because it is too large
+ 0 - 73
Resources/EditorData/AtomicEditor/eulas/atomic_game_engine_eula.txt


+ 0 - 21
Resources/EditorData/AtomicEditor/eulas/atomic_runtime_eula.txt

@@ -1,21 +0,0 @@
-<color #D4FB79>Atomic Game Engine™ Runtime End User License Agreement (EULA)</color>
-
-Copyright (c) 2014-2015, THUNDERBEAST GAMES LLC All rights reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

+ 1 - 3
Script/AtomicEditor/ui/frames/menus/MainFrameMenu.ts

@@ -350,7 +350,5 @@ var helpItems = {
     "Atomic Forums": ["help forums"],
     "-2": null,
     "Atomic Game Engine on GitHub": ["help github"],
-    "About Atomic Editor": "about atomic editor",
-    "-3": null,
-    "Manage License": "manage license"
+    "About Atomic Editor": "about atomic editor"
 };

+ 0 - 5
Script/AtomicEditor/ui/modal/About.ts

@@ -36,7 +36,6 @@ class About extends ModalWindow {
         this.load("AtomicEditor/editor/ui/about.tb.txt");
 
         this.age_license = <Atomic.UIEditField>this.getWidget("age_license");
-        this.age_runtimelicense = <Atomic.UIEditField> this.getWidget("age_runtime_license");
         this.thirdparty_license = <Atomic.UIEditField>this.getWidget("thirdparty_license");
         this.externaltool_license = <Atomic.UIEditField>this.getWidget("externaltool_license");
         this.about_text = <Atomic.UIEditField>this.getWidget("about_text");
@@ -46,9 +45,6 @@ class About extends ModalWindow {
         var file = cache.getFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
         this.age_license.text = file.readText();
 
-        file = cache.getFile("AtomicEditor/eulas/atomic_runtime_eula.txt");
-        this.age_runtimelicense.text = file.readText();
-
         file = cache.getFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
         this.thirdparty_license.text = file.readText();
 
@@ -134,7 +130,6 @@ class About extends ModalWindow {
     }
 
     age_license: Atomic.UIEditField;
-    age_runtimelicense: Atomic.UIEditField;
     thirdparty_license: Atomic.UIEditField;
     externaltool_license: Atomic.UIEditField;
     about_text: Atomic.UIEditField;

+ 0 - 5
Script/AtomicEditor/ui/modal/license/EULAWindow.ts

@@ -35,7 +35,6 @@ class EULAWindow extends ModalWindow {
         this.init("License Agreement", "AtomicEditor/editor/ui/eulaagreement.tb.txt");
 
         this.age_license = <Atomic.UIEditField> this.getWidget("age_license");
-        this.age_runtimelicense = <Atomic.UIEditField> this.getWidget("age_runtime_license");
         this.thirdparty_license = <Atomic.UIEditField> this.getWidget("thirdparty_license");
         this.externaltool_license = <Atomic.UIEditField> this.getWidget("externaltool_license");
         this.eulaCheck = <Atomic.UICheckBox> this.getWidget("eula_check");
@@ -48,9 +47,6 @@ class EULAWindow extends ModalWindow {
         var file = cache.getFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
         this.age_license.text = file.readText();
 
-        file = cache.getFile("AtomicEditor/eulas/atomic_runtime_eula.txt");
-        this.age_runtimelicense.text = file.readText();
-
         file = cache.getFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
         this.thirdparty_license.text = file.readText();
 
@@ -90,7 +86,6 @@ class EULAWindow extends ModalWindow {
     }
 
     age_license: Atomic.UIEditField;
-    age_runtimelicense: Atomic.UIEditField;
     thirdparty_license: Atomic.UIEditField;
     externaltool_license: Atomic.UIEditField;
     eulaCheck: Atomic.UICheckBox;

+ 16 - 1
Source/ToolCore/License/LicenseSystem.cpp

@@ -97,6 +97,8 @@ void LicenseSystem::Initialize()
         return;
     }
 
+    // TODO: Cleanup for MIT
+
     if (!LoadLicense() || !key_.Length())
     {
         ResetLicense();
@@ -106,7 +108,7 @@ void LicenseSystem::Initialize()
     }
     else
     {
-        RequestServerVerification(key_);
+        // RequestServerVerification(key_);
     }
 }
 
@@ -154,6 +156,18 @@ void LicenseSystem::ResetLicense()
 bool LicenseSystem::LoadLicense()
 {
 
+    key_ = "ATOMIC-XXXX-XXXX-XXXX-XXXX";
+    licenseWindows_ = true;
+    licenseMac_ = true;
+    licenseAndroid_ = true;
+    licenseIOS_ = true;
+    licenseHTML5_ = true;
+    licenseModule3D_ = true;
+
+    return true;
+
+   // TODO: Cleanup for MIT
+/*
     ResetLicense();
 
     FileSystem* filesystem = GetSubsystem<FileSystem>();
@@ -179,6 +193,7 @@ bool LicenseSystem::LoadLicense()
     licenseModule3D_ = file->ReadBool();
 
     return true;
+*/
 }
 
 bool LicenseSystem::ValidateKey(const String& key)

Some files were not shown because too many files changed in this diff