Skip to content

Commit

Permalink
Added the N64 controller artwork.
Browse files Browse the repository at this point in the history
  • Loading branch information
@RickyRomero
RickyRomero committed Jul 7, 2014
1 parent 1ad74b5 commit 2959348
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 26 deletions.
36 changes: 18 additions & 18 deletions OpenEmu/N64/Controller-Preferences.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,41 @@
<key>OEControllerKeyPositionKey</key>
<dict>
<key>OEN64ButtonDPadUp</key>
<string>{0, 0}</string>
<string>{127, 307}</string>
<key>OEN64ButtonDPadDown</key>
<string>{0, 0}</string>
<string>{127, 265}</string>
<key>OEN64ButtonDPadLeft</key>
<string>{0, 0}</string>
<string>{104, 285}</string>
<key>OEN64ButtonDPadRight</key>
<string>{0, 0}</string>
<string>{149, 285}</string>
<key>OEN64ButtonCUp</key>
<string>{0, 0}</string>
<string>{383, 324}</string>
<key>OEN64ButtonCDown</key>
<string>{0, 0}</string>
<string>{383, 276}</string>
<key>OEN64ButtonCLeft</key>
<string>{0, 0}</string>
<string>{359, 300}</string>
<key>OEN64ButtonCRight</key>
<string>{0, 0}</string>
<string>{407, 300}</string>
<key>OEN64ButtonL</key>
<string>{0, 0}</string>
<string>{125, 373}</string>
<key>OEN64ButtonR</key>
<string>{0, 0}</string>
<string>{374, 373}</string>
<key>OEN64ButtonA</key>
<string>{0, 0}</string>
<string>{353, 246}</string>
<key>OEN64ButtonB</key>
<string>{0, 0}</string>
<string>{325, 273}</string>
<key>OEN64ButtonStart</key>
<string>{0, 0}</string>
<string>{250, 271}</string>
<key>OEN64ButtonZ</key>
<string>{0, 0}</string>
<string>{250, 236}</string>
<key>OEN64AnalogLeft</key>
<string>{0, 0}</string>
<string>{230, 194}</string>
<key>OEN64AnalogRight</key>
<string>{0, 0}</string>
<string>{270, 194}</string>
<key>OEN64AnalogUp</key>
<string>{0, 0}</string>
<string>{250, 214}</string>
<key>OEN64AnalogDown</key>
<string>{0, 0}</string>
<string>{250, 175}</string>
</dict>
</dict>
</plist>
Binary file modified OpenEmu/N64/controller_n64.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenEmu/N64/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified OpenEmu/N64/controller_n64_mask.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenEmu/N64/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 16 additions & 8 deletions OpenEmu/OpenEmu.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@
/* Begin PBXBuildFile section */
0A9F272216635A1B008B1FB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A9F272116635A1B008B1FB8 /* libz.dylib */; };
0A9F272316635A55008B1FB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A9F272116635A1B008B1FB8 /* libz.dylib */; };
11BD776E196A46AD00BFB3FE /* controller_n64_mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD776A196A46AD00BFB3FE /* controller_n64_mask.png */; };
11BD776F196A46AD00BFB3FE /* controller_n64.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD776B196A46AD00BFB3FE /* controller_n64.png */; };
11BD7770196A46AD00BFB3FE /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 11BD776C196A46AD00BFB3FE /* [email protected] */; };
11BD7771196A46AD00BFB3FE /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 11BD776D196A46AD00BFB3FE /* [email protected] */; };
11DC4D4118681B04006CE75D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 11DC4D4018681B04006CE75D /* [email protected] */; };
11DC4D4518681E56006CE75D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 11DC4D4418681E56006CE75D /* [email protected] */; };
11DC4D4718681E64006CE75D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 11DC4D4618681E64006CE75D /* [email protected] */; };
Expand All @@ -118,7 +122,6 @@
141554101442B3B300A01683 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6711810136368330034379A /* Cocoa.framework */; };
141554161442B3B300A01683 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 141554141442B3B300A01683 /* InfoPlist.strings */; };
141554211442B7B100A01683 /* OEN64SystemResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 141554201442B7B100A01683 /* OEN64SystemResponder.m */; };
141554291442C12200A01683 /* controller_n64.png in Resources */ = {isa = PBXBuildFile; fileRef = 141554281442C12200A01683 /* controller_n64.png */; };
143F299A164DE0CC00544CCF /* MagicKit.framework in Copy Frameworks to App Frameworks */ = {isa = PBXBuildFile; fileRef = 143F2995164DE0B300544CCF /* MagicKit.framework */; };
143F299D164DE18100544CCF /* MagicKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 143F2995164DE0B300544CCF /* MagicKit.framework */; };
14861960166076A400BDB800 /* NSDate+OESortAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1486195F166076A400BDB800 /* NSDate+OESortAdditions.m */; };
Expand Down Expand Up @@ -818,7 +821,6 @@
94D7E8DD15073DB000FBDD85 /* nds_library.png in Resources */ = {isa = PBXBuildFile; fileRef = 94D7E8D915073DB000FBDD85 /* nds_library.png */; };
94D7E8E415073E3900FBDD85 /* OENDSSystemResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D7E8E115073E3800FBDD85 /* OENDSSystemResponder.m */; };
94DEA000171896AE00073397 /* NDS.oesystemplugin in Copy System Plugins to App Plugins */ = {isa = PBXBuildFile; fileRef = 94D7E8C915073BA000FBDD85 /* NDS.oesystemplugin */; };
94DEA057171BA36000073397 /* controller_n64_mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 94DEA056171BA36000073397 /* controller_n64_mask.png */; };
94E6C304166DB15900082F27 /* Controller-Mappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94E6C303166DB15900082F27 /* Controller-Mappings.plist */; };
94EBBCFC183F42F800743756 /* Atari 2600.oesystemplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94A224A31707543600098DA0 /* Atari 2600.oesystemplugin */; };
94EBBD01183F48C900743756 /* Atari 5200.oesystemplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94A224B31707544100098DA0 /* Atari 5200.oesystemplugin */; };
Expand Down Expand Up @@ -1538,6 +1540,10 @@

/* Begin PBXFileReference section */
0A9F272116635A1B008B1FB8 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
11BD776A196A46AD00BFB3FE /* controller_n64_mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = controller_n64_mask.png; sourceTree = "<group>"; };
11BD776B196A46AD00BFB3FE /* controller_n64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = controller_n64.png; sourceTree = "<group>"; };
11BD776C196A46AD00BFB3FE /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
11BD776D196A46AD00BFB3FE /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
11DC4D4018681B04006CE75D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "[email protected]"; sourceTree = "<group>"; };
11DC4D4418681E56006CE75D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
11DC4D4618681E64006CE75D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
Expand All @@ -1549,7 +1555,6 @@
1415541F1442B7B100A01683 /* OEN64SystemResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEN64SystemResponder.h; sourceTree = "<group>"; };
141554201442B7B100A01683 /* OEN64SystemResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEN64SystemResponder.m; sourceTree = "<group>"; };
141554221442B85000A01683 /* OEN64SystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEN64SystemResponderClient.h; sourceTree = "<group>"; };
141554281442C12200A01683 /* controller_n64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = controller_n64.png; sourceTree = "<group>"; };
142689BD16585F0E00AD0B63 /* OEDatabase 0.4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "OEDatabase 0.4.xcdatamodel"; sourceTree = "<group>"; };
143F298A164DE0B300544CCF /* MagicKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MagicKit.xcodeproj; path = ../MagicKit/MagicKit.xcodeproj; sourceTree = "<group>"; };
1486195E166076A400BDB800 /* NSDate+OESortAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+OESortAdditions.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2569,7 +2574,6 @@
94D7E8E015073E3800FBDD85 /* OENDSSystemResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OENDSSystemResponder.h; sourceTree = "<group>"; };
94D7E8E115073E3800FBDD85 /* OENDSSystemResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OENDSSystemResponder.m; sourceTree = "<group>"; };
94D7E8E215073E3800FBDD85 /* OENDSSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OENDSSystemResponderClient.h; sourceTree = "<group>"; };
94DEA056171BA36000073397 /* controller_n64_mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = controller_n64_mask.png; sourceTree = "<group>"; };
94E6C303166DB15900082F27 /* Controller-Mappings.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Controller-Mappings.plist"; sourceTree = "<group>"; };
94F6CB7A16DD727600CD48A4 /* OECheats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OECheats.h; sourceTree = "<group>"; };
94F6CB7B16DD727600CD48A4 /* OECheats.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OECheats.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3288,9 +3292,11 @@
141554121442B3B300A01683 /* Supporting Files */ = {
isa = PBXGroup;
children = (
11BD776B196A46AD00BFB3FE /* controller_n64.png */,
11BD776D196A46AD00BFB3FE /* [email protected] */,
11BD776A196A46AD00BFB3FE /* controller_n64_mask.png */,
11BD776C196A46AD00BFB3FE /* [email protected] */,
83FBA37214F2C699001F1299 /* n64_library.png */,
94DEA056171BA36000073397 /* controller_n64_mask.png */,
141554281442C12200A01683 /* controller_n64.png */,
EC350F45174019A2005DA3B2 /* [email protected] */,
141554131442B3B300A01683 /* N64-Info.plist */,
C6AF284F164E46AC00681A06 /* Keyboard-Mappings.plist */,
Expand Down Expand Up @@ -6677,14 +6683,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
11BD776F196A46AD00BFB3FE /* controller_n64.png in Resources */,
11BD7771196A46AD00BFB3FE /* [email protected] in Resources */,
141554161442B3B300A01683 /* InfoPlist.strings in Resources */,
141554291442C12200A01683 /* controller_n64.png in Resources */,
C6252DB214E7566600350A13 /* Controller-Preferences.plist in Resources */,
83FBA37314F2C699001F1299 /* n64_library.png in Resources */,
C6AF2850164E46AC00681A06 /* Keyboard-Mappings.plist in Resources */,
94E6C304166DB15900082F27 /* Controller-Mappings.plist in Resources */,
94DEA057171BA36000073397 /* controller_n64_mask.png in Resources */,
11BD7770196A46AD00BFB3FE /* controller_n64_mask@2x.png in Resources */,
EC350F46174019A2005DA3B2 /* [email protected] in Resources */,
11BD776E196A46AD00BFB3FE /* controller_n64_mask.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down

0 comments on commit 2959348

Please sign in to comment.