Permalink
Browse files

FontTest uses "bundle" ttfs. working Ok

  • Loading branch information...
1 parent 29a72ee commit 64187c4c99a8e50e1d1a0642fa1eba11ca096ab2 @ricardoquesada ricardoquesada committed Jul 4, 2011
Showing with 65 additions and 3 deletions.
  1. +1 −0 CHANGELOG
  2. +57 −0 Resources/Info-FontTest.plist
  3. +6 −2 cocos2d-ios.xcodeproj/project.pbxproj
  4. +1 −1 tests/FontTest.m
View
@@ -11,6 +11,7 @@ version 2.0-alpha XX-Jul-2011
. [NEW] Macros: ccgl* replaced with ccGL*
. [NEW] Math: Using kazmath for matrix and projection operations, and matrix GL stack
. [NEW] Math: Using NEON Matrix Multiplication from Oolong project
+. [NEW] Test: FontTest uses "bundle" fonts instead of FontLabel
. [NEW] Tiled: cc_vertexz property is no longer supported. Will raise exception if found.
. [NEW] Types: ccColor?B replaced with ccColor?UB
. [FIX] All: Removed deprecated methods and classes that were scheduled for removal post 1.0
@@ -0,0 +1,57 @@
+<?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>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDisplayName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIconFiles</key>
+ <array>
+ <string>Icon.png</string>
+ <string>Icon@2x.png</string>
+ <string>Icon-72.png</string>
+ <string>Icon-Small-50.png</string>
+ <string>Icon-Small.png</string>
+ <string>Icon-Small@2x.png</string>
+ </array>
+ <key>CFBundleIdentifier</key>
+ <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UIPrerenderedIcon</key>
+ <true/>
+ <key>UIRequiredDeviceCapabilities</key>
+ <dict>
+ <key>accelerometer</key>
+ <true/>
+ <key>opengles-2</key>
+ <true/>
+ </dict>
+ <key>UIStatusBarHidden</key>
+ <true/>
+ <key>UIAppFonts</key>
+ <array>
+ <string>A Damn Mess.ttf</string>
+ <string>Abberancy.ttf</string>
+ <string>Abduction.ttf</string>
+ <string>Paint Boy.ttf</string>
+ <string>Schwarzwald Regular.ttf</string>
+ <string>Scissor Cuts.ttf</string>
+ </array>
+</dict>
+</plist>
@@ -1486,6 +1486,7 @@
A015BFF213B826D800C73E76 /* vec4.c in Sources */ = {isa = PBXBuildFile; fileRef = A015BFCC13B826D800C73E76 /* vec4.c */; };
A015BFF313B826D800C73E76 /* vec4.c in Sources */ = {isa = PBXBuildFile; fileRef = A015BFCC13B826D800C73E76 /* vec4.c */; };
A015BFF913B829E100C73E76 /* libkazmath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A04A1FEB13B826B300ABAFB7 /* libkazmath.a */; };
+ A0600BB713C1FBE100BB6F49 /* Info-FontTest.plist in Resources */ = {isa = PBXBuildFile; fileRef = A0600BB613C1FBE100BB6F49 /* Info-FontTest.plist */; };
AAEA834B0FD5704400F08728 /* blocks.png in Resources */ = {isa = PBXBuildFile; fileRef = AAEA834A0FD5704400F08728 /* blocks.png */; };
DA5F0EC50FFE96D400C7C82E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50B2CB240E10EE4A00AE9530 /* Default.png */; };
DA5F0EC60FFE96D400C7C82E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50B2CB250E10EE4A00AE9530 /* Icon.png */; };
@@ -4163,6 +4164,7 @@
A015BFCB13B826D800C73E76 /* vec3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vec3.c; sourceTree = "<group>"; };
A015BFCC13B826D800C73E76 /* vec4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vec4.c; sourceTree = "<group>"; };
A04A1FEB13B826B300ABAFB7 /* libkazmath.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libkazmath.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ A0600BB613C1FBE100BB6F49 /* Info-FontTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-FontTest.plist"; path = "Resources/Info-FontTest.plist"; sourceTree = "<group>"; };
AAEA834A0FD5704400F08728 /* blocks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = blocks.png; sourceTree = "<group>"; };
DA90D87B1059A54D0039F26A /* FontTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontTest.h; path = tests/FontTest.h; sourceTree = "<group>"; };
DA90D87C1059A54D0039F26A /* FontTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FontTest.m; path = tests/FontTest.m; sourceTree = "<group>"; };
@@ -5283,6 +5285,7 @@
8EDF3E8D0F6BD8CD00F54643 /* sfx */,
50B2CB2B0E10EE4A00AE9530 /* Info.plist */,
5050C7560F927156004BE2D8 /* InfoWithStatusBar.plist */,
+ A0600BB613C1FBE100BB6F49 /* Info-FontTest.plist */,
E02BB57D126CA73F006E46A2 /* iTunesArtwork */,
50B2CB250E10EE4A00AE9530 /* Icon.png */,
E02BB57E126CA73F006E46A2 /* Icon@2x.png */,
@@ -9198,6 +9201,7 @@
E0BBADE91282E838007DB81E /* test_image_rgba4444.pvr.ccz in Resources */,
E0BBADEA1282E838007DB81E /* test_image_rgba4444.pvr.gz in Resources */,
E0708A8E1342D16700D32F2C /* Shaders in Resources */,
+ A0600BB713C1FBE100BB6F49 /* Info-FontTest.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -14321,7 +14325,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
- INFOPLIST_FILE = Resources/Info.plist;
+ INFOPLIST_FILE = "Resources/Info-FontTest.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-all_load",
@@ -14342,7 +14346,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
- INFOPLIST_FILE = Resources/Info.plist;
+ INFOPLIST_FILE = "Resources/Info-FontTest.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-all_load",
View
@@ -29,7 +29,7 @@
@"Abberancy",
@"Abduction",
@"Paint Boy",
- @"Schwarzwald Regular",
+ @"Schwarzwald",
@"Scissor Cuts",
};

0 comments on commit 64187c4

Please sign in to comment.