Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Better Together
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
ios-dev-group-i
Better Together
Merge requests
!56
Revert "Merge branch 'code-cleanup-lukas' into 'master'"
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Revert "Merge branch 'code-cleanup-lukas' into 'master'"
revert-b3ccbf15
into
master
Overview
1
Commits
1
Pipelines
0
Changes
16
Merged
Revert "Merge branch 'code-cleanup-lukas' into 'master'"
Lukas Woyke
requested to merge
revert-b3ccbf15
into
master
Feb 10, 2021
Overview
1
Commits
1
Pipelines
0
Changes
16
This reverts merge request
!53 (merged)
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
f602baa1
1 commit,
Feb 10, 2021
16 files
+
58
−
177
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
16
Better Together/Better Together.xcodeproj/project.pbxproj
+
9
−
5
View file @ f602baa1
Edit in single-file editor
Open in Web IDE
Show full file
@@ -29,6 +29,7 @@
80CD582A25CB6B030078031F
/* CharacterManager.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80CD582925CB6B030078031F
/* CharacterManager.swift */
;
};
80D1699C25CE2AE40069375C
/* SpinnerView.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80D1699B25CE2AE40069375C
/* SpinnerView.xib */
;
};
80D169A425CE2C9B0069375C
/* SpinnerView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80D169A325CE2C9B0069375C
/* SpinnerView.swift */
;
};
80DD334F25D201870030F56F
/* TestConnection.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80DD334E25D201870030F56F
/* TestConnection.swift */
;
};
80E55F6725CF3A8600630587
/* SetUpState.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80E55F6625CF3A8600630587
/* SetUpState.swift */
;
};
80F869BA25A65CC900CF3D59
/* GameKit.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80F869B925A65CC900CF3D59
/* GameKit.framework */
;
};
80F869BC25A65CFD00CF3D59
/* MutliplayerManager.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
80F869BB25A65CFD00CF3D59
/* MutliplayerManager.swift */
;
};
@@ -96,6 +97,7 @@
80CD582925CB6B030078031F
/* CharacterManager.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CharacterManager.swift
;
sourceTree
=
"<group>"
;
};
80D1699B25CE2AE40069375C
/* SpinnerView.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
SpinnerView.xib
;
sourceTree
=
"<group>"
;
};
80D169A325CE2C9B0069375C
/* SpinnerView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
SpinnerView.swift
;
sourceTree
=
"<group>"
;
};
80DD334E25D201870030F56F
/* TestConnection.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
TestConnection.swift
;
sourceTree
=
"<group>"
;
};
80E55F6625CF3A8600630587
/* SetUpState.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
SetUpState.swift
;
sourceTree
=
"<group>"
;
};
80F869B925A65CC900CF3D59
/* GameKit.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
GameKit.framework
;
path
=
System/Library/Frameworks/GameKit.framework
;
sourceTree
=
SDKROOT
;
};
80F869BB25A65CFD00CF3D59
/* MutliplayerManager.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
MutliplayerManager.swift
;
sourceTree
=
"<group>"
;
};
@@ -264,9 +266,6 @@
F2FD143F25A07C4900A0181C
/* UIViewComponents */
=
{
isa
=
PBXGroup
;
children
=
(
80E55F6625CF3A8600630587
/* SetUpState.swift */
,
80D169A325CE2C9B0069375C
/* SpinnerView.swift */
,
80D1699B25CE2AE40069375C
/* SpinnerView.xib */
,
F2FD144025A07C7C00A0181C
/* RoundedRectangleButton.swift */
,
F2AB5B8725CD382300F8BA8E
/* LevelCollectionViewCell.swift */
,
F2AB5B8F25CD7D1600F8BA8E
/* Spinner.swift */
,
@@ -277,9 +276,13 @@
F2FD144825A07EB900A0181C
/* UIViews */
=
{
isa
=
PBXGroup
;
children
=
(
80E55F6625CF3A8600630587
/* SetUpState.swift */
,
80D169A325CE2C9B0069375C
/* SpinnerView.swift */
,
80D1699B25CE2AE40069375C
/* SpinnerView.xib */
,
F2FD144C25A07F1200A0181C
/* CharacterControlSettingViewController.swift */
,
80CD582925CB6B030078031F
/* CharacterManager.swift */
,
F2FD145A25A098D100A0181C
/* PlayerModeSelectorViewController.swift */
,
80DD334E25D201870030F56F
/* TestConnection.swift */
,
808F8C9525ACFFE500C7FFFE
/* LevelSelectionViewController.swift */
,
);
path
=
UIViews
;
@@ -465,6 +468,7 @@
8084DEE625C040350053D095
/* HapticResponseController.swift in Sources */
,
F2FD144D25A07F1200A0181C
/* CharacterControlSettingViewController.swift in Sources */
,
808F8CB425AD08AD00C7FFFE
/* PlayMode.swift in Sources */
,
80DD334F25D201870030F56F
/* TestConnection.swift in Sources */
,
);
runOnlyForDeploymentPostprocessing
=
0
;
};
@@ -634,7 +638,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
DEVELOPMENT_TEAM
=
Y2YVKT7HM8
;
DEVELOPMENT_TEAM
=
NYTT9V938N
;
INFOPLIST_FILE
=
"Better Together/Info.plist"
;
IPHONEOS_DEPLOYMENT_TARGET
=
14.2
;
LD_RUNPATH_SEARCH_PATHS
=
(
@@ -655,7 +659,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
CODE_SIGN_STYLE
=
Automatic
;
DEVELOPMENT_TEAM
=
Y2YVKT7HM8
;
DEVELOPMENT_TEAM
=
NYTT9V938N
;
INFOPLIST_FILE
=
"Better Together/Info.plist"
;
IPHONEOS_DEPLOYMENT_TARGET
=
14.2
;
LD_RUNPATH_SEARCH_PATHS
=
(
Loading