diff options
author | Starla Insigna <starla4444@gmail.com> | 2011-08-23 09:35:16 -0400 |
---|---|---|
committer | Starla Insigna <starla4444@gmail.com> | 2011-08-23 09:35:16 -0400 |
commit | 887e595136e71f52ea585f17d73e5ac3baefb7eb (patch) | |
tree | cc097b2bb119456878687af6c757ee8bc12e09be | |
parent | 02d9a87417837ffda602b2d06c2c6897d15a1202 (diff) | |
parent | 3caffadb393cada7d9bbc433e0c96e6650ed873a (diff) | |
download | cartcollect-887e595136e71f52ea585f17d73e5ac3baefb7eb.tar.gz cartcollect-887e595136e71f52ea585f17d73e5ac3baefb7eb.tar.bz2 cartcollect-887e595136e71f52ea585f17d73e5ac3baefb7eb.zip |
Pulled in level selection screen (version 0.3) v0.3
Closes #207
-rwxr-xr-x | Cartographic.xcodeproj/project.pbxproj | 118 | ||||
-rwxr-xr-x | Classes/Cart_CollectAppDelegate.m | 4 | ||||
-rwxr-xr-x | Classes/MainMenuLayer.h | 1 | ||||
-rwxr-xr-x | Classes/MainMenuLayer.m | 11 | ||||
-rwxr-xr-x | Resources/Info.plist | 2 | ||||
-rw-r--r-- | Resources/feedback.png | bin | 0 -> 2621 bytes | |||
-rw-r--r-- | Resources/feedback2.png | bin | 0 -> 2924 bytes | |||
-rw-r--r-- | TestFlight.h | 35 | ||||
-rw-r--r-- | libTestFlight.a | bin | 0 -> 2413716 bytes |
9 files changed, 165 insertions, 6 deletions
diff --git a/Cartographic.xcodeproj/project.pbxproj b/Cartographic.xcodeproj/project.pbxproj index 4a478c9..8479e51 100755 --- a/Cartographic.xcodeproj/project.pbxproj +++ b/Cartographic.xcodeproj/project.pbxproj | |||
@@ -105,6 +105,9 @@ | |||
105 | 6C18C3D214033DC50005AA4C /* CocosOverlayScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C18C3CD14033DC10005AA4C /* CocosOverlayScrollView.m */; }; | 105 | 6C18C3D214033DC50005AA4C /* CocosOverlayScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C18C3CD14033DC10005AA4C /* CocosOverlayScrollView.m */; }; |
106 | 6C18C3D314033DC60005AA4C /* NMPanelMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C18C3CF14033DC30005AA4C /* NMPanelMenu.m */; }; | 106 | 6C18C3D314033DC60005AA4C /* NMPanelMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C18C3CF14033DC30005AA4C /* NMPanelMenu.m */; }; |
107 | 6C18C3D414033DC60005AA4C /* TouchDelegatingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C18C3D114033DC40005AA4C /* TouchDelegatingView.m */; }; | 107 | 6C18C3D414033DC60005AA4C /* TouchDelegatingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C18C3D114033DC40005AA4C /* TouchDelegatingView.m */; }; |
108 | 6C19F15B14018EE900F9CCD3 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C19F15A14018EE900F9CCD3 /* libTestFlight.a */; }; | ||
109 | 6C19F1631401917500F9CCD3 /* feedback.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C19F1621401917500F9CCD3 /* feedback.png */; }; | ||
110 | 6C19F1651401917900F9CCD3 /* feedback2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C19F1641401917900F9CCD3 /* feedback2.png */; }; | ||
108 | 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; }; | 111 | 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; }; |
109 | 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; | 112 | 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; |
110 | 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; }; | 113 | 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; }; |
@@ -423,6 +426,10 @@ | |||
423 | 6C18C3CF14033DC30005AA4C /* NMPanelMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NMPanelMenu.m; sourceTree = "<group>"; }; | 426 | 6C18C3CF14033DC30005AA4C /* NMPanelMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NMPanelMenu.m; sourceTree = "<group>"; }; |
424 | 6C18C3D014033DC40005AA4C /* TouchDelegatingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchDelegatingView.h; sourceTree = "<group>"; }; | 427 | 6C18C3D014033DC40005AA4C /* TouchDelegatingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchDelegatingView.h; sourceTree = "<group>"; }; |
425 | 6C18C3D114033DC40005AA4C /* TouchDelegatingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TouchDelegatingView.m; sourceTree = "<group>"; }; | 428 | 6C18C3D114033DC40005AA4C /* TouchDelegatingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TouchDelegatingView.m; sourceTree = "<group>"; }; |
429 | 6C19F15A14018EE900F9CCD3 /* libTestFlight.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTestFlight.a; sourceTree = "<group>"; }; | ||
430 | 6C19F15D14018FDF00F9CCD3 /* TestFlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFlight.h; sourceTree = "<group>"; }; | ||
431 | 6C19F1621401917500F9CCD3 /* feedback.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = feedback.png; sourceTree = "<group>"; }; | ||
432 | 6C19F1641401917900F9CCD3 /* feedback2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = feedback2.png; sourceTree = "<group>"; }; | ||
426 | 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; }; | 433 | 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; }; |
427 | 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; }; | 434 | 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; }; |
428 | 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; }; | 435 | 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; }; |
@@ -647,6 +654,7 @@ | |||
647 | 506EDBA5102F4C9F00A389B3 /* AVFoundation.framework in Frameworks */, | 654 | 506EDBA5102F4C9F00A389B3 /* AVFoundation.framework in Frameworks */, |
648 | 506EE1A91030508200A389B3 /* libcocos2d libraries.a in Frameworks */, | 655 | 506EE1A91030508200A389B3 /* libcocos2d libraries.a in Frameworks */, |
649 | 3F8395D113D746200059AEE8 /* libsqlite3.0.dylib in Frameworks */, | 656 | 3F8395D113D746200059AEE8 /* libsqlite3.0.dylib in Frameworks */, |
657 | 6C19F15B14018EE900F9CCD3 /* libTestFlight.a in Frameworks */, | ||
650 | ); | 658 | ); |
651 | runOnlyForDeploymentPostprocessing = 0; | 659 | runOnlyForDeploymentPostprocessing = 0; |
652 | }; | 660 | }; |
@@ -681,7 +689,7 @@ | |||
681 | children = ( | 689 | children = ( |
682 | 504DFC8A10AF177C006D82FE /* LICENSE.cocos2d */, | 690 | 504DFC8A10AF177C006D82FE /* LICENSE.cocos2d */, |
683 | 504DFC8B10AF177C006D82FE /* LICENSE.cocosdenshion */, | 691 | 504DFC8B10AF177C006D82FE /* LICENSE.cocosdenshion */, |
684 | 506EDAA3102F461B00A389B3 /* cocos2d Sources */, | 692 | 506EDAA3102F461B00A389B3 /* Libraries */, |
685 | 2D500B1D0D5A766B00DBA0E3 /* Classes */, | 693 | 2D500B1D0D5A766B00DBA0E3 /* Classes */, |
686 | 29B97315FDCFA39411CA2CEA /* Other Sources */, | 694 | 29B97315FDCFA39411CA2CEA /* Other Sources */, |
687 | 50F4144210692EE7002A0D5E /* Resources */, | 695 | 50F4144210692EE7002A0D5E /* Resources */, |
@@ -703,6 +711,7 @@ | |||
703 | 29B97323FDCFA39411CA2CEA /* Frameworks */ = { | 711 | 29B97323FDCFA39411CA2CEA /* Frameworks */ = { |
704 | isa = PBXGroup; | 712 | isa = PBXGroup; |
705 | children = ( | 713 | children = ( |
714 | 6C19F15A14018EE900F9CCD3 /* libTestFlight.a */, | ||
706 | 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */, | 715 | 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */, |
707 | DCCBF1B60F6022AE0040855A /* CoreGraphics.framework */, | 716 | DCCBF1B60F6022AE0040855A /* CoreGraphics.framework */, |
708 | DCCBF1B80F6022AE0040855A /* Foundation.framework */, | 717 | DCCBF1B80F6022AE0040855A /* Foundation.framework */, |
@@ -792,6 +801,8 @@ | |||
792 | 3F7D0EC713D8E6B000B6CE14 /* Buttons */ = { | 801 | 3F7D0EC713D8E6B000B6CE14 /* Buttons */ = { |
793 | isa = PBXGroup; | 802 | isa = PBXGroup; |
794 | children = ( | 803 | children = ( |
804 | 6C19F1641401917900F9CCD3 /* feedback2.png */, | ||
805 | 6C19F1621401917500F9CCD3 /* feedback.png */, | ||
795 | 6C39CFE113FC2713002B21AF /* tutorial2.png */, | 806 | 6C39CFE113FC2713002B21AF /* tutorial2.png */, |
796 | 6C39CFDF13FC2708002B21AF /* tutorial.png */, | 807 | 6C39CFDF13FC2708002B21AF /* tutorial.png */, |
797 | 3F7D0F4813D8F17C00B6CE14 /* highscores.png */, | 808 | 3F7D0F4813D8F17C00B6CE14 /* highscores.png */, |
@@ -820,16 +831,17 @@ | |||
820 | path = libs/cocoslive; | 831 | path = libs/cocoslive; |
821 | sourceTree = "<group>"; | 832 | sourceTree = "<group>"; |
822 | }; | 833 | }; |
823 | 506EDAA3102F461B00A389B3 /* cocos2d Sources */ = { | 834 | 506EDAA3102F461B00A389B3 /* Libraries */ = { |
824 | isa = PBXGroup; | 835 | isa = PBXGroup; |
825 | children = ( | 836 | children = ( |
837 | 6C19F15D14018FDF00F9CCD3 /* TestFlight.h */, | ||
826 | E02BBB19126CC2F5006E46A2 /* cocos2d */, | 838 | E02BBB19126CC2F5006E46A2 /* cocos2d */, |
827 | 507ED67411C63903002ED3FC /* CocosDenshion */, | 839 | 507ED67411C63903002ED3FC /* CocosDenshion */, |
828 | 504DFC4110AF1557006D82FE /* cocoslive */, | 840 | 504DFC4110AF1557006D82FE /* cocoslive */, |
829 | 50F41306106926B2002A0D5E /* FontLabel */, | 841 | 50F41306106926B2002A0D5E /* FontLabel */, |
830 | E0ECA41F134E5F2B00E7A048 /* TouchJSON */, | 842 | E0ECA41F134E5F2B00E7A048 /* TouchJSON */, |
831 | ); | 843 | ); |
832 | name = "cocos2d Sources"; | 844 | name = Libraries; |
833 | sourceTree = "<group>"; | 845 | sourceTree = "<group>"; |
834 | }; | 846 | }; |
835 | 507ED67411C63903002ED3FC /* CocosDenshion */ = { | 847 | 507ED67411C63903002ED3FC /* CocosDenshion */ = { |
@@ -1423,6 +1435,8 @@ | |||
1423 | 6C39CFF513FD5526002B21AF /* paintdaubs.png in Resources */, | 1435 | 6C39CFF513FD5526002B21AF /* paintdaubs.png in Resources */, |
1424 | 6C39D00813FD9037002B21AF /* florence.png in Resources */, | 1436 | 6C39D00813FD9037002B21AF /* florence.png in Resources */, |
1425 | 6C39D01213FD9945002B21AF /* paris.png in Resources */, | 1437 | 6C39D01213FD9945002B21AF /* paris.png in Resources */, |
1438 | 6C19F1631401917500F9CCD3 /* feedback.png in Resources */, | ||
1439 | 6C19F1651401917900F9CCD3 /* feedback2.png in Resources */, | ||
1426 | ); | 1440 | ); |
1427 | runOnlyForDeploymentPostprocessing = 0; | 1441 | runOnlyForDeploymentPostprocessing = 0; |
1428 | }; | 1442 | }; |
@@ -1611,6 +1625,10 @@ | |||
1611 | INFOPLIST_FILE = Resources/Info.plist; | 1625 | INFOPLIST_FILE = Resources/Info.plist; |
1612 | INFOPLIST_PREFIX_HEADER = Versioning.h; | 1626 | INFOPLIST_PREFIX_HEADER = Versioning.h; |
1613 | INFOPLIST_PREPROCESS = YES; | 1627 | INFOPLIST_PREPROCESS = YES; |
1628 | LIBRARY_SEARCH_PATHS = ( | ||
1629 | "$(inherited)", | ||
1630 | "\"$(SRCROOT)\"", | ||
1631 | ); | ||
1614 | OTHER_LDFLAGS = ( | 1632 | OTHER_LDFLAGS = ( |
1615 | "-all_load", | 1633 | "-all_load", |
1616 | "-ObjC", | 1634 | "-ObjC", |
@@ -1638,6 +1656,10 @@ | |||
1638 | INFOPLIST_FILE = Resources/Info.plist; | 1656 | INFOPLIST_FILE = Resources/Info.plist; |
1639 | INFOPLIST_PREFIX_HEADER = Versioning.h; | 1657 | INFOPLIST_PREFIX_HEADER = Versioning.h; |
1640 | INFOPLIST_PREPROCESS = YES; | 1658 | INFOPLIST_PREPROCESS = YES; |
1659 | LIBRARY_SEARCH_PATHS = ( | ||
1660 | "$(inherited)", | ||
1661 | "\"$(SRCROOT)\"", | ||
1662 | ); | ||
1641 | OTHER_LDFLAGS = ( | 1663 | OTHER_LDFLAGS = ( |
1642 | "-all_load", | 1664 | "-all_load", |
1643 | "-ObjC", | 1665 | "-ObjC", |
@@ -1685,6 +1707,92 @@ | |||
1685 | }; | 1707 | }; |
1686 | name = Release; | 1708 | name = Release; |
1687 | }; | 1709 | }; |
1710 | 6C19F16C1401944500F9CCD3 /* Ad-Hoc */ = { | ||
1711 | isa = XCBuildConfiguration; | ||
1712 | buildSettings = { | ||
1713 | ALWAYS_SEARCH_USER_PATHS = NO; | ||
1714 | ARCHS = "$(ARCHS_STANDARD_32_BIT)"; | ||
1715 | "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | ||
1716 | COPY_PHASE_STRIP = NO; | ||
1717 | GCC_C_LANGUAGE_STANDARD = c99; | ||
1718 | GCC_PREPROCESSOR_DEFINITIONS = ( | ||
1719 | NS_BLOCK_ASSERTIONS, | ||
1720 | NDEBUG, | ||
1721 | ); | ||
1722 | "GCC_THUMB_SUPPORT[arch=armv6]" = NO; | ||
1723 | "GCC_THUMB_SUPPORT[arch=armv7]" = YES; | ||
1724 | GCC_UNROLL_LOOPS = YES; | ||
1725 | GCC_VERSION = com.apple.compilers.llvmgcc42; | ||
1726 | GCC_WARN_ABOUT_RETURN_TYPE = YES; | ||
1727 | GCC_WARN_UNUSED_VARIABLE = YES; | ||
1728 | IPHONEOS_DEPLOYMENT_TARGET = 3.0; | ||
1729 | SDKROOT = iphoneos; | ||
1730 | STRIP_INSTALLED_PRODUCT = NO; | ||
1731 | TARGETED_DEVICE_FAMILY = "1,2"; | ||
1732 | }; | ||
1733 | name = "Ad-Hoc"; | ||
1734 | }; | ||
1735 | 6C19F16D1401944500F9CCD3 /* Ad-Hoc */ = { | ||
1736 | isa = XCBuildConfiguration; | ||
1737 | buildSettings = { | ||
1738 | ALTERNATE_MODE = Entitlements.plist; | ||
1739 | ALWAYS_SEARCH_USER_PATHS = YES; | ||
1740 | CODE_SIGN_IDENTITY = ""; | ||
1741 | "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | ||
1742 | COPY_PHASE_STRIP = NO; | ||
1743 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||
1744 | GCC_PRECOMPILE_PREFIX_HEADER = YES; | ||
1745 | GCC_PREFIX_HEADER = Cart_Collect_Prefix.pch; | ||
1746 | GCC_PREPROCESSOR_DEFINITIONS = ( | ||
1747 | ADHOC, | ||
1748 | NS_BLOCK_ASSERTIONS, | ||
1749 | NDEBUG, | ||
1750 | ); | ||
1751 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | ||
1752 | HEADER_SEARCH_PATHS = libs; | ||
1753 | INFOPLIST_FILE = Resources/Info.plist; | ||
1754 | INFOPLIST_PREFIX_HEADER = Versioning.h; | ||
1755 | INFOPLIST_PREPROCESS = YES; | ||
1756 | LIBRARY_SEARCH_PATHS = ( | ||
1757 | "$(inherited)", | ||
1758 | "\"$(SRCROOT)\"", | ||
1759 | ); | ||
1760 | OTHER_LDFLAGS = ( | ||
1761 | "-all_load", | ||
1762 | "-ObjC", | ||
1763 | ); | ||
1764 | PRODUCT_NAME = Cartographic; | ||
1765 | TARGETED_DEVICE_FAMILY = 1; | ||
1766 | WARNING_CFLAGS = "-Wall"; | ||
1767 | }; | ||
1768 | name = "Ad-Hoc"; | ||
1769 | }; | ||
1770 | 6C19F16E1401944500F9CCD3 /* Ad-Hoc */ = { | ||
1771 | isa = XCBuildConfiguration; | ||
1772 | buildSettings = { | ||
1773 | ALWAYS_SEARCH_USER_PATHS = YES; | ||
1774 | "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | ||
1775 | COPY_PHASE_STRIP = YES; | ||
1776 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||
1777 | GCC_PREPROCESSOR_DEFINITIONS = ""; | ||
1778 | GCC_TREAT_WARNINGS_AS_ERRORS = NO; | ||
1779 | HEADER_SEARCH_PATHS = ( | ||
1780 | libs/Chipmunk/include/chipmunk, | ||
1781 | libs, | ||
1782 | ); | ||
1783 | PRODUCT_NAME = "cocos2d libraries"; | ||
1784 | SKIP_INSTALL = YES; | ||
1785 | ZERO_LINK = NO; | ||
1786 | }; | ||
1787 | name = "Ad-Hoc"; | ||
1788 | }; | ||
1789 | 6C19F16F1401944500F9CCD3 /* Ad-Hoc */ = { | ||
1790 | isa = XCBuildConfiguration; | ||
1791 | buildSettings = { | ||
1792 | PRODUCT_NAME = "$(TARGET_NAME)"; | ||
1793 | }; | ||
1794 | name = "Ad-Hoc"; | ||
1795 | }; | ||
1688 | 6C263DDD13F6F4A000116746 /* Debug */ = { | 1796 | 6C263DDD13F6F4A000116746 /* Debug */ = { |
1689 | isa = XCBuildConfiguration; | 1797 | isa = XCBuildConfiguration; |
1690 | buildSettings = { | 1798 | buildSettings = { |
@@ -1756,6 +1864,7 @@ | |||
1756 | buildConfigurations = ( | 1864 | buildConfigurations = ( |
1757 | 1D6058940D05DD3E006BFB54 /* Debug */, | 1865 | 1D6058940D05DD3E006BFB54 /* Debug */, |
1758 | 1D6058950D05DD3E006BFB54 /* Release */, | 1866 | 1D6058950D05DD3E006BFB54 /* Release */, |
1867 | 6C19F16D1401944500F9CCD3 /* Ad-Hoc */, | ||
1759 | ); | 1868 | ); |
1760 | defaultConfigurationIsVisible = 0; | 1869 | defaultConfigurationIsVisible = 0; |
1761 | defaultConfigurationName = Release; | 1870 | defaultConfigurationName = Release; |
@@ -1765,6 +1874,7 @@ | |||
1765 | buildConfigurations = ( | 1874 | buildConfigurations = ( |
1766 | 506EE05F10304ED500A389B3 /* Debug */, | 1875 | 506EE05F10304ED500A389B3 /* Debug */, |
1767 | 506EE06010304ED500A389B3 /* Release */, | 1876 | 506EE06010304ED500A389B3 /* Release */, |
1877 | 6C19F16E1401944500F9CCD3 /* Ad-Hoc */, | ||
1768 | ); | 1878 | ); |
1769 | defaultConfigurationIsVisible = 0; | 1879 | defaultConfigurationIsVisible = 0; |
1770 | defaultConfigurationName = Release; | 1880 | defaultConfigurationName = Release; |
@@ -1774,6 +1884,7 @@ | |||
1774 | buildConfigurations = ( | 1884 | buildConfigurations = ( |
1775 | 6C263DDD13F6F4A000116746 /* Debug */, | 1885 | 6C263DDD13F6F4A000116746 /* Debug */, |
1776 | 6C263DDE13F6F4A000116746 /* Release */, | 1886 | 6C263DDE13F6F4A000116746 /* Release */, |
1887 | 6C19F16F1401944500F9CCD3 /* Ad-Hoc */, | ||
1777 | ); | 1888 | ); |
1778 | defaultConfigurationIsVisible = 0; | 1889 | defaultConfigurationIsVisible = 0; |
1779 | defaultConfigurationName = Release; | 1890 | defaultConfigurationName = Release; |
@@ -1783,6 +1894,7 @@ | |||
1783 | buildConfigurations = ( | 1894 | buildConfigurations = ( |
1784 | C01FCF4F08A954540054247B /* Debug */, | 1895 | C01FCF4F08A954540054247B /* Debug */, |
1785 | C01FCF5008A954540054247B /* Release */, | 1896 | C01FCF5008A954540054247B /* Release */, |
1897 | 6C19F16C1401944500F9CCD3 /* Ad-Hoc */, | ||
1786 | ); | 1898 | ); |
1787 | defaultConfigurationIsVisible = 0; | 1899 | defaultConfigurationIsVisible = 0; |
1788 | defaultConfigurationName = Release; | 1900 | defaultConfigurationName = Release; |
diff --git a/Classes/Cart_CollectAppDelegate.m b/Classes/Cart_CollectAppDelegate.m index 158f660..0af3ac0 100755 --- a/Classes/Cart_CollectAppDelegate.m +++ b/Classes/Cart_CollectAppDelegate.m | |||
@@ -13,6 +13,7 @@ | |||
13 | #import "GameMode.h" | 13 | #import "GameMode.h" |
14 | #import "RootViewController.h" | 14 | #import "RootViewController.h" |
15 | #import "MainMenuLayer.h" | 15 | #import "MainMenuLayer.h" |
16 | #import "TestFlight.h" | ||
16 | 17 | ||
17 | @implementation Cart_CollectAppDelegate | 18 | @implementation Cart_CollectAppDelegate |
18 | 19 | ||
@@ -42,6 +43,9 @@ | |||
42 | 43 | ||
43 | - (void) applicationDidFinishLaunching:(UIApplication*)application | 44 | - (void) applicationDidFinishLaunching:(UIApplication*)application |
44 | { | 45 | { |
46 | // REMOVE THIS LINE FOR RELEASE BUILDS | ||
47 | [TestFlight takeOff:@"66a3925c85c93e7628c14d167ff6c1b7_MjM4MTEyMDExLTA4LTE3IDEzOjEyOjQ4Ljg2NDE2OQ"]; | ||
48 | |||
45 | [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; | 49 | [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; |
46 | 50 | ||
47 | NSMutableDictionary* registerDefaults = [NSMutableDictionary dictionaryWithObjectsAndKeys: | 51 | NSMutableDictionary* registerDefaults = [NSMutableDictionary dictionaryWithObjectsAndKeys: |
diff --git a/Classes/MainMenuLayer.h b/Classes/MainMenuLayer.h index d8483b3..439056c 100755 --- a/Classes/MainMenuLayer.h +++ b/Classes/MainMenuLayer.h | |||
@@ -17,5 +17,6 @@ | |||
17 | - (id)init; | 17 | - (id)init; |
18 | - (void)newgame; | 18 | - (void)newgame; |
19 | - (void)highscores; | 19 | - (void)highscores; |
20 | - (void)feedback; | ||
20 | 21 | ||
21 | @end | 22 | @end |
diff --git a/Classes/MainMenuLayer.m b/Classes/MainMenuLayer.m index 06a528c..d4a6331 100755 --- a/Classes/MainMenuLayer.m +++ b/Classes/MainMenuLayer.m | |||
@@ -10,6 +10,7 @@ | |||
10 | #import "HighscoreListController.h" | 10 | #import "HighscoreListController.h" |
11 | #import "GameModeSelectionLayer.h" | 11 | #import "GameModeSelectionLayer.h" |
12 | #import "Cart_CollectAppDelegate.h" | 12 | #import "Cart_CollectAppDelegate.h" |
13 | #import "TestFlight.h" | ||
13 | 14 | ||
14 | @implementation MainMenuLayer | 15 | @implementation MainMenuLayer |
15 | 16 | ||
@@ -45,8 +46,9 @@ | |||
45 | 46 | ||
46 | CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)]; | 47 | CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)]; |
47 | CCMenuItemImage* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)]; | 48 | CCMenuItemImage* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)]; |
48 | 49 | CCMenuItemImage* feedbackMenuItem = [CCMenuItemImage itemFromNormalImage:@"feedback.png" selectedImage:@"feedback2.png" target:self selector:@selector(feedback)]; | |
49 | CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, highscoresMenuItem, nil]; | 50 | |
51 | CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, highscoresMenuItem, feedbackMenuItem, nil]; | ||
50 | [menu alignItemsVertically]; | 52 | [menu alignItemsVertically]; |
51 | menu.position = ccp(240, 100); | 53 | menu.position = ccp(240, 100); |
52 | [self addChild:menu]; | 54 | [self addChild:menu]; |
@@ -68,4 +70,9 @@ | |||
68 | [listController release]; | 70 | [listController release]; |
69 | } | 71 | } |
70 | 72 | ||
73 | - (void)feedback | ||
74 | { | ||
75 | [TestFlight openFeedbackView]; | ||
76 | } | ||
77 | |||
71 | @end | 78 | @end |
diff --git a/Resources/Info.plist b/Resources/Info.plist index 9f3118a..92dca77 100755 --- a/Resources/Info.plist +++ b/Resources/Info.plist | |||
@@ -27,7 +27,7 @@ | |||
27 | <key>CFBundlePackageType</key> | 27 | <key>CFBundlePackageType</key> |
28 | <string>APPL</string> | 28 | <string>APPL</string> |
29 | <key>CFBundleShortVersionString</key> | 29 | <key>CFBundleShortVersionString</key> |
30 | <string>0.2.1</string> | 30 | <string>0.3</string> |
31 | <key>CFBundleSignature</key> | 31 | <key>CFBundleSignature</key> |
32 | <string>????</string> | 32 | <string>????</string> |
33 | <key>CFBundleURLTypes</key> | 33 | <key>CFBundleURLTypes</key> |
diff --git a/Resources/feedback.png b/Resources/feedback.png new file mode 100644 index 0000000..83af574 --- /dev/null +++ b/Resources/feedback.png | |||
Binary files differ | |||
diff --git a/Resources/feedback2.png b/Resources/feedback2.png new file mode 100644 index 0000000..5954cab --- /dev/null +++ b/Resources/feedback2.png | |||
Binary files differ | |||
diff --git a/TestFlight.h b/TestFlight.h new file mode 100644 index 0000000..cd98c52 --- /dev/null +++ b/TestFlight.h | |||
@@ -0,0 +1,35 @@ | |||
1 | // | ||
2 | // TestFlight.h | ||
3 | // libTestFlight | ||
4 | // | ||
5 | // Created by Colin Humber on 8/25/10. | ||
6 | // Copyright 2010 23 Divide Apps. All rights reserved. | ||
7 | |||
8 | #import <Foundation/Foundation.h> | ||
9 | |||
10 | @interface TestFlight : NSObject { | ||
11 | |||
12 | } | ||
13 | |||
14 | /** | ||
15 | Add custom environment information | ||
16 | If you want to track a user name from your application you can add it here | ||
17 | */ | ||
18 | + (void)addCustomEnvironmentInformation:(NSString *)information forKey:(NSString*)key; | ||
19 | |||
20 | /** | ||
21 | Starts a TestFlight session | ||
22 | */ | ||
23 | + (void)takeOff:(NSString *)teamToken; | ||
24 | |||
25 | /** | ||
26 | Track when a user has passed a checkpoint after the flight has taken off. Eg. passed level 1, posted high score | ||
27 | */ | ||
28 | + (void)passCheckpoint:(NSString *)checkpointName; | ||
29 | |||
30 | /** | ||
31 | Opens a feeback window that is not attached to a checkpoint | ||
32 | */ | ||
33 | + (void)openFeedbackView; | ||
34 | |||
35 | @end | ||
diff --git a/libTestFlight.a b/libTestFlight.a new file mode 100644 index 0000000..aacc245 --- /dev/null +++ b/libTestFlight.a | |||
Binary files differ | |||