Skip to content

Catty 710 turn object overview from list to segments #1828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucatp wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Catty 710 turn object overview from list to segments #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aa9c809
CATTY-717 Allow selection of images from files
lucatp Jul 13, 2023
675c034
CATTY-710 Turn object overview from list to segments
lucatp Jul 13, 2023
a89054c
CATTY-710 Turn object overview from list to segments
lucatp Jul 13, 2023
d9e09d1
CATTY-710 Turn object overview from list to segments
lucatp Jul 16, 2023
7c59012
CATTY-710 Turn object overview from list to segments
lucatp Jul 16, 2023
02a1fff
CATTY-710 Turn object overview from list to segments
lucatp Jul 17, 2023
bfc9632
CATTY-710 Turn object overview from list to segments
lucatp Jul 17, 2023
996fe0d
CATTY-710 Turn object overview from list to segments
lucatp Jul 17, 2023
88f3f6e
CATTY-710 Turn object overview from list to segments
lucatp Jul 17, 2023
490aafa
CATTY-710 Turn object overview from list to segments
lucatp Jul 17, 2023
437f276
CATTY-710 Turn object overview from list to segments
lucatp Jul 18, 2023
805a96b
CATTY-710 Turn object overview from list to segments
lucatp Jul 19, 2023
97c54a5
CATTY-710 Turn object overview from list to segments
lucatp Jul 19, 2023
0ea272b
Catty 710 turn object overview from list to segments
lucatp Aug 17, 2023
3268db3
Merge branch 'CATTY-710-Turn-object-overview-from-list-to-segments' o…
lucatp Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/Catty.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,6 @@
92FF314E1A24DEB300093DA7 /* LookImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF311B1A24DEB300093DA7 /* LookImageViewController.m */; };
92FF314F1A24DEB300093DA7 /* LooksTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF311D1A24DEB300093DA7 /* LooksTableViewController.m */; };
92FF31551A24DEB300093DA7 /* SoundsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF312B1A24DEB300093DA7 /* SoundsTableViewController.m */; };
92FF31571A24DEB300093DA7 /* ObjectTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF312F1A24DEB300093DA7 /* ObjectTableViewController.m */; };
92FF31581A24DEB300093DA7 /* SceneTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF31311A24DEB300093DA7 /* SceneTableViewController.m */; };
92FF31591A24DEB300093DA7 /* DownloadTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF31341A24DEB300093DA7 /* DownloadTabBarController.m */; };
92FF315B1A24DEB300093DA7 /* ProjectDetailStoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FF31381A24DEB300093DA7 /* ProjectDetailStoreViewController.m */; };
Expand Down Expand Up @@ -1751,6 +1750,7 @@
AAF6D9DE1BC0C1F300686849 /* PlaceAtBrick+Instruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF6D9DD1BC0C1F300686849 /* PlaceAtBrick+Instruction.swift */; };
AAF6D9E01BC0C2AA00686849 /* PointInDirectionBrick+Instruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF6D9DF1BC0C2AA00686849 /* PointInDirectionBrick+Instruction.swift */; };
AAF6D9E21BC0C48300686849 /* PointToBrick+Instruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF6D9E11BC0C48300686849 /* PointToBrick+Instruction.swift */; };
B06830562A6007DC00BF06BD /* ObjectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B06830552A6007DC00BF06BD /* ObjectViewController.swift */; };
BA1FA9981F02AD770084184D /* InsertItemIntoUserListBrick+CBXMLHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1FA9971F02AD770084184D /* InsertItemIntoUserListBrick+CBXMLHandler.m */; };
BA1FA99D1F02AEDC0084184D /* InsertItemIntoUserListBrick.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1FA99C1F02AEDC0084184D /* InsertItemIntoUserListBrick.m */; };
BA1FA9A01F02B0020084184D /* InsertItemIntoUserListBrickCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1FA99F1F02B0020084184D /* InsertItemIntoUserListBrickCell.m */; };
Expand Down Expand Up @@ -3758,8 +3758,6 @@
92FF311D1A24DEB300093DA7 /* LooksTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LooksTableViewController.m; sourceTree = "<group>"; };
92FF312A1A24DEB300093DA7 /* SoundsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundsTableViewController.h; sourceTree = "<group>"; };
92FF312B1A24DEB300093DA7 /* SoundsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoundsTableViewController.m; sourceTree = "<group>"; };
92FF312E1A24DEB300093DA7 /* ObjectTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectTableViewController.h; sourceTree = "<group>"; };
92FF312F1A24DEB300093DA7 /* ObjectTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectTableViewController.m; sourceTree = "<group>"; };
92FF31301A24DEB300093DA7 /* SceneTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneTableViewController.h; sourceTree = "<group>"; };
92FF31311A24DEB300093DA7 /* SceneTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneTableViewController.m; sourceTree = "<group>"; };
92FF31331A24DEB300093DA7 /* DownloadTabBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadTabBarController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4395,6 +4393,7 @@
AAF6D9DF1BC0C2AA00686849 /* PointInDirectionBrick+Instruction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "PointInDirectionBrick+Instruction.swift"; path = "PlayerEngine/Instructions/Motion/PointInDirectionBrick+Instruction.swift"; sourceTree = "<group>"; };
AAF6D9E11BC0C48300686849 /* PointToBrick+Instruction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "PointToBrick+Instruction.swift"; path = "PlayerEngine/Instructions/Motion/PointToBrick+Instruction.swift"; sourceTree = "<group>"; };
ABD74577198FBC2984BDDE56 /* hu */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
B06830552A6007DC00BF06BD /* ObjectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectViewController.swift; sourceTree = "<group>"; };
B11EA657D0D5E2E348790671 /* ta */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = ta; path = ta.lproj/Localizable.strings; sourceTree = "<group>"; };
B46B270517703F9400172837 /* CattyTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "CattyTests-Info.plist"; sourceTree = "<group>"; };
B46B270717703F9400172837 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -9226,11 +9225,10 @@
92FF31181A24DEB300093DA7 /* MaintainObject */ = {
isa = PBXGroup;
children = (
B06830552A6007DC00BF06BD /* ObjectViewController.swift */,
92FF31191A24DEB300093DA7 /* MaintainLooks */,
92FF311E1A24DEB300093DA7 /* MaintainScript */,
92FF31271A24DEB300093DA7 /* MaintainSounds */,
92FF312E1A24DEB300093DA7 /* ObjectTableViewController.h */,
92FF312F1A24DEB300093DA7 /* ObjectTableViewController.m */,
);
path = MaintainObject;
sourceTree = "<group>";
Expand Down Expand Up @@ -12886,6 +12884,7 @@
AA401FE91BBEF6F9001BC49F /* CBInstructionProtocol.swift in Sources */,
AABCB3E21BB36529009F67D2 /* CBScheduler.swift in Sources */,
BACDF3521F1F9B7E00346167 /* DeleteItemOfUserListBrick.m in Sources */,
B06830562A6007DC00BF06BD /* ObjectViewController.swift in Sources */,
BB9EC0E527D62CBA009FF8CE /* FormTableViewCell.swift in Sources */,
4614B1DD25608E8B004174AD /* StitchBrickCell.swift in Sources */,
AABCB3DF1BB3650B009F67D2 /* CBBackendProtocol.swift in Sources */,
Expand Down Expand Up @@ -12994,7 +12993,6 @@
4C2EE41E1B555B55006DE9B8 /* CBXMLOpenedNestingBricksStack.m in Sources */,
7B09EB6A29B1DF8200590F3D /* LoginViewController.swift in Sources */,
5EFBD5F92145533B003B3CDC /* ProjectDescriptionViewController.swift in Sources */,
92FF31571A24DEB300093DA7 /* ObjectTableViewController.m in Sources */,
4CE3D68F2107B68600005629 /* VisualDetectionManagerProtocol.swift in Sources */,
BB6FE23C2812BD4E007ABDA9 /* FormCrashReportsSwitchTableViewCell.swift in Sources */,
929CC0EF1BC39B8C0027DEC0 /* PhiroMotorStopBrickCell.m in Sources */,
Expand Down
Loading