From 55d56d9b7cf240fb426c58a62aad21a6997ee550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 27 Nov 2015 18:47:30 +0100 Subject: [PATCH 1/2] Replace hardcoded references to Okam Studio by Godot Engine Since the engine development is now independent. Fixes #2836. --- .../gui/rich_text_bbcode/rich_text_bbcode.scn | Bin 2373 -> 3288 bytes platform/windows/export/export.cpp | 2 +- platform/windows/godot_res.rc | 2 +- tools/Godot.app/Contents/Info.plist | 4 ++-- .../godot_ios.xcodeproj/project.pbxproj | 2 +- .../godot_ios/godot_ios-Info.plist | 2 +- .../godot_iosTests/godot_iosTests-Info.plist | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demos/gui/rich_text_bbcode/rich_text_bbcode.scn b/demos/gui/rich_text_bbcode/rich_text_bbcode.scn index ca02044bb8d7d73d1eb71ed885ce144acc209e8a..081338fd9167fdfd255de57640a9a3397f4750af 100644 GIT binary patch delta 3105 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 E0Js8*i2wiq diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 29f21bf227..9cfd475091 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -327,7 +327,7 @@ EditorExportPlatformWindows::EditorExportPlatformWindows() { icon128=true; icon256=true; product_name="$genname"; - company_name="Okam Studio"; + company_name="Godot Engine"; file_description="Created With Godot Engine"; version_text="1.0"; OS::Date date = OS::get_singleton()->get_date(); diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index 73f36e5e59..f77182f909 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -16,7 +16,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Okam Studio" + VALUE "CompanyName", "Godot Engine" VALUE "FileDescription", _MKSTR(VERSION_NAME) " Editor (" _MKSTR(VERSION_STATUS) ")" VALUE "FileVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "."_MKSTR(VERSION_REVISION) VALUE "ProductName", _MKSTR(VERSION_NAME) diff --git a/tools/Godot.app/Contents/Info.plist b/tools/Godot.app/Contents/Info.plist index 3a4b51e2fe..8a89993fb9 100755 --- a/tools/Godot.app/Contents/Info.plist +++ b/tools/Godot.app/Contents/Info.plist @@ -13,7 +13,7 @@ CFBundleIconFile Godot.icns CFBundleIdentifier - com.okamstudio.godot + org.godotengine.godot CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -61,7 +61,7 @@ LSItemContentTypes - com.okamstudio.scn + org.godotengine.scn diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj b/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj index 7cd4da0f4a..4ae1ec8a53 100644 --- a/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj +++ b/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj @@ -192,7 +192,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0500; - ORGANIZATIONNAME = Okam; + ORGANIZATIONNAME = GodotEngine; TargetAttributes = { D0BCFE5F18AEBDA3004A7AAE = { TestTargetID = D0BCFE3318AEBDA2004A7AAE; diff --git a/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist b/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist index f34ebb97f0..357970920a 100644 --- a/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist +++ b/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable godot_opt.iphone CFBundleIdentifier - com.okamstudios.${PRODUCT_NAME:rfc1034identifier} + org.godotengine.${PRODUCT_NAME:rfc1034identifier} CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist b/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist index 3b3eec9a51..0f69aa80eb 100644 --- a/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist +++ b/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.okamstudios.${PRODUCT_NAME:rfc1034identifier} + org.godotengine.${PRODUCT_NAME:rfc1034identifier} CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType From 0fd20e1002387967b797c241a0dfbd117603a55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 27 Nov 2015 19:34:55 +0100 Subject: [PATCH 2/2] Update copyright header in ios xcode templates --- tools/ios_xcode_template/godot_ios/main.m | 35 +++++++++++++++---- .../godot_iosTests/godot_iosTests.m | 35 +++++++++++++++---- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/tools/ios_xcode_template/godot_ios/main.m b/tools/ios_xcode_template/godot_ios/main.m index dca55f40ce..6bb6bc2188 100644 --- a/tools/ios_xcode_template/godot_ios/main.m +++ b/tools/ios_xcode_template/godot_ios/main.m @@ -1,10 +1,31 @@ -// -// main.m -// godot_ios -// -// Created by Ariel m on 2/14/14. -// Copyright (c) 2014 Okam. All rights reserved. -// +/*************************************************************************/ +/* main.m */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ +/* */ +/* 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. */ +/*************************************************************************/ #import diff --git a/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m b/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m index fce6288670..75e44659e0 100644 --- a/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m +++ b/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m @@ -1,10 +1,31 @@ -// -// godot_iosTests.m -// godot_iosTests -// -// Created by Ariel m on 2/14/14. -// Copyright (c) 2014 Okam. All rights reserved. -// +/*************************************************************************/ +/* godot_iosTests.m */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ +/* */ +/* 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. */ +/*************************************************************************/ #import