diff --git a/Info.plist b/Info.plist index 556d348..6e654be 100644 --- a/Info.plist +++ b/Info.plist @@ -8,14 +8,10 @@ Dink HD CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - icon.png - CFBundleIconFiles - - icon.png - Icon-72.png - icon@2x.png - + CFBundleIcons + + CFBundleIcons~ipad + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -25,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.8.8 + 1.89 CFBundleSignature ???? CFBundleVersion - 162 + 163 LSRequiresIPhoneOS NSMainNibFile @@ -38,6 +34,10 @@ MainWindow-iPad UIFileSharingEnabled + UILaunchStoryboardName + LaunchScreen + UIRequiresFullScreen + UIStatusBarHidden UISupportedInterfaceOrientations diff --git a/RTDink.xcodeproj/project.pbxproj b/RTDink.xcodeproj/project.pbxproj index 715dacb..4544efa 100644 --- a/RTDink.xcodeproj/project.pbxproj +++ b/RTDink.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ 5D0CC9430F79E0E1004D9AE9 /* GLESUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D0CC93E0F79E0E1004D9AE9 /* GLESUtils.cpp */; }; 5D0CC9440F79E0E1004D9AE9 /* ResourceUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D0CC9400F79E0E1004D9AE9 /* ResourceUtils.cpp */; }; 5D0CC94E0F79E181004D9AE9 /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D0CC94C0F79E181004D9AE9 /* Surface.cpp */; }; - 5D10469E1224D9E700BFC249 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 5D10469D1224D9E700BFC249 /* Icon-72.png */; }; 5D1046C31225321500BFC249 /* SliderComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D1046C21225321500BFC249 /* SliderComponent.cpp */; }; 5D1047911227777000BFC249 /* SelectButtonWithCustomInputComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D1047901227777000BFC249 /* SelectButtonWithCustomInputComponent.cpp */; }; 5D17BA530FBD5DB5009D74BC /* DebugMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D17BA510FBD5DB5009D74BC /* DebugMenu.cpp */; }; @@ -90,6 +89,8 @@ 5D30635F0FD890B0009DE600 /* MathUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D30635D0FD890B0009DE600 /* MathUtils.cpp */; }; 5D3063660FD890CB009DE600 /* AudioManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D3063600FD890CB009DE600 /* AudioManager.cpp */; }; 5D3063AB0FD8B00A009DE600 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D3063AA0FD8B00A009DE600 /* OpenAL.framework */; }; + 5D3A9D491F99CA3900807281 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5D3A9D481F99CA3900807281 /* LaunchScreen.storyboard */; }; + 5D3A9D4C1F99CE7400807281 /* launch_screen.png in Resources */ = {isa = PBXBuildFile; fileRef = 5D3A9D4B1F99CE7400807281 /* launch_screen.png */; }; 5D4760560FBA98B3008400E3 /* Button2DComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D4760500FBA98B3008400E3 /* Button2DComponent.cpp */; }; 5D4760580FBA98B3008400E3 /* TouchHandlerComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D4760540FBA98B3008400E3 /* TouchHandlerComponent.cpp */; }; 5D4760810FBB1CE0008400E3 /* EntityUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D47607C0FBB1CE0008400E3 /* EntityUtils.cpp */; }; @@ -99,9 +100,6 @@ 5D6124761F57D180007A70BE /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D6124751F57D180007A70BE /* Reachability.m */; }; 5D66E8E410F3124D0080F9B3 /* EnterURLMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D66E8E210F3124D0080F9B3 /* EnterURLMenu.cpp */; }; 5D6E8C0F121A7515008F1D26 /* AboutMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D6E8C0E121A7515008F1D26 /* AboutMenu.cpp */; }; - 5D6E8C1B121A75F2008F1D26 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5D6E8C18121A75F2008F1D26 /* icon@2x.png */; }; - 5D6E8C1D121A75F2008F1D26 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5D6E8C1A121A75F2008F1D26 /* Default@2x.png */; }; - 5D6E8C1F121A765F008F1D26 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 5D6E8C1E121A765F008F1D26 /* Default-Landscape.png */; }; 5D6E94BF121CDB54008F1D26 /* ReadTextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D6E94BC121CDB54008F1D26 /* ReadTextMenu.cpp */; }; 5D6E94C0121CDB54008F1D26 /* BrowseMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D6E94BE121CDB54008F1D26 /* BrowseMenu.cpp */; }; 5D7895FE10E0C47B0061183D /* LoadMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D7895FC10E0C47B0061183D /* LoadMenu.cpp */; }; @@ -181,8 +179,6 @@ 5DBFC70611144AFD009195F6 /* vec4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DBFC70311144AFD009195F6 /* vec4.cpp */; }; 5DC692B20E94852F00E5AC44 /* App.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DC692B10E94852F00E5AC44 /* App.cpp */; }; 5DC6D63F0EA47C0E001482E0 /* interface in Resources */ = {isa = PBXBuildFile; fileRef = 5DC6D63B0EA47C0E001482E0 /* interface */; }; - 5DC6D77D0EA4B397001482E0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DC6D77B0EA4B397001482E0 /* Default.png */; }; - 5DC6D77E0EA4B397001482E0 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DC6D77C0EA4B397001482E0 /* icon.png */; }; 5DD878071261BCB900EB4365 /* iOSUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878051261BCB900EB4365 /* iOSUtils.mm */; }; 5DD878101261BCD700EB4365 /* MyViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878091261BCD700EB4365 /* MyViewController.mm */; }; 5DD878111261BCD700EB4365 /* MyAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DD8780B1261BCD700EB4365 /* MyAppDelegate.mm */; }; @@ -196,9 +192,45 @@ 5DD878261261BDC000EB4365 /* FileManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878201261BDC000EB4365 /* FileManager.cpp */; }; 5DD878391261BEC500EB4365 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878351261BEC500EB4365 /* unzip.c */; }; 5DD8783A1261BEC500EB4365 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878371261BEC500EB4365 /* ioapi.c */; }; - 5DDA4DEF1F8609EF0079D738 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA4DEE1F8609EE0079D738 /* Default-568h@2x.png */; }; 5DDA4DF21F862F3F0079D738 /* RenderScissorComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA4DF01F862F3E0079D738 /* RenderScissorComponent.cpp */; }; 5DDA5C7A1F9619E60079D738 /* dmods in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5C791F9619E60079D738 /* dmods */; }; + 5DDA5C8D1F974EAA0079D738 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C7C1F974EA70079D738 /* png.c */; }; + 5DDA5C8E1F974EAA0079D738 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C7D1F974EA70079D738 /* pngerror.c */; }; + 5DDA5C8F1F974EAA0079D738 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C7E1F974EA70079D738 /* pngtrans.c */; }; + 5DDA5C901F974EAA0079D738 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C7F1F974EA70079D738 /* pngrutil.c */; }; + 5DDA5C911F974EAA0079D738 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C801F974EA70079D738 /* pngget.c */; }; + 5DDA5C921F974EAA0079D738 /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C811F974EA80079D738 /* pngrio.c */; }; + 5DDA5C931F974EAA0079D738 /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C821F974EA80079D738 /* pngwtran.c */; }; + 5DDA5C941F974EAA0079D738 /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C831F974EA80079D738 /* pngpread.c */; }; + 5DDA5C951F974EAA0079D738 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C841F974EA80079D738 /* pngset.c */; }; + 5DDA5C961F974EAA0079D738 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C851F974EA80079D738 /* pngwio.c */; }; + 5DDA5C971F974EAA0079D738 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C861F974EA80079D738 /* pngmem.c */; }; + 5DDA5C981F974EAA0079D738 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C871F974EA90079D738 /* pngwutil.c */; }; + 5DDA5C991F974EAA0079D738 /* pngvcrd.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C8A1F974EA90079D738 /* pngvcrd.c */; }; + 5DDA5C9A1F974EAA0079D738 /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C8B1F974EA90079D738 /* pngread.c */; }; + 5DDA5C9B1F974EAA0079D738 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5C8C1F974EA90079D738 /* pngrtran.c */; }; + 5DDA5CA31F9763840079D738 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA5CA21F9763840079D738 /* pngwrite.c */; }; + 5DDA5CA91F988FBD0079D738 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CA81F988FBD0079D738 /* Images.xcassets */; }; + 5DDA5CF71F99C5250079D738 /* Icon-1024.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE31F99C5220079D738 /* Icon-1024.png */; }; + 5DDA5CF81F99C5250079D738 /* Icon-Small-40@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE41F99C5220079D738 /* Icon-Small-40@2x.png */; }; + 5DDA5CF91F99C5250079D738 /* Icon-60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE51F99C5220079D738 /* Icon-60@3x.png */; }; + 5DDA5CFA1F99C5250079D738 /* Icon-Small-40@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE61F99C5230079D738 /* Icon-Small-40@3x.png */; }; + 5DDA5CFB1F99C5250079D738 /* Icon-Small@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE71F99C5230079D738 /* Icon-Small@3x.png */; }; + 5DDA5CFC1F99C5250079D738 /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE81F99C5230079D738 /* Icon-Small.png */; }; + 5DDA5CFD1F99C5250079D738 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CE91F99C5230079D738 /* Icon-72@2x.png */; }; + 5DDA5CFE1F99C5250079D738 /* Icon-iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CEA1F99C5230079D738 /* Icon-iTunesArtwork.png */; }; + 5DDA5CFF1F99C5250079D738 /* Icon-Small-50@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CEB1F99C5230079D738 /* Icon-Small-50@2x.png */; }; + 5DDA5D001F99C5250079D738 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CEC1F99C5230079D738 /* Icon-76.png */; }; + 5DDA5D011F99C5250079D738 /* Icon-60.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CED1F99C5230079D738 /* Icon-60.png */; }; + 5DDA5D021F99C5250079D738 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CEE1F99C5240079D738 /* Icon.png */; }; + 5DDA5D031F99C5250079D738 /* Icon-76@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CEF1F99C5240079D738 /* Icon-76@2x.png */; }; + 5DDA5D041F99C5250079D738 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF01F99C5240079D738 /* Icon-72.png */; }; + 5DDA5D051F99C5250079D738 /* Icon-60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF11F99C5240079D738 /* Icon-60@2x.png */; }; + 5DDA5D061F99C5250079D738 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF21F99C5240079D738 /* Icon@2x.png */; }; + 5DDA5D071F99C5250079D738 /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF31F99C5240079D738 /* Icon-Small-50.png */; }; + 5DDA5D081F99C5250079D738 /* Icon-167.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF41F99C5250079D738 /* Icon-167.png */; }; + 5DDA5D091F99C5250079D738 /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF51F99C5250079D738 /* Icon-Small@2x.png */; }; + 5DDA5D0A1F99C5250079D738 /* Icon-Small-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5CF61F99C5250079D738 /* Icon-Small-40.png */; }; 5DDEC25F1294E63200C42C5E /* ExpiredMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDEC25E1294E63200C42C5E /* ExpiredMenu.cpp */; }; 5DE39F1114C3F9B300163EA1 /* dink in Resources */ = {isa = PBXBuildFile; fileRef = 5DE39F1014C3F9B300163EA1 /* dink */; }; 5DE5068310EC800400CEAA3C /* FFReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE5068110EC800400CEAA3C /* FFReader.cpp */; }; @@ -271,7 +303,6 @@ 5D0CC94B0F79E181004D9AE9 /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitmap.h; path = ../shared/Renderer/bitmap.h; sourceTree = SOURCE_ROOT; }; 5D0CC94C0F79E181004D9AE9 /* Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Surface.cpp; path = ../shared/Renderer/Surface.cpp; sourceTree = SOURCE_ROOT; }; 5D0CC94D0F79E181004D9AE9 /* Surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Surface.h; path = ../shared/Renderer/Surface.h; sourceTree = SOURCE_ROOT; }; - 5D10469D1224D9E700BFC249 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "media/Icon-72.png"; sourceTree = ""; }; 5D1046C11225321500BFC249 /* SliderComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SliderComponent.h; path = Entity/SliderComponent.h; sourceTree = ""; }; 5D1046C21225321500BFC249 /* SliderComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SliderComponent.cpp; path = Entity/SliderComponent.cpp; sourceTree = ""; }; 5D10478F1227777000BFC249 /* SelectButtonWithCustomInputComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectButtonWithCustomInputComponent.h; path = Entity/SelectButtonWithCustomInputComponent.h; sourceTree = ""; }; @@ -360,6 +391,8 @@ 5D3063600FD890CB009DE600 /* AudioManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AudioManager.cpp; path = Audio/AudioManager.cpp; sourceTree = ""; }; 5D3063610FD890CB009DE600 /* AudioManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioManager.h; path = Audio/AudioManager.h; sourceTree = ""; }; 5D3063AA0FD8B00A009DE600 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; + 5D3A9D481F99CA3900807281 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; + 5D3A9D4B1F99CE7400807281 /* launch_screen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = launch_screen.png; path = media/launch_screen.png; sourceTree = ""; }; 5D4760500FBA98B3008400E3 /* Button2DComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Button2DComponent.cpp; path = Entity/Button2DComponent.cpp; sourceTree = ""; }; 5D4760510FBA98B3008400E3 /* Button2DComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Button2DComponent.h; path = Entity/Button2DComponent.h; sourceTree = ""; }; 5D4760540FBA98B3008400E3 /* TouchHandlerComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TouchHandlerComponent.cpp; path = Entity/TouchHandlerComponent.cpp; sourceTree = ""; }; @@ -378,9 +411,6 @@ 5D66E8E310F3124D0080F9B3 /* EnterURLMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EnterURLMenu.h; path = source/GUI/EnterURLMenu.h; sourceTree = ""; }; 5D6E8C0D121A7515008F1D26 /* AboutMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutMenu.h; path = source/GUI/AboutMenu.h; sourceTree = ""; }; 5D6E8C0E121A7515008F1D26 /* AboutMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AboutMenu.cpp; path = source/GUI/AboutMenu.cpp; sourceTree = ""; }; - 5D6E8C18121A75F2008F1D26 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon@2x.png"; path = "media/icon@2x.png"; sourceTree = ""; }; - 5D6E8C1A121A75F2008F1D26 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "media/Default@2x.png"; sourceTree = ""; }; - 5D6E8C1E121A765F008F1D26 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "Resources-iPad/Default-Landscape.png"; sourceTree = ""; }; 5D6E94BB121CDB54008F1D26 /* ReadTextMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReadTextMenu.h; path = source/GUI/ReadTextMenu.h; sourceTree = ""; }; 5D6E94BC121CDB54008F1D26 /* ReadTextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReadTextMenu.cpp; path = source/GUI/ReadTextMenu.cpp; sourceTree = ""; }; 5D6E94BD121CDB54008F1D26 /* BrowseMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowseMenu.h; path = source/GUI/BrowseMenu.h; sourceTree = ""; }; @@ -515,8 +545,6 @@ 5DC692B00E94852F00E5AC44 /* App.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = App.h; path = source/App.h; sourceTree = ""; }; 5DC692B10E94852F00E5AC44 /* App.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = App.cpp; path = source/App.cpp; sourceTree = ""; }; 5DC6D63B0EA47C0E001482E0 /* interface */ = {isa = PBXFileReference; lastKnownFileType = folder; name = interface; path = bin/interface; sourceTree = ""; }; - 5DC6D77B0EA4B397001482E0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = media/Default.png; sourceTree = ""; }; - 5DC6D77C0EA4B397001482E0 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = media/icon.png; sourceTree = ""; }; 5DD878041261BCB800EB4365 /* PlatformSetupIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformSetupIOS.h; path = iOS/PlatformSetupIOS.h; sourceTree = ""; }; 5DD878051261BCB900EB4365 /* iOSUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = iOSUtils.mm; path = iOS/iOSUtils.mm; sourceTree = ""; }; 5DD878061261BCB900EB4365 /* iOSUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iOSUtils.h; path = iOS/iOSUtils.h; sourceTree = ""; }; @@ -545,10 +573,48 @@ 5DD878371261BEC500EB4365 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = util/unzip/ioapi.c; sourceTree = ""; }; 5DD878381261BEC500EB4365 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = util/unzip/crypt.h; sourceTree = ""; }; 5DD9544D0E960962004E403D /* PlatformSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformSetup.h; sourceTree = ""; }; - 5DDA4DEE1F8609EE0079D738 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 5DDA4DF01F862F3E0079D738 /* RenderScissorComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RenderScissorComponent.cpp; path = Entity/RenderScissorComponent.cpp; sourceTree = ""; }; 5DDA4DF11F862F3F0079D738 /* RenderScissorComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RenderScissorComponent.h; path = Entity/RenderScissorComponent.h; sourceTree = ""; }; 5DDA5C791F9619E60079D738 /* dmods */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dmods; path = bin/dmods; sourceTree = ""; }; + 5DDA5C7C1F974EA70079D738 /* png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/png.c; sourceTree = ""; }; + 5DDA5C7D1F974EA70079D738 /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngerror.c; sourceTree = ""; }; + 5DDA5C7E1F974EA70079D738 /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngtrans.c; sourceTree = ""; }; + 5DDA5C7F1F974EA70079D738 /* pngrutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngrutil.c; sourceTree = ""; }; + 5DDA5C801F974EA70079D738 /* pngget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngget.c; sourceTree = ""; }; + 5DDA5C811F974EA80079D738 /* pngrio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngrio.c; sourceTree = ""; }; + 5DDA5C821F974EA80079D738 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngwtran.c; sourceTree = ""; }; + 5DDA5C831F974EA80079D738 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngpread.c; sourceTree = ""; }; + 5DDA5C841F974EA80079D738 /* pngset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngset.c; sourceTree = ""; }; + 5DDA5C851F974EA80079D738 /* pngwio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngwio.c; sourceTree = ""; }; + 5DDA5C861F974EA80079D738 /* pngmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngmem.c; sourceTree = ""; }; + 5DDA5C871F974EA90079D738 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngwutil.c; sourceTree = ""; }; + 5DDA5C881F974EA90079D738 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../shared/Irrlicht/source/Irrlicht/libpng/png.h; sourceTree = ""; }; + 5DDA5C891F974EA90079D738 /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngconf.h; sourceTree = ""; }; + 5DDA5C8A1F974EA90079D738 /* pngvcrd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngvcrd.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngvcrd.c; sourceTree = ""; }; + 5DDA5C8B1F974EA90079D738 /* pngread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngread.c; sourceTree = ""; }; + 5DDA5C8C1F974EA90079D738 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngrtran.c; sourceTree = ""; }; + 5DDA5CA21F9763840079D738 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../shared/Irrlicht/source/Irrlicht/libpng/pngwrite.c; sourceTree = ""; }; + 5DDA5CA81F988FBD0079D738 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RTDink/Images.xcassets; sourceTree = ""; }; + 5DDA5CE31F99C5220079D738 /* Icon-1024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-1024.png"; path = "iOSIcons/Icon-1024.png"; sourceTree = ""; }; + 5DDA5CE41F99C5220079D738 /* Icon-Small-40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-40@2x.png"; path = "iOSIcons/Icon-Small-40@2x.png"; sourceTree = ""; }; + 5DDA5CE51F99C5220079D738 /* Icon-60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-60@3x.png"; path = "iOSIcons/Icon-60@3x.png"; sourceTree = ""; }; + 5DDA5CE61F99C5230079D738 /* Icon-Small-40@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-40@3x.png"; path = "iOSIcons/Icon-Small-40@3x.png"; sourceTree = ""; }; + 5DDA5CE71F99C5230079D738 /* Icon-Small@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small@3x.png"; path = "iOSIcons/Icon-Small@3x.png"; sourceTree = ""; }; + 5DDA5CE81F99C5230079D738 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "iOSIcons/Icon-Small.png"; sourceTree = ""; }; + 5DDA5CE91F99C5230079D738 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72@2x.png"; path = "iOSIcons/Icon-72@2x.png"; sourceTree = ""; }; + 5DDA5CEA1F99C5230079D738 /* Icon-iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-iTunesArtwork.png"; path = "iOSIcons/Icon-iTunesArtwork.png"; sourceTree = ""; }; + 5DDA5CEB1F99C5230079D738 /* Icon-Small-50@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50@2x.png"; path = "iOSIcons/Icon-Small-50@2x.png"; sourceTree = ""; }; + 5DDA5CEC1F99C5230079D738 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-76.png"; path = "iOSIcons/Icon-76.png"; sourceTree = ""; }; + 5DDA5CED1F99C5230079D738 /* Icon-60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-60.png"; path = "iOSIcons/Icon-60.png"; sourceTree = ""; }; + 5DDA5CEE1F99C5240079D738 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = iOSIcons/Icon.png; sourceTree = ""; }; + 5DDA5CEF1F99C5240079D738 /* Icon-76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-76@2x.png"; path = "iOSIcons/Icon-76@2x.png"; sourceTree = ""; }; + 5DDA5CF01F99C5240079D738 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "iOSIcons/Icon-72.png"; sourceTree = ""; }; + 5DDA5CF11F99C5240079D738 /* Icon-60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-60@2x.png"; path = "iOSIcons/Icon-60@2x.png"; sourceTree = ""; }; + 5DDA5CF21F99C5240079D738 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "iOSIcons/Icon@2x.png"; sourceTree = ""; }; + 5DDA5CF31F99C5240079D738 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "iOSIcons/Icon-Small-50.png"; sourceTree = ""; }; + 5DDA5CF41F99C5250079D738 /* Icon-167.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-167.png"; path = "iOSIcons/Icon-167.png"; sourceTree = ""; }; + 5DDA5CF51F99C5250079D738 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small@2x.png"; path = "iOSIcons/Icon-Small@2x.png"; sourceTree = ""; }; + 5DDA5CF61F99C5250079D738 /* Icon-Small-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-40.png"; path = "iOSIcons/Icon-Small-40.png"; sourceTree = ""; }; 5DDEC25D1294E63200C42C5E /* ExpiredMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExpiredMenu.h; path = source/GUI/ExpiredMenu.h; sourceTree = ""; }; 5DDEC25E1294E63200C42C5E /* ExpiredMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExpiredMenu.cpp; path = source/GUI/ExpiredMenu.cpp; sourceTree = ""; }; 5DE39F1014C3F9B300163EA1 /* dink */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dink; path = bin/dink; sourceTree = ""; }; @@ -629,7 +695,6 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 5DDA4DEE1F8609EE0079D738 /* Default-568h@2x.png */, 5D2F53D515A7F29700B8CED1 /* SystemConfiguration.framework */, 5DC692580E947EBD00E5AC44 /* shared */, 29B97315FDCFA39411CA2CEA /* Source */, @@ -659,18 +724,17 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 5D3A9D4A1F99CC3A00807281 /* Launch */, + 5DDA5CAE1F99C1110079D738 /* icons */, + 5DDA5CA81F988FBD0079D738 /* Images.xcassets */, 5DDA5C791F9619E60079D738 /* dmods */, 5DE39F1014C3F9B300163EA1 /* dink */, - 5D10469D1224D9E700BFC249 /* Icon-72.png */, - 5D6E8C18121A75F2008F1D26 /* icon@2x.png */, - 5D6E8C1A121A75F2008F1D26 /* Default@2x.png */, 5D7C329E10BBB755009C5324 /* game */, 5D82C8C20FF4C1500082EBE7 /* audio */, - 5DC6D77B0EA4B397001482E0 /* Default.png */, - 5DC6D77C0EA4B397001482E0 /* icon.png */, 5DC6D63B0EA47C0E001482E0 /* interface */, 28AD733E0D9D9553002E5188 /* MainWindow.xib */, 8D1107310486CEB800E47090 /* Info.plist */, + 5D3A9D481F99CA3900807281 /* LaunchScreen.storyboard */, ); name = Resources; sourceTree = ""; @@ -695,6 +759,7 @@ 5D0CC94A0F79E162004D9AE9 /* Renderer */ = { isa = PBXGroup; children = ( + 5DDA5C7B1F974E350079D738 /* libpng */, 5D2F53DB15A7F5DB00B8CED1 /* libJPg */, 5D2F53D815A7F5D700B8CED1 /* JPGSurfaceLoader.h */, 5D2F53D915A7F5D700B8CED1 /* JPGSurfaceLoader.cpp */, @@ -806,6 +871,14 @@ name = Audio; sourceTree = ""; }; + 5D3A9D4A1F99CC3A00807281 /* Launch */ = { + isa = PBXGroup; + children = ( + 5D3A9D4B1F99CE7400807281 /* launch_screen.png */, + ); + name = Launch; + sourceTree = ""; + }; 5D4760860FBB1D04008400E3 /* GUI */ = { isa = PBXGroup; children = ( @@ -1022,7 +1095,6 @@ 5D9BA546116232820008E859 /* Resources-iPad */ = { isa = PBXGroup; children = ( - 5D6E8C1E121A765F008F1D26 /* Default-Landscape.png */, 5D9BA547116232830008E859 /* MainWindow-iPad.xib */, ); name = "Resources-iPad"; @@ -1160,6 +1232,58 @@ name = unzip; sourceTree = ""; }; + 5DDA5C7B1F974E350079D738 /* libpng */ = { + isa = PBXGroup; + children = ( + 5DDA5CA21F9763840079D738 /* pngwrite.c */, + 5DDA5C7C1F974EA70079D738 /* png.c */, + 5DDA5C881F974EA90079D738 /* png.h */, + 5DDA5C891F974EA90079D738 /* pngconf.h */, + 5DDA5C7D1F974EA70079D738 /* pngerror.c */, + 5DDA5C801F974EA70079D738 /* pngget.c */, + 5DDA5C861F974EA80079D738 /* pngmem.c */, + 5DDA5C831F974EA80079D738 /* pngpread.c */, + 5DDA5C8B1F974EA90079D738 /* pngread.c */, + 5DDA5C811F974EA80079D738 /* pngrio.c */, + 5DDA5C8C1F974EA90079D738 /* pngrtran.c */, + 5DDA5C7F1F974EA70079D738 /* pngrutil.c */, + 5DDA5C841F974EA80079D738 /* pngset.c */, + 5DDA5C7E1F974EA70079D738 /* pngtrans.c */, + 5DDA5C8A1F974EA90079D738 /* pngvcrd.c */, + 5DDA5C851F974EA80079D738 /* pngwio.c */, + 5DDA5C821F974EA80079D738 /* pngwtran.c */, + 5DDA5C871F974EA90079D738 /* pngwutil.c */, + ); + name = libpng; + sourceTree = ""; + }; + 5DDA5CAE1F99C1110079D738 /* icons */ = { + isa = PBXGroup; + children = ( + 5DDA5CED1F99C5230079D738 /* Icon-60.png */, + 5DDA5CF11F99C5240079D738 /* Icon-60@2x.png */, + 5DDA5CE51F99C5220079D738 /* Icon-60@3x.png */, + 5DDA5CF01F99C5240079D738 /* Icon-72.png */, + 5DDA5CE91F99C5230079D738 /* Icon-72@2x.png */, + 5DDA5CEC1F99C5230079D738 /* Icon-76.png */, + 5DDA5CEF1F99C5240079D738 /* Icon-76@2x.png */, + 5DDA5CF41F99C5250079D738 /* Icon-167.png */, + 5DDA5CE31F99C5220079D738 /* Icon-1024.png */, + 5DDA5CEA1F99C5230079D738 /* Icon-iTunesArtwork.png */, + 5DDA5CF61F99C5250079D738 /* Icon-Small-40.png */, + 5DDA5CE41F99C5220079D738 /* Icon-Small-40@2x.png */, + 5DDA5CE61F99C5230079D738 /* Icon-Small-40@3x.png */, + 5DDA5CF31F99C5240079D738 /* Icon-Small-50.png */, + 5DDA5CEB1F99C5230079D738 /* Icon-Small-50@2x.png */, + 5DDA5CE81F99C5230079D738 /* Icon-Small.png */, + 5DDA5CF51F99C5250079D738 /* Icon-Small@2x.png */, + 5DDA5CE71F99C5230079D738 /* Icon-Small@3x.png */, + 5DDA5CEE1F99C5240079D738 /* Icon.png */, + 5DDA5CF21F99C5240079D738 /* Icon@2x.png */, + ); + name = icons; + sourceTree = ""; + }; 5DE84C050FB9466F00DDAE64 /* ClanLib */ = { isa = PBXGroup; children = ( @@ -1297,21 +1421,37 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 5DDA5CFF1F99C5250079D738 /* Icon-Small-50@2x.png in Resources */, + 5DDA5CF91F99C5250079D738 /* Icon-60@3x.png in Resources */, 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, + 5D3A9D491F99CA3900807281 /* LaunchScreen.storyboard in Resources */, + 5DDA5D041F99C5250079D738 /* Icon-72.png in Resources */, + 5DDA5CF71F99C5250079D738 /* Icon-1024.png in Resources */, + 5DDA5CA91F988FBD0079D738 /* Images.xcassets in Resources */, 5DC6D63F0EA47C0E001482E0 /* interface in Resources */, - 5DC6D77D0EA4B397001482E0 /* Default.png in Resources */, 5DDA5C7A1F9619E60079D738 /* dmods in Resources */, - 5DC6D77E0EA4B397001482E0 /* icon.png in Resources */, + 5DDA5CF81F99C5250079D738 /* Icon-Small-40@2x.png in Resources */, 5D8272910FA9DEE00097DE6A /* Entitlements.plist in Resources */, + 5DDA5CFC1F99C5250079D738 /* Icon-Small.png in Resources */, + 5DDA5D0A1F99C5250079D738 /* Icon-Small-40.png in Resources */, + 5DDA5D011F99C5250079D738 /* Icon-60.png in Resources */, + 5DDA5CFE1F99C5250079D738 /* Icon-iTunesArtwork.png in Resources */, + 5DDA5D091F99C5250079D738 /* Icon-Small@2x.png in Resources */, + 5DDA5D021F99C5250079D738 /* Icon.png in Resources */, + 5DDA5CFA1F99C5250079D738 /* Icon-Small-40@3x.png in Resources */, + 5DDA5CFD1F99C5250079D738 /* Icon-72@2x.png in Resources */, 5D82C8C50FF4C1500082EBE7 /* audio in Resources */, + 5DDA5D031F99C5250079D738 /* Icon-76@2x.png in Resources */, 5D7C32B910BBB755009C5324 /* game in Resources */, + 5DDA5D061F99C5250079D738 /* Icon@2x.png in Resources */, + 5D3A9D4C1F99CE7400807281 /* launch_screen.png in Resources */, 5D9BA548116232830008E859 /* MainWindow-iPad.xib in Resources */, - 5DDA4DEF1F8609EF0079D738 /* Default-568h@2x.png in Resources */, - 5D6E8C1B121A75F2008F1D26 /* icon@2x.png in Resources */, - 5D6E8C1D121A75F2008F1D26 /* Default@2x.png in Resources */, - 5D6E8C1F121A765F008F1D26 /* Default-Landscape.png in Resources */, - 5D10469E1224D9E700BFC249 /* Icon-72.png in Resources */, + 5DDA5D071F99C5250079D738 /* Icon-Small-50.png in Resources */, + 5DDA5D001F99C5250079D738 /* Icon-76.png in Resources */, + 5DDA5CFB1F99C5250079D738 /* Icon-Small@3x.png in Resources */, 5DE39F1114C3F9B300163EA1 /* dink in Resources */, + 5DDA5D081F99C5250079D738 /* Icon-167.png in Resources */, + 5DDA5D051F99C5250079D738 /* Icon-60@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1325,6 +1465,7 @@ 5DC692B20E94852F00E5AC44 /* App.cpp in Sources */, 5DFE105B0F60EB790065956E /* MiscUtils.cpp in Sources */, 5DFE105C0F60EB790065956E /* RenderUtils.cpp in Sources */, + 5DDA5CA31F9763840079D738 /* pngwrite.c in Sources */, 5DFE10650F60EBB80065956E /* BaseApp.cpp in Sources */, 5D0CC93A0F79E0D1004D9AE9 /* Console.cpp in Sources */, 5D0CC93C0F79E0D1004D9AE9 /* GameTimer.cpp in Sources */, @@ -1338,6 +1479,7 @@ 5D8483E40F923D51007338A2 /* Entity.cpp in Sources */, 5D8483E50F923D51007338A2 /* OverlayRenderComponent.cpp in Sources */, 5D8486DA0F92409B007338A2 /* connection.cpp in Sources */, + 5DDA5C901F974EAA0079D738 /* pngrutil.c in Sources */, 5D8486DB0F92409B007338A2 /* named_slot_map.cpp in Sources */, 5D8486DC0F92409B007338A2 /* signal_base.cpp in Sources */, 5D8486DD0F92409B007338A2 /* slot.cpp in Sources */, @@ -1345,6 +1487,7 @@ 5D7C5EA30F930CB900D81AC8 /* Variant.cpp in Sources */, 5DE84C090FB9469A00DDAE64 /* angle.cpp in Sources */, 5DE84C0A0FB9469A00DDAE64 /* vec2.cpp in Sources */, + 5DDA5C9B1F974EAA0079D738 /* pngrtran.c in Sources */, 5DE84C0B0FB9469A00DDAE64 /* vec3.cpp in Sources */, 5D4760560FBA98B3008400E3 /* Button2DComponent.cpp in Sources */, 5D4760580FBA98B3008400E3 /* TouchHandlerComponent.cpp in Sources */, @@ -1352,6 +1495,7 @@ 5D4760820FBB1CE0008400E3 /* TextRenderComponent.cpp in Sources */, 5D4760850FBB1CFF008400E3 /* MainMenu.cpp in Sources */, 5D7F36150FBD17E100A15763 /* InterpolateComponent.cpp in Sources */, + 5DDA5C9A1F974EAA0079D738 /* pngread.c in Sources */, 5D17BA530FBD5DB5009D74BC /* DebugMenu.cpp in Sources */, 5D17BA5A0FBD5DD8009D74BC /* FocusInputComponent.cpp in Sources */, 5D17BA5B0FBD5DD8009D74BC /* FocusRenderComponent.cpp in Sources */, @@ -1362,8 +1506,10 @@ 5D30635B0FD89049009DE600 /* VariantDB.cpp in Sources */, 5D30635F0FD890B0009DE600 /* MathUtils.cpp in Sources */, 5D3063660FD890CB009DE600 /* AudioManager.cpp in Sources */, + 5DDA5C961F974EAA0079D738 /* pngwio.c in Sources */, 5D82C8830FF4BB110082EBE7 /* AudioManagerOS.mm in Sources */, 5D82C88B0FF4BB3F0082EBE7 /* NetHTTP.cpp in Sources */, + 5DDA5C931F974EAA0079D738 /* pngwtran.c in Sources */, 5D82C88C0FF4BB3F0082EBE7 /* NetSocket.cpp in Sources */, 5D82C88D0FF4BB3F0082EBE7 /* NetUtils.cpp in Sources */, 5D7D3AB40FF6D87500A99844 /* HTTPComponent.cpp in Sources */, @@ -1375,6 +1521,7 @@ 5D7BBCFC10144FDC0015A90E /* CRandom.cpp in Sources */, 5D7BBCFD10144FDC0015A90E /* PrimeSearch.cpp in Sources */, 5D7BBCFE10144FDC0015A90E /* TextScanner.cpp in Sources */, + 5DDA5C8F1F974EAA0079D738 /* pngtrans.c in Sources */, 5D7BBD0110144FF50015A90E /* ResourceManager.cpp in Sources */, 5D7BBD0A1014530B0015A90E /* SurfaceAnim.cpp in Sources */, 5D841437101583BD00366718 /* InputTextRenderComponent.cpp in Sources */, @@ -1411,6 +1558,7 @@ 5D945CC410F08CA2006B7475 /* blocksort.c in Sources */, 5D945CC610F08CA2006B7475 /* bzlib.c in Sources */, 5D945CC710F08CA2006B7475 /* compress.c in Sources */, + 5DDA5C981F974EAA0079D738 /* pngwutil.c in Sources */, 5D945CC810F08CA2006B7475 /* crctable.c in Sources */, 5D945CC910F08CA2006B7475 /* decompress.c in Sources */, 5D945CCA10F08CA2006B7475 /* huffman.c in Sources */, @@ -1422,6 +1570,7 @@ 5D7B11C510FC50D800997135 /* CursorComponent.cpp in Sources */, 5D7B11DA10FCD26400997135 /* InventoryComponent.cpp in Sources */, 5D2E40151109B94800A76983 /* LogMenu.cpp in Sources */, + 5DDA5C971F974EAA0079D738 /* pngmem.c in Sources */, 5DDA4DF21F862F3F0079D738 /* RenderScissorComponent.cpp in Sources */, 5D8A5321110B0E7A007F5CF4 /* ScriptAccelerator.cpp in Sources */, 5DBFC66F11144967009195F6 /* vec1.cpp in Sources */, @@ -1450,10 +1599,13 @@ 5DD878241261BDC000EB4365 /* FileSystemZip.cpp in Sources */, 5DD878251261BDC000EB4365 /* FileSystem.cpp in Sources */, 5DD878261261BDC000EB4365 /* FileManager.cpp in Sources */, + 5DDA5C8E1F974EAA0079D738 /* pngerror.c in Sources */, 5DD878391261BEC500EB4365 /* unzip.c in Sources */, 5DD8783A1261BEC500EB4365 /* ioapi.c in Sources */, 5D8CA6B1128ACA3E00188DA6 /* CustomInputComponent.cpp in Sources */, + 5DDA5C951F974EAA0079D738 /* pngset.c in Sources */, 5D8CA6B2128ACA3E00188DA6 /* ArcadeInputComponent.cpp in Sources */, + 5DDA5C911F974EAA0079D738 /* pngget.c in Sources */, 5DDEC25F1294E63200C42C5E /* ExpiredMenu.cpp in Sources */, 5DEB1A0412CC6FAD00A3A6DB /* EmitVirtualKeyComponent.cpp in Sources */, 5D2F53AD15A7E2F000B8CED1 /* AdManager.cpp in Sources */, @@ -1466,9 +1618,11 @@ 5D2F53D115A7F0AE00B8CED1 /* AdProvider.cpp in Sources */, 5D2F53DA15A7F5D700B8CED1 /* JPGSurfaceLoader.cpp in Sources */, 5D2F53FB15A7F64600B8CED1 /* jcapimin.c in Sources */, + 5DDA5C921F974EAA0079D738 /* pngrio.c in Sources */, 5D2F53FC15A7F64600B8CED1 /* jcapistd.c in Sources */, 5D2F53FD15A7F64600B8CED1 /* jccoefct.c in Sources */, 5D2F53FE15A7F64600B8CED1 /* jccolor.c in Sources */, + 5DDA5C8D1F974EAA0079D738 /* png.c in Sources */, 5D2F53FF15A7F64600B8CED1 /* jcdctmgr.c in Sources */, 5D2F540015A7F64600B8CED1 /* jchuff.c in Sources */, 5D2F540115A7F64600B8CED1 /* jcinit.c in Sources */, @@ -1479,6 +1633,7 @@ 5D2F540615A7F64600B8CED1 /* jcparam.c in Sources */, 5D2F540715A7F64600B8CED1 /* jcphuff.c in Sources */, 5D2F540815A7F64600B8CED1 /* jcprepct.c in Sources */, + 5DDA5C941F974EAA0079D738 /* pngpread.c in Sources */, 5D2F540915A7F64600B8CED1 /* jctrans.c in Sources */, 5D2F540A15A7F64600B8CED1 /* jdapimin.c in Sources */, 5D2F540B15A7F64600B8CED1 /* jdapistd.c in Sources */, @@ -1504,6 +1659,7 @@ 5D2F542D15A819C600B8CED1 /* jidctflt.c in Sources */, 5D2F542E15A819C600B8CED1 /* jidctfst.c in Sources */, 5D2F542F15A819C600B8CED1 /* jidctint.c in Sources */, + 5DDA5C991F974EAA0079D738 /* pngvcrd.c in Sources */, 5D2F543015A819C600B8CED1 /* jidctred.c in Sources */, 5D2F543115A819C600B8CED1 /* jmemmgr.c in Sources */, 5D2F543215A819C600B8CED1 /* jmemnobs.c in Sources */, @@ -1519,6 +1675,7 @@ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer: Seth Robinson (MX6953T2FS)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; @@ -1531,6 +1688,7 @@ RT_JPG_SUPPORT, RT_FORCE_32BIT_INTS_FOR_FILES, RT_IPV6, + RT_PNG_SUPPORT, ); HEADER_SEARCH_PATHS = ( source, @@ -1553,6 +1711,7 @@ PRODUCT_NAME = RTDink; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1633,6 +1792,7 @@ 5D8733750FA9A0BC001DB559 /* AdHoc */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer: Seth Robinson (MX6953T2FS)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; @@ -1646,6 +1806,7 @@ RT_JPG_SUPPORT, RT_IPV6, RT_FORCE_32BIT_INTS_FOR_FILES, + RT_PNG_SUPPORT, ); GCC_THUMB_SUPPORT = NO; HEADER_SEARCH_PATHS = ( @@ -1669,6 +1830,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rtsoft.${PRODUCT_NAME:identifier}"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = AdHoc; }; diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 961a29e..f437ad6 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -20,7 +20,7 @@ LOCAL_CPP_FEATURES += rtti #release flags #-DRT_CHARTBOOST_ENABLED -DRT_MOGA_ENABLED -SHARED_FLAGS := -DANDROID_NDK -DBUILD_ANDROID -DNDEBUG -DRT_JPG_SUPPORT +SHARED_FLAGS := -DANDROID_NDK -DBUILD_ANDROID -DNDEBUG -DRT_JPG_SUPPORT -DRT_PNG_SUPPORT #debug flags #-DRT_CHARTBOOST_ENABLED -DRT_MOGA_ENABLED @@ -63,6 +63,9 @@ $(JPGSRC)/jdhuff.c $(JPGSRC)/jdinput.c $(JPGSRC)/jdmainct.c $(JPGSRC)/jdmarker.c $(JPGSRC)/jdsample.c $(JPGSRC)/jdtrans.c $(JPGSRC)/jerror.c $(JPGSRC)/jfdctflt.c $(JPGSRC)/jfdctfst.c $(JPGSRC)/jfdctint.c $(JPGSRC)/jidctflt.c $(JPGSRC)/jidctfst.c \ $(JPGSRC)/jidctint.c $(JPGSRC)/jidctred.c $(JPGSRC)/jmemmgr.c $(JPGSRC)/jmemnobs.c $(JPGSRC)/jquant1.c $(JPGSRC)/jquant2.c $(JPGSRC)/jutils.c \ \ +$(PNGSRC)/png.c $(PNGSRC)/pngerror.c $(PNGSRC)/pnggccrd.c $(PNGSRC)/pngget.c $(PNGSRC)/pngmem.c $(PNGSRC)/pngpread.c $(PNGSRC)/pngread.c \ +$(PNGSRC)/pngrio.c $(PNGSRC)/pngrtran.c $(PNGSRC)/pngrutil.c $(PNGSRC)/pngset.c $(PNGSRC)/pngtrans.c $(PNGSRC)/pngvcrd.c $(PNGSRC)/pngwio.c $(PNGSRC)/pngwtran.c \ +\ $(COMPPATH)/Button2DComponent.cpp $(COMPPATH)/FilterInputComponent.cpp $(COMPPATH)/FocusInputComponent.cpp $(COMPPATH)/FocusRenderComponent.cpp $(COMPPATH)/FocusUpdateComponent.cpp \ $(COMPPATH)/HTTPComponent.cpp $(COMPPATH)/InputTextRenderComponent.cpp $(COMPPATH)/InterpolateComponent.cpp $(COMPPATH)/OverlayRenderComponent.cpp $(COMPPATH)/ProgressBarComponent.cpp \ $(COMPPATH)/RectRenderComponent.cpp $(COMPPATH)/ScrollBarRenderComponent.cpp $(COMPPATH)/ScrollComponent.cpp $(COMPPATH)/TapSequenceDetectComponent.cpp $(COMPPATH)/TextBoxRenderComponent.cpp \ diff --git a/programmer_readme.txt b/programmer_readme.txt index 9817468..ab033dc 100644 --- a/programmer_readme.txt +++ b/programmer_readme.txt @@ -14,7 +14,7 @@ Dink Smallwood HD -Use the "Debug GL" or "Release GL" solution configuations. +Use the "Debug GL" or "Release GL" solution configuations in 32 bit. Debug GL 64 bit is also setup (just to test - as I actually don't package a 64 bit version for Windows, just iOS) --- Have a bugfix or patch?! Please send it over to Seth! Please note that any submission (code, media, translations, ect) must be 100% compatible with the license as listed in dinkhd_license.txt diff --git a/script/BuildAndPackageWindowsBeta.bat b/script/BuildAndPackageWindowsBeta.bat new file mode 100644 index 0000000..d57a485 --- /dev/null +++ b/script/BuildAndPackageWindowsBeta.bat @@ -0,0 +1,83 @@ +REM ** Make sure american code page is used, otherwise the %DATE environmental var might be wrong +CHCP 437 + +REM first clean out any bogus files +cd ..\ +cd media +set NO_PAUSE=1 +:call update_media.bat +cd .. +cd script + +:setup for VS 2017 +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\"vcvars32.bat + +set C_TARGET_EXE=..\bin\dink.exe + +REM erase it so we know it got built right +del %C_TARGET_EXE% > NUL + +set CL=/DRT_SCRIPT_BUILD +:This would need to be "Release GL|x64" for the 64 bit build. But I don't think we really need to do one yet + +:for full rebuild +devenv ..\windows_vs2017\iphoneRTDink.sln /rebuild "ReleaseBeta GL|Win32" + +:for no rebuild +:devenv ..\windows_vs2017\iphoneRTDink.sln /build "ReleaseBeta GL|Win32" + +REM Make sure the file compiled ok +if not exist %C_TARGET_EXE% beeper.exe /p + +:Sign it with the RTsoft cert (optional) + +echo "Waiting 5 seconds " +timeout 5 + +call sign.bat %C_TARGET_EXE% + +REM Do a little cleanup in the dink bin dir as well +del ..\bin\dink\continue_state.dat +del ..\bin\dink\save*.dat +del ..\bin\dink\quicksave.dat + +//make the windows installer part +SET C_FILENAME=DinkSmallwoodHDInstaller.exe +del %C_FILENAME% > NUL + +REM get version information from the source code +echo Grabbing version # information from source code. + +ctoenv.exe ..\source\App.cpp "m_version = " C_VERSION /r +if errorlevel 1 beeper.exe /p +call setenv.bat +del setenv.bat + +ctoenv.exe ..\source\App.cpp "m_versionString = \"" C_TEXT_VERSION_TEMP +if errorlevel 1 beeper.exe /p +call setenv.bat +del setenv.bat +SET C_TEXT_VERSION=%C_TEXT_VERSION_TEMP% +REM done with temp var, kill it +SET C_TEXT_VERSION_TEMP= +echo Building installer: %C_FILENAME% %C_TEXT_VERSION% + +cd win_installer +..\..\..\..\util\NSIS\makensis.exe dink.nsi + +SET C_FILENAME=DinkSmallwoodHDInstallerBeta.exe +del %C_FILENAME% +cd .. +copy DinkSmallwoodHDInstaller.exe %C_FILENAME% +del DinkSmallwoodHDInstaller.exe + +set d_fname=%C_FILENAME% + +echo "Waiting 5 seconds because NSIS does something and ruins the signing if I don't" +timeout 5 + +call sign.bat %C_FILENAME% + +:call FTPToSiteWin.bat +cd script +pause \ No newline at end of file diff --git a/script/BuildAndroidAndUploadBeta.bat b/script/BuildAndroidAndUploadBeta.bat index 934c8c0..19040d1 100644 --- a/script/BuildAndroidAndUploadBeta.bat +++ b/script/BuildAndroidAndUploadBeta.bat @@ -1,6 +1,6 @@ cd ..\android call ..\app_info_setup.bat -:call buildRelease.bat +call buildRelease.bat @ECHO ON cd bin set D_FILE_NAME=%APP_NAME%-release.apk diff --git a/script/UploadWindowsVersion.bat b/script/UploadWindowsVersion.bat new file mode 100644 index 0000000..ef72c1f --- /dev/null +++ b/script/UploadWindowsVersion.bat @@ -0,0 +1,6 @@ +SET C_FILENAME=DinkSmallwoodHDInstaller.exe +:del %C_FILENAME% +:copy DinkSmallwoodHDInstaller.exe %C_FILENAME% +set d_fname=%C_FILENAME% +call FTPToSiteWin.bat +pause \ No newline at end of file diff --git a/script/UploadWindowsVersionAsBeta.bat b/script/UploadWindowsVersionAsBeta.bat index 3e7e9fe..ffdc725 100644 --- a/script/UploadWindowsVersionAsBeta.bat +++ b/script/UploadWindowsVersionAsBeta.bat @@ -1,6 +1,6 @@ SET C_FILENAME=DinkSmallwoodHDInstallerBeta.exe -del %C_FILENAME% -copy DinkSmallwoodHDInstaller.exe %C_FILENAME% +:del %C_FILENAME% +:copy DinkSmallwoodHDInstaller.exe %C_FILENAME% set d_fname=%C_FILENAME% call FTPToSiteWin.bat pause \ No newline at end of file diff --git a/script/win_installer/readme.txt b/script/win_installer/readme.txt index 2cfe9e8..8ada399 100644 --- a/script/win_installer/readme.txt +++ b/script/win_installer/readme.txt @@ -32,10 +32,6 @@ Supported command line options: Note: If a .dmod file is put in the Dink HD directory (where the .exe is) it will be automatically installed and then deleted -------------- BETA VERSION ----------------- - -This is a beta version which means it probably has bugs and isn't ready for general consumption. However, it means you've been recruited to help us make it better! - To report a bug, find or post a thread about Dink HD on dinknetwork.com and and please include the following information if you can: - Dink files are installed to C:\Users\\AppData\Local\DinkSmallwoodHD by default. diff --git a/source/App.cpp b/source/App.cpp index 3248d20..9090736 100644 --- a/source/App.cpp +++ b/source/App.cpp @@ -499,10 +499,12 @@ bool App::Init() GetApp()->GetVarWithDefault("gui_transparency",0.35f)->GetFloat(); - #ifdef PLATFORM_WINDOWS - GetApp()->GetVarWithDefault("checkerboard_fix", uint32(1)); //default to on for Windows + + #ifdef PLATFORM_WINDOWS + + //If you don't have directx, just comment out this and remove the dx lib dependency, directx is only used for the //gamepad input on windows GetGamepadManager()->AddProvider(new GamepadProviderDirectX); //use directx joysticks @@ -964,27 +966,29 @@ bool App::OnPreInitVideo() - VariantDB temp; - temp.Load("save.dat"); - Variant *pVarX = temp.GetVarIfExists("videox"); - Variant *pVarY = temp.GetVarIfExists("videoy"); - if (pVarX && pVarY && pVarX->GetUINT32() != 0 && pVarY->GetUINT32() != 0) + if (GetEmulatedPlatformID() == PLATFORM_ID_WINDOWS) { + VariantDB temp; + temp.Load("save.dat"); + Variant *pVarX = temp.GetVarIfExists("videox"); + Variant *pVarY = temp.GetVarIfExists("videoy"); + if (pVarX && pVarY && pVarX->GetUINT32() != 0 && pVarY->GetUINT32() != 0) + { - g_winVideoScreenX = pVarX->GetUINT32(); - g_winVideoScreenY = pVarY->GetUINT32(); + g_winVideoScreenX = pVarX->GetUINT32(); + g_winVideoScreenY = pVarY->GetUINT32(); + } + + g_bIsFullScreen = temp.GetVarWithDefault("fullscreen", uint32(1))->GetUINT32(); + + if (DoesCommandLineParmExist("-window") || DoesCommandLineParmExist("-windowed")) + { + g_bIsFullScreen = false; + GetApp()->GetVar("fullscreen")->Set(uint32(0)); + } + + g_bUseBorderlessFullscreenOnWindows = temp.GetVarWithDefault("borderless_fullscreen", uint32(0))->GetUINT32() != 0; } - - g_bIsFullScreen = temp.GetVarWithDefault("fullscreen", uint32(1))->GetUINT32(); - - if (DoesCommandLineParmExist("-window") || DoesCommandLineParmExist("-windowed")) - { - g_bIsFullScreen = false; - GetApp()->GetVar("fullscreen")->Set(uint32(0)); - } - - g_bUseBorderlessFullscreenOnWindows = temp.GetVarWithDefault("borderless_fullscreen", uint32(0))->GetUINT32() != 0; - #endif return true; diff --git a/source/App.h b/source/App.h index 4c400a1..bd5069a 100644 --- a/source/App.h +++ b/source/App.h @@ -9,7 +9,8 @@ #include "BaseApp.h" #include "Manager/AdManager.h" -#define RT_IS_BETA 1 +//note: This is set in the ReleaseBeta GL configuration, not here + //#define RT_IS_BETA 1 enum eExtendedVirtualKeys { diff --git a/source/GUI/AboutMenu.cpp b/source/GUI/AboutMenu.cpp index 24d72f6..e491d7f 100644 --- a/source/GUI/AboutMenu.cpp +++ b/source/GUI/AboutMenu.cpp @@ -179,13 +179,14 @@ void AboutMenuAddScrollContent(Entity *pParent) float blurbSpacingY = iPhoneMapX(27); + /* if (IsIPAD()) { AddBlurb(pParent, x, y, "fling_ad", "`6This game is compatible with the `wFling analog joystick``. Tap the Fling logo to visit Ten One Design to learn more."); y += iPhoneMapY(blurbSpacingY); //y += ySpacer; - } + */ CL_Vec2f vTextBoxPos(iPhoneMapX(x),y); CL_Vec2f vTextBounds(iPhoneMapX(434), iPhoneMapY(200)); @@ -218,7 +219,6 @@ if (IsDesktop()) "Alt-Enter ``- `8Toggle fullscreen\n``"\ "Drag window corners ``- `8Changes screensize. Hold Shift to allow any aspect ratio\n``"\ "\n`6Stuck? Try visiting `wdinknetwork.com`` or use google to find a walkthrough.\n"\ - "\n`wFPS Lock``: If enabled, the game is limited to 30 frames per second. This should be enabled on most devices for more consistent gameplay.\n"\ "\n`wPushing:`` If you make Dink walk against an object for one second, he will begin to push it. Useful when you see rocks blocking cave entrances.\n"\ "\n`wTrees:`` Some trees can be burned down with magic to reveal secrets.\n"\ "\n`wSave Machines:`` Use Save Machines frequently and don't only rely on quick saves as they may sometimes put you in a difficult spot.\n"\ @@ -233,12 +233,10 @@ if (IsDesktop()) //android msg += \ - "`6Thanks for buying `wDink Smallwood HD`` for Android. Here are some tips and info to get started.\n"\ + "`6Here are some tips and info to get started.\n"\ "\n`wControl mode - Virtual Joypad:`` This is the default control method, simple to use.\n"\ "\n`wControl mode - Drag Anywhere:`` This control scheme allows you to draw an angle with your finger and dink will walk in that angle. It doesn't matter where you draw it on the screen. As long as you don't let your finger up, he'll keep moving.\n"\ - "\n`wTrackball:`` You can also use the trackball to move. You may wish to reverse the action icon positions from the Option menu.\n"\ "\n`wiCade:`` Pair the iCade with your device, then start the game. Choose `$Use iCade Controller Mode`` from the options menu.\n"\ - "\n`wXperia Play:`` Explode the pay and play, no special setup required. Note that the shoulder buttons map to the map and speed-up.\n"\ "\n`wHW Keyboard:`` If your device has a hardware keyboard, you can use WASZ to move, I for inventory, shift for punch, enter/menu for magic, space to talk.\n"\ "\n`wPushing:`` If you make Dink walk against an object for one second, he will begin to push it. Useful when you see rocks blocking cave entrances.\n"\ @@ -246,19 +244,17 @@ if (IsDesktop()) "\n`wQuick save/load:`` In addition to the full auto state save whenever you exit the game, and the normal save system, you can use `wQuick Save/Load`` from the pause menu. It's very useful to beat a tough boss.\n"\ "\n`wSave Machines:`` Use Save Machines frequently and don't only rely on quick saves as they may sometimes put you in a difficult spot.\n"\ "\n`wAuto Save:`` Your game is automatically saved every five minutes to save slot 10 as long as you have more than 30% health.\n"\ - "\n`wFPS Lock:`` If enabled, the game is limited to 30 frames per second. This should be enabled on slower devices for smoother gameplay.\n"\ "\n`wInstalling DMODS by Browse:`` Click Browse from the Add-On menu to see a selection of recommended DMODs to install.\n"\ "\n`wInstalling DMODS from URL:`` Click Install from URL from the Add-On menu.\n"\ "\n`wInstalling DMODS from SD card:`` Place a .dmod file on your SD card in `w/Android/data/com.rtsoft.dink/files`` and it will be installed the next time you play.\n"\ - "\n`wIf the game is slow:`` Try turning Pic Smoothing to off in the options menu.\n"\ - "\n`wMulti-touch:`` Multi touch is supported when possible. Please note that many HTC phones such as the Nexus One only partially support multi-touch resulting in strange behavior when two fingers are on the screen.\n"\ + "\n`wIf the game is slow:`` Try disabling the screen scroll effect and improved shadows in the options menu.\n"\ ; } else if ( GetEmulatedPlatformID() == PLATFORM_ID_WEBOS || GetEmulatedPlatformID() == PLATFORM_ID_BBX) { //android msg += \ - "`6Thanks for buying `wDink Smallwood HD``. Here are some tips and info to get started.\n"\ + "`6Here are some tips and info to get started.\n"\ "\n`wControl mode - Virtual Joypad:`` This is the default control method, simple to use.\n"\ "\n`wControl mode - Drag Anywhere:`` This control scheme allows you to draw an angle with your finger and dink will walk in that angle. It doesn't matter where you draw it on the screen. As long as you don't let your finger up, he'll keep moving.\n"\ @@ -267,10 +263,8 @@ if (IsDesktop()) "\n`wQuick save/load:`` In addition to the full auto state save whenever you exit the game, and the normal save system, you can use `wQuick Save/Load`` from the pause menu. It's very useful to beat a tough boss.\n"\ "\n`wSave Machines:`` Use Save Machines frequently and don't only rely on quick saves as they may sometimes put you in a difficult spot.\n"\ "\n`wAuto Save:`` Your game is automatically saved every five minutes to save slot 10 as long as you have more than 30% health.\n"\ - "\n`wFPS Lock:`` If enabled, the game is limited to 30 frames per second. This should be enabled on slower devices for smoother gameplay.\n"\ "\n`wInstalling DMODS by Browse:`` Click Browse from the Add-On menu to see a selection of recommended DMODs to install.\n"\ "\n`wInstalling DMODS from URL:`` Click Install from URL from the Add-On menu.\n"\ - "\n`wIf the game is slow:`` Try turning Pic Smoothing to off in the options menu.\n"\ ; } else { @@ -280,22 +274,19 @@ if (IsDesktop()) //iphone msg += \ - "`6Thanks for buying `wDink Smallwood HD`` for iPhone, iPod Touch, and iPad. Here are some tips and info to get started.\n"\ + "`6Here are some tips and info to get started.\n"\ "\n`wControls - Virtual Joypad:`` This is the default control method, simple to use.\n"\ "\n`wControls - Drag Anywhere:`` This control scheme allows you to draw an angle with your finger and dink will walk in that angle. It doesn't matter where you draw it on the screen. As long as you don't let your finger up, he'll keep moving.\n"\ - "\n`wControls - Fling Mode:`` This control scheme is optimized for the Fling analog joystick for iPad from Ten One Design.\n"\ "\n`wPushing:`` If you make Dink walk against an object for one second, he will begin to push it. Useful when you see rocks blocking cave entrances.\n"\ "\n`wTrees:`` Some trees can be burned down with magic to reveal secrets.\n"\ "\n`wQuick save/load:`` In addition to the full auto state save whenever you exit the game, and the normal save system, you can use `wQuick Save/Load`` from the pause menu. It's very useful to beat a tough boss.\n"\ "\n`wSave Machines:`` Use Save Machines frequently and don't only rely on quick saves as they may sometimes put you in a difficult spot.\n"\ "\n`wAuto Save:`` Your game is automatically saved every five minutes to save slot 10 as long as you have more than 30% health.\n"\ - "\n`wFPS Lock:`` If enabled, the game is limited to 30 frames per second. This should be enabled on slower devices for smoother gameplay.\n"\ - "\n`wHow to import saves from desktop (iOS 3.2+):`` Drag and drop a save.dat file in the Dink HD Documents file sharing area in iTunes. Import happens when the main menu is visited. Use save_.dat to import a save to an installed DMOD.\n"\ ; } else { msg += \ - "`6Thanks for buying `wDink Smallwood HD`` for iPhone, iPod Touch, and iPad. Here are some tips and info to get started.\n"\ + "`6Here are some tips and info to get started.\n"\ "\n`wControls - Virtual Joypad:`` This is the default control method, simple to use.\n"\ "\n`wControls - Drag Anywhere:`` This control scheme allows you to draw an angle with your finger and dink will walk in that angle. It doesn't matter where you draw it on the screen. As long as you don't let your finger up, he'll keep moving.\n"\ "\n`wPushing:`` If you make Dink walk against an object for one second, he will begin to push it. Useful when you see rocks blocking cave entrances.\n"\ @@ -303,9 +294,6 @@ if (IsDesktop()) "\n`wQuick save/load:`` In addition to the full auto state save whenever you exit the game, and the normal save system, you can use `wQuick Save/Load`` from the pause menu. It's very useful to beat a tough boss.\n"\ "\n`wSave Machines:`` Use Save Machines frequently and don't only rely on quick saves as they may sometimes put you in a difficult spot.\n"\ "\n`wAuto Save:`` Your game is automatically saved every five minutes to save slot 10 as long as you have more than 30% health.\n"\ - "\n`wFPS Lock:`` If enabled, the game is limited to 30 frames per second. This should be enabled on slower devices for smoother gameplay.\n"\ - "\n`wHow to import saves from desktop (iOS 3.2+):`` Drag and drop a save.dat file in the Dink HD Documents file sharing area in iTunes. Import happens when the main menu is visited. Use save_.dat to import a save to an installed DMOD.\n"\ - ; } } @@ -316,8 +304,8 @@ if (!IsDesktop()) msg += \ "\n`wAdd-on warning:`` Depending on your device's speed and memory not all quest add-ons may be smoothly playable.\n"\ -"\n`wOutdated instructions warning:`` Sometimes quest add-ons will refer to controls not available, like pressing a specific key. Keep in mind most add-ons were developed for the Windows version of the game.\n"\ -"\n`wKeyboard:`` You can work around these issues by using the in-game keyboard option, available from the pause menu.\n"; +"\n`wOutdated instructions warning:`` Sometimes quest add-ons will refer to controls not available, like pressing a specific key. Keep in mind most add-ons were developed for the desktop versions of the game.\n"\ +"\n`wKeyboard:`` You can probably work around these issues by using the in-game keyboard option, available from the pause menu.\n"; } Entity *pEnt = CreateTextBoxEntity(pParent, "", vTextBoxPos, vTextBounds, msg); diff --git a/source/GUI/GameMenu.cpp b/source/GUI/GameMenu.cpp index 7aadde6..23a5d55 100644 --- a/source/GUI/GameMenu.cpp +++ b/source/GUI/GameMenu.cpp @@ -1575,6 +1575,7 @@ Entity * GameCreate(Entity *pParentEnt, int gameIDToLoad, string stateToLoad, st bool IsInFlingMode() { - return (GetApp()->GetShared()->GetVar("controlStyle")->GetUINT32() == CONTROLS_FLING); + return false; //fling is dead + //return (GetApp()->GetShared()->GetVar("controlStyle")->GetUINT32() == CONTROLS_FLING); } diff --git a/source/GUI/OptionsMenu.cpp b/source/GUI/OptionsMenu.cpp index 5906d2b..d0d4118 100644 --- a/source/GUI/OptionsMenu.cpp +++ b/source/GUI/OptionsMenu.cpp @@ -400,6 +400,7 @@ void OptionsMenuAddScrollContent(Entity *pParent) pEnt->GetFunction("OnButtonSelected")->sig_function.connect(OptionsMenuOnSelect); offsetX += pEnt->GetVar("size2d")->GetVector2().x + smallSpacerX; + /* if (IsIPADSize) { pEnt = CreateTextButtonEntity(pBG, "controls_2", offsetX, y, "Fling Mode", false); @@ -408,6 +409,8 @@ void OptionsMenuAddScrollContent(Entity *pParent) offsetX += pEnt->GetVar("size2d")->GetVector2().x + smallSpacerX; } + */ + uint32 controlsID = GetApp()->GetVar("controlStyle")->GetUINT32(); SetupLightBarSelect(pBG, "controls_", controlsID, MAKE_RGBA(190, 0, 35, 255)); diff --git a/windows_vs2017/iPhoneRTDink.sln b/windows_vs2017/iPhoneRTDink.sln index 5957764..99d7756 100644 --- a/windows_vs2017/iPhoneRTDink.sln +++ b/windows_vs2017/iPhoneRTDink.sln @@ -21,13 +21,14 @@ Global Release GL AkikoBox|x64 = Release GL AkikoBox|x64 Release GL|Win32 = Release GL|Win32 Release GL|x64 = Release GL|x64 + ReleaseBeta GL|Win32 = ReleaseBeta GL|Win32 + ReleaseBeta GL|x64 = ReleaseBeta GL|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Debug|Win32.ActiveCfg = Common Debug|Win32 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Debug|Win32.Build.0 = Common Debug|Win32 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Debug|x64.ActiveCfg = Common Debug|x64 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Debug|x64.Build.0 = Common Debug|x64 - {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Debug|x64.Build.2 = Release GL WinDir|x64 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Release|Win32.ActiveCfg = Common Release|Win32 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Release|Win32.Build.0 = Common Release|Win32 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Common Release|x64.ActiveCfg = Common Release|x64 @@ -52,6 +53,10 @@ Global {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Release GL|Win32.Build.0 = Release GL|Win32 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Release GL|x64.ActiveCfg = Release GL|x64 {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.Release GL|x64.Build.0 = Release GL|x64 + {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.ReleaseBeta GL|Win32.ActiveCfg = ReleaseBeta GL|Win32 + {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.ReleaseBeta GL|Win32.Build.0 = ReleaseBeta GL|Win32 + {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.ReleaseBeta GL|x64.ActiveCfg = ReleaseBeta GL|x64 + {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE}.ReleaseBeta GL|x64.Build.0 = ReleaseBeta GL|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows_vs2017/winRTDink.vcxproj b/windows_vs2017/winRTDink.vcxproj index 77bfb4e..2352551 100644 --- a/windows_vs2017/winRTDink.vcxproj +++ b/windows_vs2017/winRTDink.vcxproj @@ -65,6 +65,14 @@ Release GL x64 + + ReleaseBeta GL + Win32 + + + ReleaseBeta GL + x64 + {AD1D1337-0F3F-4AC5-B9EE-EE151B0193FE} @@ -118,11 +126,21 @@ v141_xp MultiByte + + Application + v141_xp + MultiByte + Application v141_xp MultiByte + + Application + v141_xp + MultiByte + Application v141_xp @@ -192,10 +210,18 @@ + + + + + + + + @@ -257,10 +283,20 @@ false dink + + ..\bin\ + $(Configuration)\ + false + dink + false dink + + false + dink + $(Configuration)\ $(Configuration)\ @@ -451,6 +487,29 @@ false + + + ..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\dxsdk\Include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_IPV6;RT_CUSTOM_LOGMSG;RT_PNG_SUPPORT;RT_IS_BETA;%(PreprocessorDefinitions) + MultiThreaded + Use + PlatformPrecomp.h + Level3 + OldStyle + 4267;4244;4244;%(DisableSpecificWarnings) + + + opengl32.lib;fmod_vc.lib;zdll.lib;ws2_32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + ..\..\shared\win\lib;..\dxsdk\Lib\x86;..\..\shared\win\fmodstudio\api\lowlevel\lib;%(AdditionalLibraryDirectories) + DebugFastLink + Windows + true + true + MachineX86 + false + + ..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\dxsdk\Include;%(AdditionalIncludeDirectories) @@ -472,6 +531,27 @@ true + + + ..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\dxsdk\Include;%(AdditionalIncludeDirectories) + MultiThreaded + Use + PlatformPrecomp.h + Level3 + ProgramDatabase + 4267;4244;4244;%(DisableSpecificWarnings) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_PNG_SUPPORT;%(PreprocessorDefinitions) + + + opengl32.lib;fmod64_vc.lib;zdll.lib;ws2_32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + ..\..\shared\win\lib;..\..\shared\win\fmodstudio\api\lowlevel\lib;..\dxsdk\Lib\x86;%(AdditionalLibraryDirectories) + true + Windows + true + true + + Disabled @@ -671,7 +751,9 @@ true true true + true true + true true @@ -689,7 +771,9 @@ true true true + true true + true @@ -712,7 +796,9 @@ true true true + true true + true true @@ -730,7 +816,9 @@ true true true + true true + true true @@ -748,7 +836,9 @@ true true true + true true + true @@ -781,8 +871,12 @@ + + + + @@ -815,8 +909,12 @@ + + + + @@ -849,8 +947,12 @@ + + + + @@ -883,8 +985,12 @@ + + + + @@ -917,8 +1023,12 @@ + + + + @@ -951,8 +1061,12 @@ + + + + @@ -985,8 +1099,12 @@ + + + + @@ -1028,7 +1146,9 @@ true true true + true true + true @@ -1068,9 +1188,13 @@ $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc @@ -1093,7 +1217,9 @@ true true true + true true + true true @@ -1111,7 +1237,9 @@ true true true + true true + true true @@ -1129,7 +1257,9 @@ true true true + true true + true @@ -1155,7 +1285,9 @@ true true true + true true + true true @@ -1173,7 +1305,9 @@ true true true + true true + true true @@ -1191,7 +1325,9 @@ true true true + true true + true @@ -1224,8 +1360,12 @@ + + + + @@ -1258,8 +1398,12 @@ + + + + @@ -1292,8 +1436,12 @@ + + + + @@ -1326,8 +1474,12 @@ + + + + @@ -1360,8 +1512,12 @@ + + + + @@ -1394,8 +1550,12 @@ + + + + @@ -1428,8 +1588,12 @@ + + + + @@ -1462,8 +1626,12 @@ + + + + @@ -1496,8 +1664,12 @@ + + + + @@ -1530,8 +1702,12 @@ + + + + @@ -1564,8 +1740,12 @@ + + + + @@ -1598,8 +1778,12 @@ + + + + @@ -1632,8 +1816,12 @@ + + + + @@ -1666,8 +1854,12 @@ + + + + @@ -1700,8 +1892,12 @@ + + + + @@ -1734,8 +1930,12 @@ + + + + @@ -1768,8 +1968,12 @@ + + + + @@ -1802,8 +2006,12 @@ + + + + @@ -1836,8 +2044,12 @@ + + + + @@ -1870,8 +2082,12 @@ + + + + @@ -1904,8 +2120,12 @@ + + + + @@ -1938,8 +2158,12 @@ + + + + @@ -1972,8 +2196,12 @@ + + + + @@ -2006,8 +2234,12 @@ + + + + @@ -2040,8 +2272,12 @@ + + + + @@ -2074,8 +2310,12 @@ + + + + @@ -2108,8 +2348,12 @@ + + + + @@ -2142,8 +2386,12 @@ + + + + @@ -2176,8 +2424,12 @@ + + + + @@ -2210,8 +2462,12 @@ + + + + @@ -2244,8 +2500,12 @@ + + + + @@ -2278,8 +2538,12 @@ + + + + @@ -2312,8 +2576,12 @@ + + + + @@ -2346,8 +2614,12 @@ + + + + @@ -2380,8 +2652,12 @@ + + + + @@ -2414,8 +2690,12 @@ + + + + @@ -2448,8 +2728,12 @@ + + + + @@ -2482,8 +2766,12 @@ + + + + @@ -2516,8 +2804,12 @@ + + + + @@ -2550,8 +2842,12 @@ + + + + @@ -2584,8 +2880,12 @@ + + + + @@ -2618,8 +2918,12 @@ + + + + @@ -2652,8 +2956,12 @@ + + + + @@ -2686,8 +2994,12 @@ + + + + @@ -2720,8 +3032,12 @@ + + + + @@ -2754,8 +3070,12 @@ + + + + NotUsing @@ -2764,6 +3084,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2772,6 +3093,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2782,6 +3104,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2790,6 +3113,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2800,6 +3124,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2808,6 +3133,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2818,6 +3144,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2826,6 +3153,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2836,6 +3164,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2844,6 +3173,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2854,6 +3184,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2862,6 +3193,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2872,6 +3204,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2880,6 +3213,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2890,6 +3224,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2898,6 +3233,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2908,6 +3244,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2916,6 +3253,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2926,6 +3264,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2934,6 +3273,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2944,6 +3284,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2952,6 +3293,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2962,6 +3304,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2970,6 +3313,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2980,6 +3324,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -2988,6 +3333,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -2998,6 +3344,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -3006,6 +3353,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing @@ -3033,7 +3381,9 @@ Use Use Use + Use Use + Use @@ -3054,7 +3404,9 @@ Create Create Create + Create Create + Create @@ -3111,8 +3463,12 @@ + + + + @@ -3145,8 +3501,12 @@ + + + + @@ -3179,8 +3539,12 @@ + + + + @@ -3213,8 +3577,12 @@ + + + + @@ -3247,8 +3615,12 @@ + + + + @@ -3281,8 +3653,12 @@ + + + + @@ -3315,8 +3691,12 @@ + + + + @@ -3349,8 +3729,12 @@ + + + + @@ -3383,8 +3767,12 @@ + + + + @@ -3417,8 +3805,12 @@ + + + + @@ -3451,8 +3843,12 @@ + + + + @@ -3485,8 +3881,12 @@ + + + + Use @@ -3537,8 +3937,12 @@ + + + + @@ -3571,8 +3975,12 @@ + + + + @@ -3607,8 +4015,12 @@ + + + + @@ -3627,7 +4039,9 @@ true true true + true true + true NotUsing @@ -3663,8 +4077,12 @@ + + + + @@ -3699,6 +4117,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -3710,6 +4129,7 @@ NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -3773,7 +4193,9 @@ true true true + true true + true @@ -3954,7 +4376,9 @@ true true true + true true + true diff --git a/windows_vs2017/winRTDink.vcxproj.user b/windows_vs2017/winRTDink.vcxproj.user index 468a14e..3b7ea2f 100644 --- a/windows_vs2017/winRTDink.vcxproj.user +++ b/windows_vs2017/winRTDink.vcxproj.user @@ -34,6 +34,11 @@ -game dmods/tbcb WindowsLocalDebugger + + + + WindowsLocalDebugger +