godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2927 from akien-mga/pr-references-okam

Browse Source 
Replace hardcoded references to Okam Studio by Godot Engine
This commit is contained in:
Rémi Verschelde 2015-11-27 23:59:58 +01:00
commit d2f9155995
9 changed files with 63 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
demos/gui/rich_text_bbcode/rich_text_bbcode.scn
View File

Binary file not shown.

2
platform/windows/export/export.cpp
View File

@ -327,7 +327,7 @@ EditorExportPlatformWindows::EditorExportPlatformWindows() {
icon128=true; icon128=true;
icon256=true; icon256=true;
product_name="$genname"; product_name="$genname";
company_name="Okam Studio"; company_name="Godot Engine";
file_description="Created With Godot Engine"; file_description="Created With Godot Engine";
version_text="1.0"; version_text="1.0";
OS::Date date = OS::get_singleton()->get_date(); OS::Date date = OS::get_singleton()->get_date();

2
platform/windows/godot_res.rc
View File

@ -16,7 +16,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Okam Studio" VALUE "CompanyName", "Godot Engine"
VALUE "FileDescription", _MKSTR(VERSION_NAME) " Editor (" _MKSTR(VERSION_STATUS) ")" VALUE "FileDescription", _MKSTR(VERSION_NAME) " Editor (" _MKSTR(VERSION_STATUS) ")"
VALUE "FileVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "."_MKSTR(VERSION_REVISION) VALUE "FileVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "."_MKSTR(VERSION_REVISION)
VALUE "ProductName", _MKSTR(VERSION_NAME) VALUE "ProductName", _MKSTR(VERSION_NAME)

4
tools/Godot.app/Contents/Info.plist
View File

@ -13,7 +13,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Godot.icns</string> <string>Godot.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.okamstudio.godot</string> <string>org.godotengine.godot</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
@ -61,7 +61,7 @@
<true/> <true/>
<key>LSItemContentTypes</key> <key>LSItemContentTypes</key>
<array> <array>
<string>com.okamstudio.scn</string> <string>org.godotengine.scn</string>
</array> </array>
</dict> </dict>
</array> </array>

2
tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj
View File

@ -192,7 +192,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0500; LastUpgradeCheck = 0500;
ORGANIZATIONNAME = Okam; ORGANIZATIONNAME = GodotEngine;
TargetAttributes = { TargetAttributes = {
D0BCFE5F18AEBDA3004A7AAE = { D0BCFE5F18AEBDA3004A7AAE = {
TestTargetID = D0BCFE3318AEBDA2004A7AAE; TestTargetID = D0BCFE3318AEBDA2004A7AAE;

2
tools/ios_xcode_template/godot_ios/godot_ios-Info.plist
View File

@ -9,7 +9,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>godot_opt.iphone</string> <string>godot_opt.iphone</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.okamstudios.${PRODUCT_NAME:rfc1034identifier}</string> <string>org.godotengine.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

35
tools/ios_xcode_template/godot_ios/main.m
View File

@ -1,10 +1,31 @@
// /*************************************************************************/
// main.m /* main.m */
// godot_ios /*************************************************************************/
// /* This file is part of: */
// Created by Ariel m on 2/14/14. /* GODOT ENGINE */
// Copyright (c) 2014 Okam. All rights reserved. /* 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 <UIKit/UIKit.h> #import <UIKit/UIKit.h>

2
tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist
View File

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string> <string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.okamstudios.${PRODUCT_NAME:rfc1034identifier}</string> <string>org.godotengine.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

35
tools/ios_xcode_template/godot_iosTests/godot_iosTests.m
View File

@ -1,10 +1,31 @@
// /*************************************************************************/
// godot_iosTests.m /* godot_iosTests.m */
// godot_iosTests /*************************************************************************/
// /* This file is part of: */
// Created by Ariel m on 2/14/14. /* GODOT ENGINE */
// Copyright (c) 2014 Okam. All rights reserved. /* 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 <XCTest/XCTest.h> #import <XCTest/XCTest.h>