Browse Source

1496440203

capellaresumo 7 years ago
parent
commit
263370f0c2

+ 2 - 2
.gitignore

@@ -19,5 +19,5 @@ tests/*/proj.android-studio/app/proguard-project.txt
 /prebuilt/
 /*/build/
 /proj.android-studio/app/build/
-/cocos2d
-/cocos2d/
+bin/
+.DS_Store

+ 1 - 1
.gitmodules

@@ -1,4 +1,4 @@
 [submodule "cocos2d"]
 	url = https://github.com/cocos2d/cocos2d-x
 	branch = v3
-	path = cocos2d/
+	path = cocos2d

+ 5 - 0
README.md

@@ -1,3 +1,8 @@
 ```
 $ git submodule update --init
+
+git submodule update --init --recursive
+cd scripts
+./build_distribution.py --version 1.x
+
 ```

BIN
bin/Resources/CloseNormal.png


BIN
bin/Resources/CloseSelected.png


BIN
bin/Resources/HelloWorld.png


BIN
bin/Resources/fonts/Marker Felt.ttf


BIN
bin/Resources/fonts/arial.ttf


+ 0 - 0
bin/Resources/res/.gitkeep


BIN
bin/debug/android/RedCore2-debug.apk


+ 0 - 56
bin/debug/mac/RedCore2-desktop.app/Contents/Info.plist

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16E195</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>RedCore2-desktop</string>
-	<key>CFBundleIconFile</key>
-	<string>Icon</string>
-	<key>CFBundleIdentifier</key>
-	<string>ime.capella.jao.redcore</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>RedCore2-desktop</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>8C1002</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>16C58</string>
-	<key>DTSDKName</key>
-	<string>macosx10.12</string>
-	<key>DTXcode</key>
-	<string>0821</string>
-	<key>DTXcodeBuild</key>
-	<string>8C1002</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.games</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2013. All rights reserved.</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

+ 0 - 1
bin/debug/mac/RedCore2-desktop.app/Contents/PkgInfo

@@ -1 +0,0 @@
-APPL????

BIN
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/CloseNormal.png


BIN
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/CloseSelected.png


BIN
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/HelloWorld.png


BIN
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/Icon.icns


BIN
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/fonts/Marker Felt.ttf


BIN
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/fonts/arial.ttf


+ 0 - 0
bin/debug/mac/RedCore2-desktop.app/Contents/Resources/res/.gitkeep


+ 1 - 0
cocos2d

@@ -0,0 +1 @@
+Subproject commit 0a69031db33e1b6efc3f71f522e5af57e569dd79

+ 7 - 0
proj.ios_mac/RedCore2.xcodeproj/project.xcworkspace/xcshareddata/RedCore2.xcscmblueprint

@@ -4,11 +4,13 @@
 
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "852ED3691A47A99B0D19C820A500AE9772B2A44E" : 9223372036854775807,
     "D67E1CCAB151841D043F8ECEF1A3647715B33599" : 9223372036854775807,
     "E0DDA7F6FDF7FD8F1F6D1DAFFDACFCBFBB076231" : 9223372036854775807
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6DAC8330-E09D-4740-9826-D01F52799A97",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "852ED3691A47A99B0D19C820A500AE9772B2A44E" : "RedCore2\/cocos2d\/",
     "D67E1CCAB151841D043F8ECEF1A3647715B33599" : "..\/..",
     "E0DDA7F6FDF7FD8F1F6D1DAFFDACFCBFBB076231" : "RedCore2\/"
   },
@@ -16,6 +18,11 @@
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,
   "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "proj.ios_mac\/RedCore2.xcodeproj",
   "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/cocos2d\/cocos2d-x",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "852ED3691A47A99B0D19C820A500AE9772B2A44E"
+    },
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/git.capella.pro:10022\/capella\/USP-BCC.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

BIN
proj.ios_mac/RedCore2.xcodeproj/project.xcworkspace/xcuserdata/capella.xcuserdatad/UserInterfaceState.xcuserstate