Skip to content
Snippets Groups Projects
Commit 962e8a75 authored by lukasWoyke's avatar lukasWoyke
Browse files

Merge remote-tracking branch 'origin/master' into 65-bug-fix-tries-lukas

parents 7113690d 2ec58114
No related branches found
No related tags found
3 merge requests!60Code cleanup lukas fix,!55Code cleanup lukas,!53Resolve "bugs"
Showing
with 6 additions and 137 deletions
No preview for this file type
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
6630961225D4641200F9B2BA /* Readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 6630961125D4641200F9B2BA /* Readme.md */; };
66383769259F8C340033D344 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66383768259F8C340033D344 /* AppDelegate.swift */; }; 66383769259F8C340033D344 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66383768259F8C340033D344 /* AppDelegate.swift */; };
6638376B259F8C340033D344 /* GameScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = 6638376A259F8C340033D344 /* GameScene.sks */; }; 6638376B259F8C340033D344 /* GameScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = 6638376A259F8C340033D344 /* GameScene.sks */; };
6638376D259F8C340033D344 /* Actions.sks in Resources */ = {isa = PBXBuildFile; fileRef = 6638376C259F8C340033D344 /* Actions.sks */; }; 6638376D259F8C340033D344 /* Actions.sks in Resources */ = {isa = PBXBuildFile; fileRef = 6638376C259F8C340033D344 /* Actions.sks */; };
...@@ -17,13 +18,9 @@ ...@@ -17,13 +18,9 @@
66383781259F8C360033D344 /* Better_TogetherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66383780259F8C360033D344 /* Better_TogetherTests.swift */; }; 66383781259F8C360033D344 /* Better_TogetherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66383780259F8C360033D344 /* Better_TogetherTests.swift */; };
6638378C259F8C360033D344 /* Better_TogetherUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6638378B259F8C360033D344 /* Better_TogetherUITests.swift */; }; 6638378C259F8C360033D344 /* Better_TogetherUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6638378B259F8C360033D344 /* Better_TogetherUITests.swift */; };
667FBD3625A26FE400569A6D /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = 667FBD3525A26FE400569A6D /* Character.swift */; }; 667FBD3625A26FE400569A6D /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = 667FBD3525A26FE400569A6D /* Character.swift */; };
667FBD3B25A274D400569A6D /* TestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 667FBD3A25A274D400569A6D /* TestController.swift */; };
66ABCA6125C03C6F00698587 /* Readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 66ABCA6025C03C6F00698587 /* Readme.md */; };
66C7AF5325A6D57200F5A304 /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66C7AF5225A6D57100F5A304 /* Timer.swift */; }; 66C7AF5325A6D57200F5A304 /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66C7AF5225A6D57100F5A304 /* Timer.swift */; };
8078002B25D01CF8005C2DAC /* BTLobbyMusic.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8078002A25D01CF8005C2DAC /* BTLobbyMusic.mp3 */; }; 8078002B25D01CF8005C2DAC /* BTLobbyMusic.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8078002A25D01CF8005C2DAC /* BTLobbyMusic.mp3 */; };
8084DEE625C040350053D095 /* HapticResponseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEE525C040350053D095 /* HapticResponseController.swift */; }; 8084DEE625C040350053D095 /* HapticResponseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEE525C040350053D095 /* HapticResponseController.swift */; };
8084DEEB25C043E00053D095 /* FeedbackController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEEA25C043E00053D095 /* FeedbackController.swift */; };
8084DEF025C044050053D095 /* SoundFeedbackConrtoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEEF25C044050053D095 /* SoundFeedbackConrtoller.swift */; };
808F8C9625ACFFE500C7FFFE /* LevelSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */; }; 808F8C9625ACFFE500C7FFFE /* LevelSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */; };
808F8CB425AD08AD00C7FFFE /* PlayMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 808F8CB325AD08AD00C7FFFE /* PlayMode.swift */; }; 808F8CB425AD08AD00C7FFFE /* PlayMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 808F8CB325AD08AD00C7FFFE /* PlayMode.swift */; };
80BA662725D1C277003AA747 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 80BA662625D1C277003AA747 /* LaunchScreen.storyboard */; }; 80BA662725D1C277003AA747 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 80BA662625D1C277003AA747 /* LaunchScreen.storyboard */; };
...@@ -46,7 +43,6 @@ ...@@ -46,7 +43,6 @@
F233607825BE8E0700452818 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F233607725BE8E0700452818 /* CodableHelper.swift */; }; F233607825BE8E0700452818 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F233607725BE8E0700452818 /* CodableHelper.swift */; };
F2AB5B8825CD382300F8BA8E /* LevelCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2AB5B8725CD382300F8BA8E /* LevelCollectionViewCell.swift */; }; F2AB5B8825CD382300F8BA8E /* LevelCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2AB5B8725CD382300F8BA8E /* LevelCollectionViewCell.swift */; };
F2AB5B9025CD7D1600F8BA8E /* Spinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2AB5B8F25CD7D1600F8BA8E /* Spinner.swift */; }; F2AB5B9025CD7D1600F8BA8E /* Spinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2AB5B8F25CD7D1600F8BA8E /* Spinner.swift */; };
F2DFAFB625A1114B00F982BA /* JoyStick.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2DFAFB525A1114B00F982BA /* JoyStick.swift */; };
F2DFAFBB25A1304D00F982BA /* TutorialScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2DFAFBA25A1304D00F982BA /* TutorialScene.swift */; }; F2DFAFBB25A1304D00F982BA /* TutorialScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2DFAFBA25A1304D00F982BA /* TutorialScene.swift */; };
F2DFB01D25A5C03400F982BA /* Obstacle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2DFB01C25A5C03400F982BA /* Obstacle.swift */; }; F2DFB01D25A5C03400F982BA /* Obstacle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2DFB01C25A5C03400F982BA /* Obstacle.swift */; };
F2FD144125A07C7C00A0181C /* RoundedRectangleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2FD144025A07C7C00A0181C /* RoundedRectangleButton.swift */; }; F2FD144125A07C7C00A0181C /* RoundedRectangleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2FD144025A07C7C00A0181C /* RoundedRectangleButton.swift */; };
...@@ -73,6 +69,7 @@ ...@@ -73,6 +69,7 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
6630961125D4641200F9B2BA /* Readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Readme.md; sourceTree = "<group>"; };
66383765259F8C340033D344 /* Better Together.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Better Together.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 66383765259F8C340033D344 /* Better Together.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Better Together.app"; sourceTree = BUILT_PRODUCTS_DIR; };
66383768259F8C340033D344 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 66383768259F8C340033D344 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
6638376A259F8C340033D344 /* GameScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = GameScene.sks; sourceTree = "<group>"; }; 6638376A259F8C340033D344 /* GameScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = GameScene.sks; sourceTree = "<group>"; };
...@@ -89,13 +86,9 @@ ...@@ -89,13 +86,9 @@
6638378B259F8C360033D344 /* Better_TogetherUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Better_TogetherUITests.swift; sourceTree = "<group>"; }; 6638378B259F8C360033D344 /* Better_TogetherUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Better_TogetherUITests.swift; sourceTree = "<group>"; };
6638378D259F8C360033D344 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 6638378D259F8C360033D344 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
667FBD3525A26FE400569A6D /* Character.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Character.swift; sourceTree = "<group>"; }; 667FBD3525A26FE400569A6D /* Character.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Character.swift; sourceTree = "<group>"; };
667FBD3A25A274D400569A6D /* TestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestController.swift; sourceTree = "<group>"; };
66ABCA6025C03C6F00698587 /* Readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Readme.md; sourceTree = "<group>"; };
66C7AF5225A6D57100F5A304 /* Timer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = "<group>"; }; 66C7AF5225A6D57100F5A304 /* Timer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = "<group>"; };
8078002A25D01CF8005C2DAC /* BTLobbyMusic.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = BTLobbyMusic.mp3; sourceTree = "<group>"; }; 8078002A25D01CF8005C2DAC /* BTLobbyMusic.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = BTLobbyMusic.mp3; sourceTree = "<group>"; };
8084DEE525C040350053D095 /* HapticResponseController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticResponseController.swift; sourceTree = "<group>"; }; 8084DEE525C040350053D095 /* HapticResponseController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticResponseController.swift; sourceTree = "<group>"; };
8084DEEA25C043E00053D095 /* FeedbackController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackController.swift; sourceTree = "<group>"; };
8084DEEF25C044050053D095 /* SoundFeedbackConrtoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundFeedbackConrtoller.swift; sourceTree = "<group>"; };
808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LevelSelectionViewController.swift; sourceTree = "<group>"; }; 808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LevelSelectionViewController.swift; sourceTree = "<group>"; };
808F8CB325AD08AD00C7FFFE /* PlayMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayMode.swift; sourceTree = "<group>"; }; 808F8CB325AD08AD00C7FFFE /* PlayMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayMode.swift; sourceTree = "<group>"; };
80BA662625D1C277003AA747 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; }; 80BA662625D1C277003AA747 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
...@@ -118,7 +111,6 @@ ...@@ -118,7 +111,6 @@
F233607725BE8E0700452818 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; }; F233607725BE8E0700452818 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
F2AB5B8725CD382300F8BA8E /* LevelCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LevelCollectionViewCell.swift; sourceTree = "<group>"; }; F2AB5B8725CD382300F8BA8E /* LevelCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LevelCollectionViewCell.swift; sourceTree = "<group>"; };
F2AB5B8F25CD7D1600F8BA8E /* Spinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Spinner.swift; sourceTree = "<group>"; }; F2AB5B8F25CD7D1600F8BA8E /* Spinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Spinner.swift; sourceTree = "<group>"; };
F2DFAFB525A1114B00F982BA /* JoyStick.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoyStick.swift; sourceTree = "<group>"; };
F2DFAFBA25A1304D00F982BA /* TutorialScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialScene.swift; sourceTree = "<group>"; }; F2DFAFBA25A1304D00F982BA /* TutorialScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialScene.swift; sourceTree = "<group>"; };
F2DFB01C25A5C03400F982BA /* Obstacle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Obstacle.swift; sourceTree = "<group>"; }; F2DFB01C25A5C03400F982BA /* Obstacle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Obstacle.swift; sourceTree = "<group>"; };
F2FD144025A07C7C00A0181C /* RoundedRectangleButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedRectangleButton.swift; sourceTree = "<group>"; }; F2FD144025A07C7C00A0181C /* RoundedRectangleButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedRectangleButton.swift; sourceTree = "<group>"; };
...@@ -214,8 +206,6 @@ ...@@ -214,8 +206,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F228C65025C4D6C100E4E701 /* GameGyroscopeController.swift */, F228C65025C4D6C100E4E701 /* GameGyroscopeController.swift */,
8084DEEA25C043E00053D095 /* FeedbackController.swift */,
8084DEEF25C044050053D095 /* SoundFeedbackConrtoller.swift */,
8084DEE525C040350053D095 /* HapticResponseController.swift */, 8084DEE525C040350053D095 /* HapticResponseController.swift */,
); );
path = Controls; path = Controls;
...@@ -267,10 +257,8 @@ ...@@ -267,10 +257,8 @@
children = ( children = (
66C7AF5225A6D57100F5A304 /* Timer.swift */, 66C7AF5225A6D57100F5A304 /* Timer.swift */,
F2DFB01C25A5C03400F982BA /* Obstacle.swift */, F2DFB01C25A5C03400F982BA /* Obstacle.swift */,
F2DFAFB525A1114B00F982BA /* JoyStick.swift */,
667FBD3525A26FE400569A6D /* Character.swift */, 667FBD3525A26FE400569A6D /* Character.swift */,
667FBD3A25A274D400569A6D /* TestController.swift */, 6630961125D4641200F9B2BA /* Readme.md */,
66ABCA6025C03C6F00698587 /* Readme.md */,
); );
path = Partial; path = Partial;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -420,9 +408,9 @@ ...@@ -420,9 +408,9 @@
files = ( files = (
F200B4B125CAF69F00412100 /* audio_grab.mp3 in Resources */, F200B4B125CAF69F00412100 /* audio_grab.mp3 in Resources */,
66383774259F8C340033D344 /* Main.storyboard in Resources */, 66383774259F8C340033D344 /* Main.storyboard in Resources */,
6630961225D4641200F9B2BA /* Readme.md in Resources */,
F200B4C525CB22EF00412100 /* audio_drop.mp3 in Resources */, F200B4C525CB22EF00412100 /* audio_drop.mp3 in Resources */,
F2FD146E25A0B4D600A0181C /* TutorialScene.sks in Resources */, F2FD146E25A0B4D600A0181C /* TutorialScene.sks in Resources */,
66ABCA6125C03C6F00698587 /* Readme.md in Resources */,
8078002B25D01CF8005C2DAC /* BTLobbyMusic.mp3 in Resources */, 8078002B25D01CF8005C2DAC /* BTLobbyMusic.mp3 in Resources */,
6638376B259F8C340033D344 /* GameScene.sks in Resources */, 6638376B259F8C340033D344 /* GameScene.sks in Resources */,
66383776259F8C350033D344 /* Assets.xcassets in Resources */, 66383776259F8C350033D344 /* Assets.xcassets in Resources */,
...@@ -458,12 +446,9 @@ ...@@ -458,12 +446,9 @@
F233606525BE86F500452818 /* CharacterAction.swift in Sources */, F233606525BE86F500452818 /* CharacterAction.swift in Sources */,
F2AB5B9025CD7D1600F8BA8E /* Spinner.swift in Sources */, F2AB5B9025CD7D1600F8BA8E /* Spinner.swift in Sources */,
F2DFAFBB25A1304D00F982BA /* TutorialScene.swift in Sources */, F2DFAFBB25A1304D00F982BA /* TutorialScene.swift in Sources */,
8084DEF025C044050053D095 /* SoundFeedbackConrtoller.swift in Sources */,
808F8C9625ACFFE500C7FFFE /* LevelSelectionViewController.swift in Sources */, 808F8C9625ACFFE500C7FFFE /* LevelSelectionViewController.swift in Sources */,
80F869BC25A65CFD00CF3D59 /* MutliplayerManager.swift in Sources */, 80F869BC25A65CFD00CF3D59 /* MutliplayerManager.swift in Sources */,
80BBBDCB25AE41EE006DA00A /* LocalTeamPlayManager.swift in Sources */, 80BBBDCB25AE41EE006DA00A /* LocalTeamPlayManager.swift in Sources */,
F2DFAFB625A1114B00F982BA /* JoyStick.swift in Sources */,
667FBD3B25A274D400569A6D /* TestController.swift in Sources */,
66C7AF5325A6D57200F5A304 /* Timer.swift in Sources */, 66C7AF5325A6D57200F5A304 /* Timer.swift in Sources */,
80BBBDD325AE4506006DA00A /* LocalBTPlayerInfo.swift in Sources */, 80BBBDD325AE4506006DA00A /* LocalBTPlayerInfo.swift in Sources */,
F228C65125C4D6C100E4E701 /* GameGyroscopeController.swift in Sources */, F228C65125C4D6C100E4E701 /* GameGyroscopeController.swift in Sources */,
...@@ -475,7 +460,6 @@ ...@@ -475,7 +460,6 @@
80CD582A25CB6B030078031F /* CharacterManager.swift in Sources */, 80CD582A25CB6B030078031F /* CharacterManager.swift in Sources */,
667FBD3625A26FE400569A6D /* Character.swift in Sources */, 667FBD3625A26FE400569A6D /* Character.swift in Sources */,
F2FD145B25A098D100A0181C /* PlayerModeSelectorViewController.swift in Sources */, F2FD145B25A098D100A0181C /* PlayerModeSelectorViewController.swift in Sources */,
8084DEEB25C043E00053D095 /* FeedbackController.swift in Sources */,
F233607825BE8E0700452818 /* CodableHelper.swift in Sources */, F233607825BE8E0700452818 /* CodableHelper.swift in Sources */,
66383771259F8C340033D344 /* GameViewController.swift in Sources */, 66383771259F8C340033D344 /* GameViewController.swift in Sources */,
F233606D25BE8B6A00452818 /* SessionAction.swift in Sources */, F233606D25BE8B6A00452818 /* SessionAction.swift in Sources */,
...@@ -661,7 +645,7 @@ ...@@ -661,7 +645,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.example1.Better-Together"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.Better-Together";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
...@@ -682,7 +666,7 @@ ...@@ -682,7 +666,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.example1.Better-Together"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.Better-Together";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
......
No preview for this file type
{
"images" : [
{
"filename" : "baseLeft.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "baseLeft@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "baseLeft@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Better Together/Better Together/Assets.xcassets/baseLeft.imageset/baseLeft.png

3.12 KiB

{
"images" : [
{
"filename" : "baseRight.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "baseRight@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "baseRight@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Better Together/Better Together/Assets.xcassets/baseRight.imageset/baseRight.png

3.18 KiB

{
"images" : [
{
"filename" : "grapButtonLeft.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "grapButtonLeft@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "grapButtonLeft@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "grapButtonLeftOn.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "grapButtonLeftOn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "grapButtonLeftOn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "grapButtonRight.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "grapButtonRight@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "grapButtonRight@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment