diff --git a/IB Images/AdvancedButton.png b/IB Images/AdvancedButton.png new file mode 100644 index 0000000..be166fa Binary files /dev/null and b/IB Images/AdvancedButton.png differ diff --git a/IB Images/AdvancedButton_Highlighted.png b/IB Images/AdvancedButton_Highlighted.png new file mode 100644 index 0000000..be166fa Binary files /dev/null and b/IB Images/AdvancedButton_Highlighted.png differ diff --git a/IB Images/BackButton.png b/IB Images/BackButton.png new file mode 100644 index 0000000..4b47c0a Binary files /dev/null and b/IB Images/BackButton.png differ diff --git a/IB Images/BackButton_Highlighted.png b/IB Images/BackButton_Highlighted.png new file mode 100644 index 0000000..4b47c0a Binary files /dev/null and b/IB Images/BackButton_Highlighted.png differ diff --git a/IB Images/Button.png b/IB Images/Button.png new file mode 100644 index 0000000..6d153c1 Binary files /dev/null and b/IB Images/Button.png differ diff --git a/IB Images/Button_Highlighted.png b/IB Images/Button_Highlighted.png new file mode 100644 index 0000000..6c65a64 Binary files /dev/null and b/IB Images/Button_Highlighted.png differ diff --git a/IB Images/DifficultyBackground.png b/IB Images/DifficultyBackground.png new file mode 100644 index 0000000..7676fc9 Binary files /dev/null and b/IB Images/DifficultyBackground.png differ diff --git a/IB Images/Divide.png b/IB Images/Divide.png new file mode 100644 index 0000000..0044e76 Binary files /dev/null and b/IB Images/Divide.png differ diff --git a/IB Images/DoomLogo.png b/IB Images/DoomLogo.png new file mode 100644 index 0000000..d9b2b24 Binary files /dev/null and b/IB Images/DoomLogo.png differ diff --git a/IB Images/DownArrow.png b/IB Images/DownArrow.png new file mode 100644 index 0000000..d230e06 Binary files /dev/null and b/IB Images/DownArrow.png differ diff --git a/IB Images/DownArrow_Highlighted.png b/IB Images/DownArrow_Highlighted.png new file mode 100644 index 0000000..d8e328f Binary files /dev/null and b/IB Images/DownArrow_Highlighted.png differ diff --git a/IB Images/Easy.png b/IB Images/Easy.png new file mode 100644 index 0000000..037df27 Binary files /dev/null and b/IB Images/Easy.png differ diff --git a/IB Images/Episode1Background.png b/IB Images/Episode1Background.png new file mode 100644 index 0000000..54e6b4c Binary files /dev/null and b/IB Images/Episode1Background.png differ diff --git a/IB Images/Episode1Background_Highlighted.png b/IB Images/Episode1Background_Highlighted.png new file mode 100644 index 0000000..44e7d35 Binary files /dev/null and b/IB Images/Episode1Background_Highlighted.png differ diff --git a/IB Images/Episode2Background.png b/IB Images/Episode2Background.png new file mode 100644 index 0000000..abe09df Binary files /dev/null and b/IB Images/Episode2Background.png differ diff --git a/IB Images/Episode2Background_Highlighted.png b/IB Images/Episode2Background_Highlighted.png new file mode 100644 index 0000000..ea85bb1 Binary files /dev/null and b/IB Images/Episode2Background_Highlighted.png differ diff --git a/IB Images/Episode3Background.png b/IB Images/Episode3Background.png new file mode 100644 index 0000000..3ee565a Binary files /dev/null and b/IB Images/Episode3Background.png differ diff --git a/IB Images/Episode3Background_Highlighted.png b/IB Images/Episode3Background_Highlighted.png new file mode 100644 index 0000000..d6af07d Binary files /dev/null and b/IB Images/Episode3Background_Highlighted.png differ diff --git a/IB Images/Episode4Background.png b/IB Images/Episode4Background.png new file mode 100644 index 0000000..3ded8a9 Binary files /dev/null and b/IB Images/Episode4Background.png differ diff --git a/IB Images/Episode4Background_Highlighted.png b/IB Images/Episode4Background_Highlighted.png new file mode 100644 index 0000000..2b1ad8b Binary files /dev/null and b/IB Images/Episode4Background_Highlighted.png differ diff --git a/IB Images/Hard.png b/IB Images/Hard.png new file mode 100644 index 0000000..1c3d0aa Binary files /dev/null and b/IB Images/Hard.png differ diff --git a/IB Images/LayoutDualButton.png b/IB Images/LayoutDualButton.png new file mode 100644 index 0000000..38563db Binary files /dev/null and b/IB Images/LayoutDualButton.png differ diff --git a/IB Images/LayoutDualButton_Highlighted.png b/IB Images/LayoutDualButton_Highlighted.png new file mode 100644 index 0000000..38563db Binary files /dev/null and b/IB Images/LayoutDualButton_Highlighted.png differ diff --git a/IB Images/LayoutSingleButton.png b/IB Images/LayoutSingleButton.png new file mode 100644 index 0000000..4fc364f Binary files /dev/null and b/IB Images/LayoutSingleButton.png differ diff --git a/IB Images/LayoutSingleButton_Highlighted.png b/IB Images/LayoutSingleButton_Highlighted.png new file mode 100644 index 0000000..4fc364f Binary files /dev/null and b/IB Images/LayoutSingleButton_Highlighted.png differ diff --git a/IB Images/LayoutWheelButton.png b/IB Images/LayoutWheelButton.png new file mode 100644 index 0000000..b5eba06 Binary files /dev/null and b/IB Images/LayoutWheelButton.png differ diff --git a/IB Images/LayoutWheelButton_Highlighted.png b/IB Images/LayoutWheelButton_Highlighted.png new file mode 100644 index 0000000..b5eba06 Binary files /dev/null and b/IB Images/LayoutWheelButton_Highlighted.png differ diff --git a/IB Images/Medium.png b/IB Images/Medium.png new file mode 100644 index 0000000..440c885 Binary files /dev/null and b/IB Images/Medium.png differ diff --git a/IB Images/MenuBackground.png b/IB Images/MenuBackground.png new file mode 100644 index 0000000..436945c Binary files /dev/null and b/IB Images/MenuBackground.png differ diff --git a/IB Images/MissonBackground.png b/IB Images/MissonBackground.png new file mode 100644 index 0000000..cd64f29 Binary files /dev/null and b/IB Images/MissonBackground.png differ diff --git a/IB Images/NextButton.png b/IB Images/NextButton.png new file mode 100644 index 0000000..82dce0f Binary files /dev/null and b/IB Images/NextButton.png differ diff --git a/IB Images/NextButton_Highlighted.png b/IB Images/NextButton_Highlighted.png new file mode 100644 index 0000000..82dce0f Binary files /dev/null and b/IB Images/NextButton_Highlighted.png differ diff --git a/IB Images/Nightmare.png b/IB Images/Nightmare.png new file mode 100644 index 0000000..8bf1b7b Binary files /dev/null and b/IB Images/Nightmare.png differ diff --git a/IB Images/SelectedBracket.png b/IB Images/SelectedBracket.png new file mode 100644 index 0000000..62a371c Binary files /dev/null and b/IB Images/SelectedBracket.png differ diff --git a/IB Images/SettingsButton.png b/IB Images/SettingsButton.png new file mode 100644 index 0000000..8bcb39a Binary files /dev/null and b/IB Images/SettingsButton.png differ diff --git a/IB Images/SettingsButton_Highlighted.png b/IB Images/SettingsButton_Highlighted.png new file mode 100644 index 0000000..00db025 Binary files /dev/null and b/IB Images/SettingsButton_Highlighted.png differ diff --git a/IB Images/SliderBackground.png b/IB Images/SliderBackground.png new file mode 100644 index 0000000..0e96c75 Binary files /dev/null and b/IB Images/SliderBackground.png differ diff --git a/IB Images/SliderBar.png b/IB Images/SliderBar.png new file mode 100644 index 0000000..25b4aa3 Binary files /dev/null and b/IB Images/SliderBar.png differ diff --git a/IB Images/SliderSkull.png b/IB Images/SliderSkull.png new file mode 100644 index 0000000..45e3eae Binary files /dev/null and b/IB Images/SliderSkull.png differ diff --git a/IB Images/SliderSkull@2x.png b/IB Images/SliderSkull@2x.png new file mode 100644 index 0000000..5bc2b67 Binary files /dev/null and b/IB Images/SliderSkull@2x.png differ diff --git a/IB Images/SliderSkull~ipad.png b/IB Images/SliderSkull~ipad.png new file mode 100644 index 0000000..5bc2b67 Binary files /dev/null and b/IB Images/SliderSkull~ipad.png differ diff --git a/IB Images/SubMenuBackground.png b/IB Images/SubMenuBackground.png new file mode 100644 index 0000000..082f8f3 Binary files /dev/null and b/IB Images/SubMenuBackground.png differ diff --git a/IB Images/SubMenuButton.png b/IB Images/SubMenuButton.png new file mode 100644 index 0000000..5d53173 Binary files /dev/null and b/IB Images/SubMenuButton.png differ diff --git a/IB Images/SubMenuButton_Highlighted.png b/IB Images/SubMenuButton_Highlighted.png new file mode 100644 index 0000000..acf6006 Binary files /dev/null and b/IB Images/SubMenuButton_Highlighted.png differ diff --git a/IB Images/UpArrow.png b/IB Images/UpArrow.png new file mode 100644 index 0000000..e7144be Binary files /dev/null and b/IB Images/UpArrow.png differ diff --git a/IB Images/UpArrow_Highlighted.png b/IB Images/UpArrow_Highlighted.png new file mode 100644 index 0000000..4ed6e0a Binary files /dev/null and b/IB Images/UpArrow_Highlighted.png differ diff --git a/README.md b/README.md index b678769..1a1647d 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ Improvements/Changes - Basic MFi controller support - Structure and View Controller usage grafted in from the DOOM-iOS2 repository and public user forks, unused code and embedded xcodeproj use eliminated -This commit only includes the changes made to the original source code and the original files. An "IB Images" directory is still required to build correctly, as is a `idGinzaNar-Md2.otf` font file along with `doom.wad` and `base.iPack`, but as those consist of copyrighted material, I have not included them in this commit. +This commit adds placeholder files for the "IB Images" folder and the `idGinzaNar-Md2.otf` font file. You will still need to provide your own copies of `doom.wad` and `base.iPack`. -My plan is to do a pull request to id Software on this commit and then make a second commit with placeholder menu art and font for others to be able to compile once they provide a `doom.wad` file and `base.iPack` file. The `doom.wad` file can be found in any installation of DOOM but the `base.iPack` file must be sourced from elsewhere or created with a utility that I have yet to write. \ No newline at end of file +You can find the file `doom.wad` in any installation of DOOM, available on [Steam](http://store.steampowered.com/app/2280/Ultimate_Doom/), [GOG](https://www.gog.com/game/the_ultimate_doom), and floppy disk from 1-800-IDGAMES (note: do not call 1-800-IDGAMES I don't know where it goes anymore). + +The file `base.iPack` is not included in any DOOM installation and is specific to the iOS port. I can't include it in this repo because it contains copyrighted material and I can't tell you where to find it either, but you will need to source it yourself. The history is included in this [lengthy article](http://schnapple.com/wolfenstein-3d-and-doom-on-ios-11/) I wrote on the subject. At some point I hope to have a utility that will let you construct a `base.iPack` file but for now I don't. + +This repo contains changes from id's [DOOM-iOS2](https://github.com/id-Software/DOOM-IOS2) repo (different than the parent of this repo), changes from the [FinalJudgement](https://github.com/JadingTsunami/FinalJudgment-iOS) repo by [JadingTsunami](https://github.com/JadingTsunami/), and [MFi controller code](https://github.com/TheRohans/DOOM-IOS2/commit/5a6b69d5e9821134f4013b069faef29190dcd7a1) from [TheRohans](https://github.com/TheRohans/). + +Have fun. For any questions I can be reached at tomkidd@gmail.com \ No newline at end of file diff --git a/code/.DS_Store b/code/.DS_Store index 2f0432a..bad19e7 100755 Binary files a/code/.DS_Store and b/code/.DS_Store differ diff --git a/code/iphone/.DS_Store b/code/iphone/.DS_Store index 5008ddf..1d91c25 100644 Binary files a/code/iphone/.DS_Store and b/code/iphone/.DS_Store differ diff --git a/code/iphone/DOOM_sigil_decal.png b/code/iphone/DOOM_sigil_decal.png deleted file mode 100644 index 2fc60ed..0000000 Binary files a/code/iphone/DOOM_sigil_decal.png and /dev/null differ diff --git a/code/iphone/Doom.xcodeproj/project.pbxproj b/code/iphone/Doom.xcodeproj/project.pbxproj index 63b70f0..a7f5f07 100755 --- a/code/iphone/Doom.xcodeproj/project.pbxproj +++ b/code/iphone/Doom.xcodeproj/project.pbxproj @@ -277,15 +277,12 @@ C81E0E5E13E076E400B1049A /* idGinzaNar-Md2.otf in Resources */ = {isa = PBXBuildFile; fileRef = C81E0E5D13E076E400B1049A /* idGinzaNar-Md2.otf */; }; C81E104C13E1CCA000B1049A /* BackButton.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104013E1CCA000B1049A /* BackButton.png */; }; C81E104D13E1CCA000B1049A /* Button.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104113E1CCA000B1049A /* Button.png */; }; - C81E104E13E1CCA000B1049A /* DOOM_sigil_decal.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104213E1CCA000B1049A /* DOOM_sigil_decal.png */; }; C81E104F13E1CCA000B1049A /* DoomLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104313E1CCA000B1049A /* DoomLogo.png */; }; C81E105013E1CCA000B1049A /* Easy.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104413E1CCA000B1049A /* Easy.png */; }; C81E105113E1CCA000B1049A /* Hard.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104513E1CCA000B1049A /* Hard.png */; }; - C81E105213E1CCA000B1049A /* MapOverlay.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104613E1CCA000B1049A /* MapOverlay.png */; }; C81E105313E1CCA000B1049A /* Medium.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104713E1CCA000B1049A /* Medium.png */; }; C81E105413E1CCA000B1049A /* MenuBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104813E1CCA000B1049A /* MenuBackground.png */; }; C81E105513E1CCA000B1049A /* Nightmare.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104913E1CCA000B1049A /* Nightmare.png */; }; - C81E105613E1CCA000B1049A /* ResumeButton.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104A13E1CCA000B1049A /* ResumeButton.png */; }; C81E105713E1CCA000B1049A /* SelectedBracket.png in Resources */ = {isa = PBXBuildFile; fileRef = C81E104B13E1CCA000B1049A /* SelectedBracket.png */; }; C8792ED813F5AFE5003D834F /* BackButton_Highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = C8792ED113F5AFE5003D834F /* BackButton_Highlighted.png */; }; C8792ED913F5AFE6003D834F /* Button_Highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = C8792ED213F5AFE5003D834F /* Button_Highlighted.png */; }; @@ -730,15 +727,12 @@ C81E0E5D13E076E400B1049A /* idGinzaNar-Md2.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "idGinzaNar-Md2.otf"; path = "../../idGinzaNar-Md2.otf"; sourceTree = SOURCE_ROOT; }; C81E104013E1CCA000B1049A /* BackButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BackButton.png; path = "../../IB Images/BackButton.png"; sourceTree = SOURCE_ROOT; }; C81E104113E1CCA000B1049A /* Button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Button.png; path = "../../IB Images/Button.png"; sourceTree = SOURCE_ROOT; }; - C81E104213E1CCA000B1049A /* DOOM_sigil_decal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DOOM_sigil_decal.png; path = "../../IB Images/DOOM_sigil_decal.png"; sourceTree = SOURCE_ROOT; }; C81E104313E1CCA000B1049A /* DoomLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DoomLogo.png; path = "../../IB Images/DoomLogo.png"; sourceTree = SOURCE_ROOT; }; C81E104413E1CCA000B1049A /* Easy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Easy.png; path = "../../IB Images/Easy.png"; sourceTree = SOURCE_ROOT; }; C81E104513E1CCA000B1049A /* Hard.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Hard.png; path = "../../IB Images/Hard.png"; sourceTree = SOURCE_ROOT; }; - C81E104613E1CCA000B1049A /* MapOverlay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = MapOverlay.png; path = "../../IB Images/MapOverlay.png"; sourceTree = SOURCE_ROOT; }; C81E104713E1CCA000B1049A /* Medium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Medium.png; path = "../../IB Images/Medium.png"; sourceTree = SOURCE_ROOT; }; C81E104813E1CCA000B1049A /* MenuBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = MenuBackground.png; path = "../../IB Images/MenuBackground.png"; sourceTree = SOURCE_ROOT; }; C81E104913E1CCA000B1049A /* Nightmare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Nightmare.png; path = "../../IB Images/Nightmare.png"; sourceTree = SOURCE_ROOT; }; - C81E104A13E1CCA000B1049A /* ResumeButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeButton.png; path = "../../IB Images/ResumeButton.png"; sourceTree = SOURCE_ROOT; }; C81E104B13E1CCA000B1049A /* SelectedBracket.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SelectedBracket.png; path = "../../IB Images/SelectedBracket.png"; sourceTree = SOURCE_ROOT; }; C8792ED113F5AFE5003D834F /* BackButton_Highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BackButton_Highlighted.png; path = "../../IB Images/BackButton_Highlighted.png"; sourceTree = SOURCE_ROOT; }; C8792ED213F5AFE5003D834F /* Button_Highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Button_Highlighted.png; path = "../../IB Images/Button_Highlighted.png"; sourceTree = SOURCE_ROOT; }; @@ -1300,56 +1294,53 @@ C84F820613D73D28006D01AB /* Interface Builder Images */ = { isa = PBXGroup; children = ( - C8139AB413FADA9D0094C2C0 /* SliderSkull~ipad.png */, - C8139AB213FADA800094C2C0 /* SliderSkull@2x.png */, C87931DE13F610B9003D834F /* AdvancedButton_Highlighted.png */, C87931DF13F610B9003D834F /* AdvancedButton.png */, + C8792ED113F5AFE5003D834F /* BackButton_Highlighted.png */, + C81E104013E1CCA000B1049A /* BackButton.png */, + C8792ED213F5AFE5003D834F /* Button_Highlighted.png */, + C81E104113E1CCA000B1049A /* Button.png */, + C879308513F5D8AA003D834F /* DifficultyBackground.png */, C87931E013F610B9003D834F /* Divide.png */, + C81E104313E1CCA000B1049A /* DoomLogo.png */, + C879308613F5D8AA003D834F /* DownArrow_Highlighted.png */, + C879308713F5D8AA003D834F /* DownArrow.png */, + C81E104413E1CCA000B1049A /* Easy.png */, + C87930E113F5EC1B003D834F /* Episode1Background_Highlighted.png */, + C879308813F5D8AA003D834F /* Episode1Background.png */, + C87930E213F5EC1B003D834F /* Episode2Background_Highlighted.png */, + C879308913F5D8AA003D834F /* Episode2Background.png */, + C87930E313F5EC1B003D834F /* Episode3Background_Highlighted.png */, + C879308A13F5D8AA003D834F /* Episode3Background.png */, + C87930E413F5EC1B003D834F /* Episode4Background_Highlighted.png */, + C879308B13F5D8AA003D834F /* Episode4Background.png */, + C81E104513E1CCA000B1049A /* Hard.png */, + C81E0E5D13E076E400B1049A /* idGinzaNar-Md2.otf */, C87931E113F610B9003D834F /* LayoutDualButton_Highlighted.png */, C87931E213F610B9003D834F /* LayoutDualButton.png */, C87931E313F610B9003D834F /* LayoutSingleButton_Highlighted.png */, C87931E413F610B9003D834F /* LayoutSingleButton.png */, C87931E513F610B9003D834F /* LayoutWheelButton_Highlighted.png */, C87931E613F610B9003D834F /* LayoutWheelButton.png */, + C81E104713E1CCA000B1049A /* Medium.png */, + C81E104813E1CCA000B1049A /* MenuBackground.png */, + C879308C13F5D8AA003D834F /* MissonBackground.png */, + C8792ED313F5AFE5003D834F /* NextButton_Highlighted.png */, + C8792ED413F5AFE5003D834F /* NextButton.png */, + C81E104913E1CCA000B1049A /* Nightmare.png */, + C81E104B13E1CCA000B1049A /* SelectedBracket.png */, C87931E713F610B9003D834F /* SettingsButton_Highlighted.png */, C87931E813F610B9003D834F /* SettingsButton.png */, C87931E913F610B9003D834F /* SliderBackground.png */, C87931EA13F610B9003D834F /* SliderBar.png */, C87931EB13F610B9003D834F /* SliderSkull.png */, - C87930E113F5EC1B003D834F /* Episode1Background_Highlighted.png */, - C87930E213F5EC1B003D834F /* Episode2Background_Highlighted.png */, - C87930E313F5EC1B003D834F /* Episode3Background_Highlighted.png */, - C87930E413F5EC1B003D834F /* Episode4Background_Highlighted.png */, - C879308513F5D8AA003D834F /* DifficultyBackground.png */, - C879308613F5D8AA003D834F /* DownArrow_Highlighted.png */, - C879308713F5D8AA003D834F /* DownArrow.png */, - C879308813F5D8AA003D834F /* Episode1Background.png */, - C879308913F5D8AA003D834F /* Episode2Background.png */, - C879308A13F5D8AA003D834F /* Episode3Background.png */, - C879308B13F5D8AA003D834F /* Episode4Background.png */, - C879308C13F5D8AA003D834F /* MissonBackground.png */, - C879308D13F5D8AA003D834F /* UpArrow_Highlighted.png */, - C879308E13F5D8AA003D834F /* UpArrow.png */, - C8792ED113F5AFE5003D834F /* BackButton_Highlighted.png */, - C8792ED213F5AFE5003D834F /* Button_Highlighted.png */, - C8792ED313F5AFE5003D834F /* NextButton_Highlighted.png */, - C8792ED413F5AFE5003D834F /* NextButton.png */, + C8139AB213FADA800094C2C0 /* SliderSkull@2x.png */, + C8139AB413FADA9D0094C2C0 /* SliderSkull~ipad.png */, C8792ED513F5AFE5003D834F /* SubMenuBackground.png */, C8792ED613F5AFE5003D834F /* SubMenuButton_Highlighted.png */, C8792ED713F5AFE5003D834F /* SubMenuButton.png */, - C81E104013E1CCA000B1049A /* BackButton.png */, - C81E104113E1CCA000B1049A /* Button.png */, - C81E104213E1CCA000B1049A /* DOOM_sigil_decal.png */, - C81E104313E1CCA000B1049A /* DoomLogo.png */, - C81E104413E1CCA000B1049A /* Easy.png */, - C81E104513E1CCA000B1049A /* Hard.png */, - C81E104613E1CCA000B1049A /* MapOverlay.png */, - C81E104713E1CCA000B1049A /* Medium.png */, - C81E104813E1CCA000B1049A /* MenuBackground.png */, - C81E104913E1CCA000B1049A /* Nightmare.png */, - C81E104A13E1CCA000B1049A /* ResumeButton.png */, - C81E104B13E1CCA000B1049A /* SelectedBracket.png */, - C81E0E5D13E076E400B1049A /* idGinzaNar-Md2.otf */, + C879308D13F5D8AA003D834F /* UpArrow_Highlighted.png */, + C879308E13F5D8AA003D834F /* UpArrow.png */, ); name = "Interface Builder Images"; sourceTree = ""; @@ -1533,7 +1524,6 @@ A1E89C902067469D00760204 /* CreditsMenuView.xib in Resources */, A1A63DC220562B2B000955AE /* CreditsMenuView~ipad.xib in Resources */, A1A63DC420562B2B000955AE /* SecretMenuView.xib in Resources */, - C81E104E13E1CCA000B1049A /* DOOM_sigil_decal.png in Resources */, A1A184282063E63200302393 /* EpisodeCell.xib in Resources */, C81E104F13E1CCA000B1049A /* DoomLogo.png in Resources */, A1A63DC320562B2B000955AE /* ControlsMenuView~ipad.xib in Resources */, @@ -1543,13 +1533,11 @@ C81E105113E1CCA000B1049A /* Hard.png in Resources */, A1A63DF420562B76000955AE /* MainMenuView~ipad.xib in Resources */, A1A63E1A20562FC4000955AE /* DOOM_144.png in Resources */, - C81E105213E1CCA000B1049A /* MapOverlay.png in Resources */, C81E105313E1CCA000B1049A /* Medium.png in Resources */, C81E105413E1CCA000B1049A /* MenuBackground.png in Resources */, A1A63E3320563345000955AE /* r_drawcolpipeline.inl in Resources */, A1A63DBF20562B2B000955AE /* ControlsMenuView.xib in Resources */, C81E105513E1CCA000B1049A /* Nightmare.png in Resources */, - C81E105613E1CCA000B1049A /* ResumeButton.png in Resources */, A1A63DE720562B76000955AE /* EpisodeMenuView.xib in Resources */, A1A63E3620563345000955AE /* Makefile.am in Resources */, C81E105713E1CCA000B1049A /* SelectedBracket.png in Resources */, diff --git a/code/iphone/Doom.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate b/code/iphone/Doom.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate index 5b8cab2..8c6c5d2 100644 Binary files a/code/iphone/Doom.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate and b/code/iphone/Doom.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/idGinzaNar-Md2.otf b/idGinzaNar-Md2.otf new file mode 100644 index 0000000..6ac87c4 Binary files /dev/null and b/idGinzaNar-Md2.otf differ