# HG changeset patch # User koda # Date 1270609092 0 # Node ID 198ec44b6d92b983a104ee9ee3b68748b800390b # Parent 52f0482b043f266369201e27eca7c8640a624967 minor tweaks, icon for ipad, merged overlayviewcontroller, pop viewcontroller when selected a hat diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/HogHatViewController.m --- a/cocoaTouch/HogHatViewController.m Wed Apr 07 01:22:05 2010 +0000 +++ b/cocoaTouch/HogHatViewController.m Wed Apr 07 02:58:12 2010 +0000 @@ -184,6 +184,7 @@ [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone]; } [self.tableView deselectRowAtIndexPath:indexPath animated:YES]; + [self.navigationController popViewControllerAnimated:YES]; } } diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/MainMenuViewController.m --- a/cocoaTouch/MainMenuViewController.m Wed Apr 07 01:22:05 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.m Wed Apr 07 02:58:12 2010 +0000 @@ -151,9 +151,8 @@ [UIView setAnimationDuration:1]; self.view.alpha = 0; [UIView commitAnimations]; - [self retain]; - [self.view removeFromSuperview]; + //[self.view removeFromSuperview]; } // this is a silly way to hide the sdl contex that remained active diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/OverlayViewController.m --- a/cocoaTouch/OverlayViewController.m Wed Apr 07 01:22:05 2010 +0000 +++ b/cocoaTouch/OverlayViewController.m Wed Apr 07 02:58:12 2010 +0000 @@ -31,7 +31,8 @@ // needed for rotation to work on os < 3.2 self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0); self.view.transform = CGAffineTransformRotate(self.view.transform, (M_PI/2.0)); - + self.view.frame = [[UIScreen mainScreen] applicationFrame]; + dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6] interval:1000 target:self diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Apr 07 01:22:05 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Apr 07 02:58:12 2010 +0000 @@ -89,11 +89,8 @@ OverlayViewController *overlayController; // overlay with controls, become visible after 2 seconds - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) - overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPad" bundle:nil]; - else - overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPhone" bundle:nil]; - + overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPhone" bundle:nil]; + [uiwindow addSubview:overlayController.view]; [overlayController release]; diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/resources/Icon-iPad.png Binary file cocoaTouch/resources/Icon-iPad.png has changed diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/resources/Icon.png Binary file cocoaTouch/resources/Icon.png has changed diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/xib/OverlayViewController-iPhone.xib --- a/cocoaTouch/xib/OverlayViewController-iPhone.xib Wed Apr 07 01:22:05 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,948 +0,0 @@ - - - - 800 - 10D573 - 762 - 1038.29 - 460.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 292 - - YES - - - 292 - {{0, 237}, {39, 53}} - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - NSImage - arrowLeft.png - - - - - 292 - {{75, 237}, {39, 54}} - - NO - NO - 1 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowRight.png - - - - - 292 - {{416, 233}, {64, 64}} - - NO - NO - 6 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - joyPush.png - - - - - 292 - {{368, 213}, {64, 64}} - - NO - NO - 5 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{344, 262}, {64, 64}} - - NO - NO - 4 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{29, 207}, {53, 39}} - - NO - NO - 2 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowUp.png - - - - - 292 - {{29, 281}, {53, 39}} - - NO - NO - 3 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowDown.png - - - - - 292 - {{416, -5}, {72, 64}} - - NO - 10 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - menuCorner.png - - - - {480, 320} - - - 3 - MSAwAA - - NO - YES - 11 - - 3 - - IBCocoaTouchFramework - - - - - YES - - - view - - - - 3 - - - - buttonPressed: - - - 1 - - 8 - - - - buttonReleased: - - - 9 - - 9 - - - - buttonReleased: - - - 7 - - 10 - - - - buttonReleased: - - - 8 - - 11 - - - - buttonReleased: - - - 8 - - 13 - - - - buttonReleased: - - - 9 - - 14 - - - - buttonPressed: - - - 1 - - 15 - - - - buttonReleased: - - - 7 - - 16 - - - - buttonReleased: - - - 9 - - 18 - - - - buttonPressed: - - - 1 - - 19 - - - - buttonReleased: - - - 8 - - 20 - - - - buttonReleased: - - - 7 - - 21 - - - - buttonReleased: - - - 8 - - 23 - - - - buttonReleased: - - - 9 - - 24 - - - - buttonPressed: - - - 1 - - 25 - - - - buttonReleased: - - - 7 - - 26 - - - - buttonReleased: - - - 9 - - 44 - - - - buttonPressed: - - - 1 - - 45 - - - - buttonReleased: - - - 8 - - 46 - - - - buttonReleased: - - - 7 - - 47 - - - - buttonReleased: - - - 8 - - 49 - - - - buttonReleased: - - - 7 - - 50 - - - - buttonReleased: - - - 9 - - 51 - - - - buttonPressed: - - - 1 - - 52 - - - - buttonReleased: - - - 9 - - 54 - - - - buttonReleased: - - - 7 - - 55 - - - - buttonPressed: - - - 1 - - 56 - - - - buttonReleased: - - - 8 - - 57 - - - - buttonPressed: - - - 7 - - 60 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - left - - - 12 - - - right - - - 17 - - - up - - - 22 - - - down - - - 43 - - - push2 - - - 48 - - - push1 - - - 53 - - - push3 - - - 58 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 12.IBPluginDependency - 17.IBPluginDependency - 22.IBPluginDependency - 4.IBPluginDependency - 43.IBPluginDependency - 48.IBPluginDependency - 53.IBPluginDependency - 58.IBPluginDependency - - - YES - OverlayViewController - UIResponder - {{222, 776}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 62 - - - - YES - - OverlayViewController - UIViewController - - YES - - YES - buttonPressed: - buttonReleased: - dismissPopover - - - YES - id - id - id - - - - popoverController - id - - - IBProjectSource - ../../cocoaTouch/OverlayViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSNetServices.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPort.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSStream.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSXMLParser.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - - YES - - YES - arrowDown.png - arrowLeft.png - arrowRight.png - arrowUp.png - joyPush.png - menuCorner.png - - - YES - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - - - 87 - - diff -r 52f0482b043f -r 198ec44b6d92 cocoaTouch/xib/OverlayViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/xib/OverlayViewController.xib Wed Apr 07 02:58:12 2010 +0000 @@ -0,0 +1,933 @@ + + + + 800 + 10D573 + 762 + 1038.29 + 460.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + YES + + + 268 + {{0, 237}, {39, 53}} + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + Helvetica-Bold + 15 + 16 + + + 3 + MQA + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + 3 + MC41AA + + + NSImage + arrowLeft.png + + + + + 268 + {{75, 237}, {39, 54}} + + NO + NO + 1 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowRight.png + + + + + 265 + {{416, 227}, {64, 64}} + + NO + NO + 6 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + joyPush.png + + + + + 265 + {{368, 207}, {64, 64}} + + NO + NO + 5 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + 265 + {{344, 256}, {64, 64}} + + NO + NO + 4 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + 268 + {{29, 207}, {53, 39}} + + NO + NO + 2 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowUp.png + + + + + 268 + {{29, 281}, {53, 39}} + + NO + NO + 3 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowDown.png + + + + + 289 + {{412, -6}, {72, 64}} + + NO + 10 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + menuCorner.png + + + + {480, 320} + + + 3 + MSAwAA + + NO + YES + NO + YES + + 3 + + IBCocoaTouchFramework + + + + + YES + + + view + + + + 3 + + + + buttonPressed: + + + 1 + + 8 + + + + buttonReleased: + + + 9 + + 9 + + + + buttonReleased: + + + 7 + + 10 + + + + buttonReleased: + + + 8 + + 11 + + + + buttonReleased: + + + 8 + + 13 + + + + buttonReleased: + + + 9 + + 14 + + + + buttonPressed: + + + 1 + + 15 + + + + buttonReleased: + + + 7 + + 16 + + + + buttonReleased: + + + 9 + + 18 + + + + buttonPressed: + + + 1 + + 19 + + + + buttonReleased: + + + 8 + + 20 + + + + buttonReleased: + + + 7 + + 21 + + + + buttonReleased: + + + 8 + + 23 + + + + buttonReleased: + + + 9 + + 24 + + + + buttonPressed: + + + 1 + + 25 + + + + buttonReleased: + + + 7 + + 26 + + + + buttonReleased: + + + 9 + + 44 + + + + buttonPressed: + + + 1 + + 45 + + + + buttonReleased: + + + 8 + + 46 + + + + buttonReleased: + + + 7 + + 47 + + + + buttonReleased: + + + 8 + + 49 + + + + buttonReleased: + + + 7 + + 50 + + + + buttonReleased: + + + 9 + + 51 + + + + buttonPressed: + + + 1 + + 52 + + + + buttonReleased: + + + 9 + + 54 + + + + buttonReleased: + + + 7 + + 55 + + + + buttonPressed: + + + 1 + + 56 + + + + buttonReleased: + + + 8 + + 57 + + + + buttonPressed: + + + 7 + + 60 + + + + + YES + + 0 + + + + + + 1 + + + YES + + + + + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + left + + + 12 + + + right + + + 17 + + + up + + + 22 + + + down + + + 43 + + + push2 + + + 48 + + + push1 + + + 53 + + + push3 + + + 58 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 12.IBPluginDependency + 17.IBPluginDependency + 22.IBPluginDependency + 4.IBPluginDependency + 43.IBPluginDependency + 48.IBPluginDependency + 53.IBPluginDependency + 58.IBPluginDependency + + + YES + OverlayViewController + UIResponder + {{222, 776}, {480, 320}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 62 + + + + YES + + OverlayViewController + UIViewController + + YES + + YES + buttonPressed: + buttonReleased: + + + YES + id + id + + + + popoverController + id + + + IBProjectSource + ../../cocoaTouch/OverlayViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIButton + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UIButton.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + + YES + + YES + arrowDown.png + arrowLeft.png + arrowRight.png + arrowUp.png + joyPush.png + menuCorner.png + + + YES + {64, 64} + {64, 64} + {64, 64} + {64, 64} + {64, 64} + {64, 64} + + + 87 + + diff -r 52f0482b043f -r 198ec44b6d92 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Wed Apr 07 01:22:05 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Wed Apr 07 02:58:12 2010 +0000 @@ -27,6 +27,8 @@ 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; 611B0AA1116B626E00112153 /* GeneralSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */; }; 6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; }; + 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6151347D116C2803001F16D1 /* Icon-iPad.png */; }; + 615134B1116C2C5F001F16D1 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 615134B0116C2C5F001F16D1 /* OverlayViewController.xib */; }; 61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; 61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; }; 6179881B114AA34C00BA94A9 /* PascalExports.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; }; @@ -99,7 +101,6 @@ 6179936D11501D3D00BA94A9 /* arrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936911501D3D00BA94A9 /* arrowRight.png */; }; 6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936A11501D3D00BA94A9 /* arrowUp.png */; }; 617995321150403800BA94A9 /* joyPush.png in Resources */ = {isa = PBXBuildFile; fileRef = 617995311150403800BA94A9 /* joyPush.png */; }; - 61A118431168367200359010 /* OverlayViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118421168367200359010 /* OverlayViewController-iPhone.xib */; }; 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; }; 61A118CA11683C7600359010 /* MainMenuViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118C911683C7600359010 /* MainMenuViewController-iPad.xib */; }; 61A118CC11683C7A00359010 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118CB11683C7A00359010 /* MainMenuViewController-iPhone.xib */; }; @@ -107,7 +108,6 @@ 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; 61A118D411683CD100359010 /* Multiplayer.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9D11155A41000C2203D /* Multiplayer.png */; }; 61A118D511683CD100359010 /* NetworkPlay.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; }; - 61A118DF11683D1F00359010 /* OverlayViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118401168366200359010 /* OverlayViewController-iPad.xib */; }; 61A11A4E1168D13600359010 /* PopoverMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */; }; 61A11AC11168D8B600359010 /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; }; 61A11AC91168DA9400359010 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; }; @@ -184,6 +184,8 @@ 611FD9CF1155A40700C2203D /* NetworkPlay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NetworkPlay.png; path = ../../QTfrontend/res/NetworkPlay.png; sourceTree = SOURCE_ROOT; }; 611FD9D11155A41000C2203D /* Multiplayer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Multiplayer.png; path = ../../QTfrontend/res/Multiplayer.png; sourceTree = SOURCE_ROOT; }; 6122CD00116BECCA002648E9 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "../../cocoaTouch/resources/Default-Landscape.png"; sourceTree = SOURCE_ROOT; }; + 6151347D116C2803001F16D1 /* Icon-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-iPad.png"; path = "../../cocoaTouch/resources/Icon-iPad.png"; sourceTree = SOURCE_ROOT; }; + 615134B0116C2C5F001F16D1 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = ../../cocoaTouch/xib/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; 617987E1114AA34C00BA94A9 /* CCHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = CCHandlers.inc; path = ../../hedgewars/CCHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E4114AA34C00BA94A9 /* GSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GSHandlers.inc; path = ../../hedgewars/GSHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E5114AA34C00BA94A9 /* HHHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = HHHandlers.inc; path = ../../hedgewars/HHHandlers.inc; sourceTree = SOURCE_ROOT; }; @@ -270,8 +272,6 @@ 6179936A11501D3D00BA94A9 /* arrowUp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowUp.png; path = ../../cocoaTouch/resources/arrowUp.png; sourceTree = SOURCE_ROOT; }; 617995311150403800BA94A9 /* joyPush.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyPush.png; path = ../../cocoaTouch/resources/joyPush.png; sourceTree = SOURCE_ROOT; }; 61A117FE1168322700359010 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 61A118401168366200359010 /* OverlayViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "OverlayViewController-iPad.xib"; path = "../../cocoaTouch/xib/OverlayViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; - 61A118421168367200359010 /* OverlayViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "OverlayViewController-iPhone.xib"; path = "../../cocoaTouch/xib/OverlayViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; 61A118C911683C7600359010 /* MainMenuViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPad.xib"; path = "../../cocoaTouch/xib/MainMenuViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; 61A118CB11683C7A00359010 /* MainMenuViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPhone.xib"; path = "../../cocoaTouch/xib/MainMenuViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopoverMenuViewController.h; path = ../../cocoaTouch/PopoverMenuViewController.h; sourceTree = SOURCE_ROOT; }; @@ -411,6 +411,7 @@ 6100DAD4115446B000F455E0 /* Resources-iPad */ = { isa = PBXGroup; children = ( + 6151347D116C2803001F16D1 /* Icon-iPad.png */, 6122CD00116BECCA002648E9 /* Default-Landscape.png */, 61CE2509115E74260098C467 /* XIB */, 611FD9C81155A1F200C2203D /* Background.png */, @@ -424,8 +425,8 @@ 6100DB1711544E8400F455E0 /* XIB */ = { isa = PBXGroup; children = ( + 615134B0116C2C5F001F16D1 /* OverlayViewController.xib */, 61A118CB11683C7A00359010 /* MainMenuViewController-iPhone.xib */, - 61A118421168367200359010 /* OverlayViewController-iPhone.xib */, ); name = XIB; path = Classes; @@ -579,7 +580,6 @@ isa = PBXGroup; children = ( 61A118C911683C7600359010 /* MainMenuViewController-iPad.xib */, - 61A118401168366200359010 /* OverlayViewController-iPad.xib */, ); name = XIB; sourceTree = ""; @@ -741,7 +741,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61A118DF11683D1F00359010 /* OverlayViewController-iPad.xib in Resources */, 61A118D211683CD100359010 /* Background.png in Resources */, 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */, 61A118D411683CD100359010 /* Multiplayer.png in Resources */, @@ -767,10 +766,11 @@ 6179936D11501D3D00BA94A9 /* arrowRight.png in Resources */, 6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */, 617995321150403800BA94A9 /* joyPush.png in Resources */, - 61A118431168367200359010 /* OverlayViewController-iPhone.xib in Resources */, 61A118CA11683C7600359010 /* MainMenuViewController-iPad.xib in Resources */, 61A118CC11683C7A00359010 /* MainMenuViewController-iPhone.xib in Resources */, 6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */, + 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */, + 615134B1116C2C5F001F16D1 /* OverlayViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -994,7 +994,7 @@ ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix"; + FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -dLOWRES"; FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1; FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas"; FPC_RTL_UNITS_BASE = /usr/local/lib/fpc; @@ -1030,7 +1030,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CODE_SIGN_IDENTITY = "Don't Code Sign"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; - FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix"; + FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -dLOWRES"; FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1; FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas"; FPC_RTL_UNITS_BASE = /usr/local/lib/fpc; diff -r 52f0482b043f -r 198ec44b6d92 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Apr 07 01:22:05 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Apr 07 02:58:12 2010 +0000 @@ -202,24 +202,24 @@ Content PBXProjectModuleGUID - 6105637F116C0393003C420C + 615134AB116C2BA9001F16D1 PBXProjectModuleLabel - HogHatViewController.m + OverlayViewController.m PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 61056380116C0393003C420C + 615134AC116C2BA9001F16D1 PBXProjectModuleLabel - HogHatViewController.m + OverlayViewController.m _historyCapacity 0 bookmark - 61056381116C0393003C420C + 615134AD116C2BA9001F16D1 history - 61056362116C0172003C420C + 615134A7116C2B99001F16D1 SplitCount @@ -231,35 +231,35 @@ Geometry Frame - {{0, 20}, {1058, 695}} + {{0, 20}, {938, 870}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 861 306 1058 736 0 0 1920 1178 + 690 205 938 911 0 0 1920 1178 Content PBXProjectModuleGUID - 61056382116C0393003C420C + 61513492116C2954001F16D1 PBXProjectModuleLabel - SingleTeamViewController.m + SDL_uikitappdelegate.m PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 61056383116C0393003C420C + 61513493116C2954001F16D1 PBXProjectModuleLabel - SingleTeamViewController.m + SDL_uikitappdelegate.m _historyCapacity 0 bookmark - 61056384116C0393003C420C + 615134AE116C2BA9001F16D1 history - 6105636C116C01D5003C420C + 61513488116C294A001F16D1 SplitCount @@ -271,11 +271,11 @@ Geometry Frame - {{0, 20}, {1058, 695}} + {{0, 20}, {803, 577}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 530 202 1058 736 0 0 1920 1178 + 1045 262 803 618 0 0 1920 1178 @@ -353,22 +353,21 @@ 611B0A94116B621600112153 61A11AD01168DB1F00359010 29B97317FDCFA39411CA2CEA + 6100DAD4115446B000F455E0 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 19 - 15 - 5 + 25 4 2 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 81}, {235, 558}} + {{0, 0}, {235, 558}} PBXTopSmartGroupGIDs @@ -387,7 +386,7 @@ 235 RubberWindowFrame - 48 186 801 617 0 0 1920 1178 + 426 353 801 617 0 0 1920 1178 Module PBXSmartGroupTreeModule @@ -403,7 +402,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - MasterViewController.m + OverlayViewController.m PBXSplitModuleInNavigatorKey Split0 @@ -411,11 +410,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - MasterViewController.m + OverlayViewController.m _historyCapacity 0 bookmark - 6105637C116C0393003C420C + 615134AA116C2BA9001F16D1 history 6179889D114AA5BD00BA94A9 @@ -426,14 +425,12 @@ 6179937511501D7800BA94A9 6179938511501FFA00BA94A9 6179943111502CEA00BA94A9 - 6194CC0711505FCF00A4BA5C 611FD81D1155111700C2203D 611FD81F1155111700C2203D 611FD8201155111700C2203D 611FD8211155111700C2203D 611FD95711551C3700C2203D 611FD95811551C3700C2203D - 611FD95911551C3700C2203D 611FD96611551E8000C2203D 611FDB6C1155C0B300C2203D 611FDB6D1155C0B300C2203D @@ -442,14 +439,12 @@ 618AFC07115BE92A003D411B 61CE23E7115E49560098C467 61CE23FF115E4B290098C467 - 61CE2514115E74CC0098C467 61CE251F115E75A70098C467 61CCBE60116135FF00833FE8 61CCBF1E116162CA00833FE8 61CCBF451161637F00833FE8 61CCBF461161637F00833FE8 61CCBF471161637F00833FE8 - 61CCBF791161657400833FE8 61CCBF7B1161657400833FE8 61CCBF7C1161657400833FE8 61CCBF7E1161657400833FE8 @@ -460,7 +455,6 @@ 61CCBFD41161833800833FE8 61CCBFD51161833800833FE8 61CCBFD71161833800833FE8 - 61CCBFD81161833800833FE8 61CCBFD91161833800833FE8 61CCBFDA1161833800833FE8 61CCBFDB1161833800833FE8 @@ -481,19 +475,26 @@ 61CEDAA2116ABECE0067BAFC 61CEDB5F116ACBBB0067BAFC 61CEDB60116ACBBB0067BAFC - 61CEDC94116ADCB80067BAFC 611B0AC6116B6E8B00112153 611B0AC8116B6E8B00112153 611B0B84116B817C00112153 611B0BE9116BA1CC00112153 611B0C42116BAF3A00112153 - 61DFFE27116BC80100EA93BB - 6122CD06116BECE0002648E9 61056377116C0393003C420C 61056378116C0393003C420C 61056379116C0393003C420C 6105637A116C0393003C420C - 6105637B116C0393003C420C + 610563DE116C15E5003C420C + 610563DF116C15E5003C420C + 61CEC5A6116C168E009FFF36 + 61513435116C1B07001F16D1 + 61513436116C1B07001F16D1 + 6151348B116C2954001F16D1 + 6151348C116C2954001F16D1 + 6151348D116C2954001F16D1 + 6151348E116C2954001F16D1 + 6151348F116C2954001F16D1 + 61513490116C2954001F16D1 SplitCount @@ -505,14 +506,14 @@ GeometryConfiguration Frame - {{0, 0}, {544, 156}} + {{0, 0}, {544, 125}} RubberWindowFrame - 48 186 801 617 0 0 1920 1178 + 426 353 801 617 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 156pt + 125pt ContentConfiguration @@ -525,14 +526,14 @@ GeometryConfiguration Frame - {{0, 161}, {544, 415}} + {{0, 130}, {544, 446}} RubberWindowFrame - 48 186 801 617 0 0 1920 1178 + 426 353 801 617 0 0 1920 1178 Module XCDetailModule Proportion - 415pt + 446pt Proportion @@ -551,9 +552,9 @@ TableOfContents - 6105637D116C0393003C420C + 61513439116C1B07001F16D1 1CE0B1FE06471DED0097A5F4 - 6105637E116C0393003C420C + 6151343A116C1B07001F16D1 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -691,17 +692,18 @@ 5 WindowOrderList - 6105638D116C0393003C420C - 6105638E116C0393003C420C + 615134AF116C2BA9001F16D1 + 6151343E116C1B07001F16D1 + 6151343F116C1B07001F16D1 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 + 61513492116C2954001F16D1 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 61056382116C0393003C420C - 6105637F116C0393003C420C + 615134AB116C2BA9001F16D1 WindowString - 48 186 801 617 0 0 1920 1178 + 426 353 801 617 0 0 1920 1178 WindowToolsV3 @@ -722,7 +724,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + uStore.pas StatusBarVisibility @@ -739,6 +741,8 @@ 307pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -778,7 +782,7 @@ TableOfContents 61798848114AA42600BA94A9 - 61056385116C0393003C420C + 61513426116C18D5001F16D1 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -902,13 +906,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 61056386116C0393003C420C + 61513427116C18D5001F16D1 1C162984064C10D400B95A72 - 61056387116C0393003C420C - 61056388116C0393003C420C - 61056389116C0393003C420C - 6105638A116C0393003C420C - 6105638B116C0393003C420C + 61513428116C18D5001F16D1 + 61513429116C18D5001F16D1 + 6151342A116C18D5001F16D1 + 6151342B116C18D5001F16D1 + 6151342C116C18D5001F16D1 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -1035,6 +1039,8 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -1047,7 +1053,7 @@ Frame {{0, 0}, {656, 344}} RubberWindowFrame - 1204 210 656 385 0 0 1920 1178 + 881 339 656 385 0 0 1920 1178 Module PBXDebugCLIModule @@ -1070,13 +1076,13 @@ TableOfContents 1C78EAAD065D492600B07095 - 6105638C116C0393003C420C + 6151342D116C18D5001F16D1 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 1204 210 656 385 0 0 1920 1178 + 881 339 656 385 0 0 1920 1178 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible diff -r 52f0482b043f -r 198ec44b6d92 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Apr 07 01:22:05 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Apr 07 02:58:12 2010 +0000 @@ -9,7 +9,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Debug; activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */; - activeSDKPreference = iphonesimulator3.0; + activeSDKPreference = iphonesimulator3.2; activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */, @@ -107,22 +107,17 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 292289473; - PBXWorkspaceStateSaveDate = 292289473; + PBXPerProjectTemplateStateSaveDate = 292296585; + PBXWorkspaceStateSaveDate = 292296585; }; perUserProjectItems = { - 61056362116C0172003C420C /* PBXBookmark */ = 61056362116C0172003C420C /* PBXBookmark */; - 6105636C116C01D5003C420C /* PBXBookmark */ = 6105636C116C01D5003C420C /* PBXBookmark */; - 61056377116C0393003C420C /* PBXBookmark */ = 61056377116C0393003C420C /* PBXBookmark */; - 61056378116C0393003C420C /* PBXTextBookmark */ = 61056378116C0393003C420C /* PBXTextBookmark */; - 61056379116C0393003C420C /* PBXTextBookmark */ = 61056379116C0393003C420C /* PBXTextBookmark */; - 6105637A116C0393003C420C /* PBXTextBookmark */ = 6105637A116C0393003C420C /* PBXTextBookmark */; - 6105637B116C0393003C420C /* PBXBookmark */ = 6105637B116C0393003C420C /* PBXBookmark */; - 6105637C116C0393003C420C /* PBXTextBookmark */ = 6105637C116C0393003C420C /* PBXTextBookmark */; - 61056381116C0393003C420C /* PBXTextBookmark */ = 61056381116C0393003C420C /* PBXTextBookmark */; - 61056384116C0393003C420C /* PBXTextBookmark */ = 61056384116C0393003C420C /* PBXTextBookmark */; + 61056377116C0393003C420C = 61056377116C0393003C420C /* PBXBookmark */; + 61056378116C0393003C420C = 61056378116C0393003C420C /* PBXTextBookmark */; + 61056379116C0393003C420C = 61056379116C0393003C420C /* PBXTextBookmark */; + 6105637A116C0393003C420C = 6105637A116C0393003C420C /* PBXTextBookmark */; + 610563DE116C15E5003C420C = 610563DE116C15E5003C420C /* PBXTextBookmark */; + 610563DF116C15E5003C420C = 610563DF116C15E5003C420C /* PBXTextBookmark */; 611B0AC6116B6E8B00112153 = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */; - 611B0AC7116B6E8B00112153 = 611B0AC7116B6E8B00112153 /* PBXTextBookmark */; 611B0AC8116B6E8B00112153 = 611B0AC8116B6E8B00112153 /* PBXTextBookmark */; 611B0B84116B817C00112153 = 611B0B84116B817C00112153 /* PBXTextBookmark */; 611B0BE9116BA1CC00112153 = 611B0BE9116BA1CC00112153 /* PBXTextBookmark */; @@ -138,15 +133,66 @@ 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */; 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */; 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */; - 6122CC91116BE651002648E9 = 6122CC91116BE651002648E9 /* PBXTextBookmark */; 6122CD06116BECE0002648E9 = 6122CD06116BECE0002648E9 /* PBXTextBookmark */; - 6122CD07116BECE0002648E9 = 6122CD07116BECE0002648E9 /* PBXBookmark */; - 6122CD09116BED82002648E9 = 6122CD09116BED82002648E9 /* PBXBookmark */; 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */; 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */; 612D618F1165545F00C6D842 = 612D618F1165545F00C6D842 /* PBXTextBookmark */; 61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */; 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */; + 61513424116C18D5001F16D1 /* XCBuildMessageTextBookmark */ = 61513424116C18D5001F16D1 /* XCBuildMessageTextBookmark */; + 61513425116C18D5001F16D1 /* PBXTextBookmark */ = 61513425116C18D5001F16D1 /* PBXTextBookmark */; + 61513433116C1AFC001F16D1 /* PBXTextBookmark */ = 61513433116C1AFC001F16D1 /* PBXTextBookmark */; + 61513434116C1B01001F16D1 /* PBXBookmark */ = 61513434116C1B01001F16D1 /* PBXBookmark */; + 61513435116C1B07001F16D1 /* PBXTextBookmark */ = 61513435116C1B07001F16D1 /* PBXTextBookmark */; + 61513436116C1B07001F16D1 /* PBXTextBookmark */ = 61513436116C1B07001F16D1 /* PBXTextBookmark */; + 61513437116C1B07001F16D1 /* PBXTextBookmark */ = 61513437116C1B07001F16D1 /* PBXTextBookmark */; + 61513438116C1B07001F16D1 /* PBXTextBookmark */ = 61513438116C1B07001F16D1 /* PBXTextBookmark */; + 6151343D116C1B07001F16D1 /* PBXTextBookmark */ = 6151343D116C1B07001F16D1 /* PBXTextBookmark */; + 61513440116C1B15001F16D1 /* PBXBookmark */ = 61513440116C1B15001F16D1 /* PBXBookmark */; + 61513443116C1BAA001F16D1 /* PBXTextBookmark */ = 61513443116C1BAA001F16D1 /* PBXTextBookmark */; + 61513444116C1BAD001F16D1 /* PBXBookmark */ = 61513444116C1BAD001F16D1 /* PBXBookmark */; + 61513448116C1BC8001F16D1 /* PBXTextBookmark */ = 61513448116C1BC8001F16D1 /* PBXTextBookmark */; + 6151344B116C1BC8001F16D1 /* PBXTextBookmark */ = 6151344B116C1BC8001F16D1 /* PBXTextBookmark */; + 6151344C116C1BC8001F16D1 /* PBXTextBookmark */ = 6151344C116C1BC8001F16D1 /* PBXTextBookmark */; + 6151344F116C1BC8001F16D1 /* PBXTextBookmark */ = 6151344F116C1BC8001F16D1 /* PBXTextBookmark */; + 61513451116C1C65001F16D1 /* PBXTextBookmark */ = 61513451116C1C65001F16D1 /* PBXTextBookmark */; + 61513454116C1C76001F16D1 /* PBXTextBookmark */ = 61513454116C1C76001F16D1 /* PBXTextBookmark */; + 61513455116C1C76001F16D1 /* PBXTextBookmark */ = 61513455116C1C76001F16D1 /* PBXTextBookmark */; + 61513456116C1C76001F16D1 /* PBXTextBookmark */ = 61513456116C1C76001F16D1 /* PBXTextBookmark */; + 61513457116C1C76001F16D1 /* PBXTextBookmark */ = 61513457116C1C76001F16D1 /* PBXTextBookmark */; + 6151345B116C1CA3001F16D1 /* PBXTextBookmark */ = 6151345B116C1CA3001F16D1 /* PBXTextBookmark */; + 6151345C116C1CA3001F16D1 /* PBXTextBookmark */ = 6151345C116C1CA3001F16D1 /* PBXTextBookmark */; + 6151345D116C1CA3001F16D1 /* PBXTextBookmark */ = 6151345D116C1CA3001F16D1 /* PBXTextBookmark */; + 6151345E116C1CA3001F16D1 /* PBXTextBookmark */ = 6151345E116C1CA3001F16D1 /* PBXTextBookmark */; + 61513463116C1CF9001F16D1 /* PBXTextBookmark */ = 61513463116C1CF9001F16D1 /* PBXTextBookmark */; + 61513464116C1CF9001F16D1 /* PBXTextBookmark */ = 61513464116C1CF9001F16D1 /* PBXTextBookmark */; + 61513465116C1CF9001F16D1 /* PBXTextBookmark */ = 61513465116C1CF9001F16D1 /* PBXTextBookmark */; + 61513469116C1D12001F16D1 /* PBXTextBookmark */ = 61513469116C1D12001F16D1 /* PBXTextBookmark */; + 6151346A116C1D12001F16D1 /* PBXTextBookmark */ = 6151346A116C1D12001F16D1 /* PBXTextBookmark */; + 6151346B116C1D12001F16D1 /* PBXTextBookmark */ = 6151346B116C1D12001F16D1 /* PBXTextBookmark */; + 6151346E116C1D85001F16D1 /* PBXTextBookmark */ = 6151346E116C1D85001F16D1 /* PBXTextBookmark */; + 6151346F116C1D85001F16D1 /* PBXTextBookmark */ = 6151346F116C1D85001F16D1 /* PBXTextBookmark */; + 61513470116C1D85001F16D1 /* PBXTextBookmark */ = 61513470116C1D85001F16D1 /* PBXTextBookmark */; + 61513476116C1E24001F16D1 /* PBXTextBookmark */ = 61513476116C1E24001F16D1 /* PBXTextBookmark */; + 61513477116C1E24001F16D1 /* PBXTextBookmark */ = 61513477116C1E24001F16D1 /* PBXTextBookmark */; + 61513478116C1E24001F16D1 /* PBXTextBookmark */ = 61513478116C1E24001F16D1 /* PBXTextBookmark */; + 6151347A116C2662001F16D1 /* PBXBookmark */ = 6151347A116C2662001F16D1 /* PBXBookmark */; + 61513488116C294A001F16D1 /* PBXBookmark */ = 61513488116C294A001F16D1 /* PBXBookmark */; + 6151348B116C2954001F16D1 /* PBXTextBookmark */ = 6151348B116C2954001F16D1 /* PBXTextBookmark */; + 6151348C116C2954001F16D1 /* PBXBookmark */ = 6151348C116C2954001F16D1 /* PBXBookmark */; + 6151348D116C2954001F16D1 /* PBXBookmark */ = 6151348D116C2954001F16D1 /* PBXBookmark */; + 6151348E116C2954001F16D1 /* PBXBookmark */ = 6151348E116C2954001F16D1 /* PBXBookmark */; + 6151348F116C2954001F16D1 /* PlistBookmark */ = 6151348F116C2954001F16D1 /* PlistBookmark */; + 61513490116C2954001F16D1 /* PBXTextBookmark */ = 61513490116C2954001F16D1 /* PBXTextBookmark */; + 61513491116C2954001F16D1 /* PBXTextBookmark */ = 61513491116C2954001F16D1 /* PBXTextBookmark */; + 61513494116C2954001F16D1 /* PBXTextBookmark */ = 61513494116C2954001F16D1 /* PBXTextBookmark */; + 61513497116C2954001F16D1 /* PlistBookmark */ = 61513497116C2954001F16D1 /* PlistBookmark */; + 615134A4116C2B69001F16D1 /* PBXTextBookmark */ = 615134A4116C2B69001F16D1 /* PBXTextBookmark */; + 615134A5116C2B69001F16D1 /* PBXTextBookmark */ = 615134A5116C2B69001F16D1 /* PBXTextBookmark */; + 615134A7116C2B99001F16D1 /* PBXBookmark */ = 615134A7116C2B99001F16D1 /* PBXBookmark */; + 615134AA116C2BA9001F16D1 /* PBXTextBookmark */ = 615134AA116C2BA9001F16D1 /* PBXTextBookmark */; + 615134AD116C2BA9001F16D1 /* PBXTextBookmark */ = 615134AD116C2BA9001F16D1 /* PBXTextBookmark */; + 615134AE116C2BA9001F16D1 /* PBXTextBookmark */ = 615134AE116C2BA9001F16D1 /* PBXTextBookmark */; 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */; 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */; 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */; @@ -189,11 +235,12 @@ 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */; 61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */; 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */; + 61CEC5A6116C168E009FFF36 = 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */; + 61CEC5BD116C1734009FFF36 = 61CEC5BD116C1734009FFF36 /* PBXTextBookmark */; 61CEDAA1116ABECE0067BAFC = 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */; 61CEDAA2116ABECE0067BAFC = 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */; 61CEDB5F116ACBBB0067BAFC = 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */; 61CEDB60116ACBBB0067BAFC = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */; - 61CEDC94116ADCB80067BAFC = 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */; 61DFFE27116BC80100EA93BB = 61DFFE27116BC80100EA93BB /* PBXTextBookmark */; 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; }; @@ -208,14 +255,6 @@ sepNavVisRange = "{106, 119}"; }; }; - 61056362116C0172003C420C /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; - }; - 6105636C116C01D5003C420C /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; - }; 61056377116C0393003C420C /* PBXBookmark */ = { isa = PBXBookmark; fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; @@ -250,39 +289,32 @@ vrLen = 223; vrLoc = 0; }; - 6105637B116C0393003C420C /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; - }; - 6105637C116C0393003C420C /* PBXTextBookmark */ = { + 610563DE116C15E5003C420C /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; name = "MasterViewController.m: 11"; rLen = 0; rLoc = 260; rType = 0; - vrLen = 207; + vrLen = 203; vrLoc = 3996; }; - 61056381116C0393003C420C /* PBXTextBookmark */ = { + 610563DF116C15E5003C420C /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; - name = "HogHatViewController.m: 31"; + fRef = 610563E0116C15E5003C420C /* SDL_renderer_gles.c */; + name = "SDL_renderer_gles.c: 341"; rLen = 0; - rLoc = 1222; + rLoc = 11314; rType = 0; - vrLen = 1971; - vrLoc = 152; + vrLen = 357; + vrLoc = 11160; }; - 61056384116C0393003C420C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; - name = "SingleTeamViewController.m: 63"; - rLen = 0; - rLoc = 2616; - rType = 0; - vrLen = 1670; - vrLoc = 1660; + 610563E0116C15E5003C420C /* SDL_renderer_gles.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = SDL_renderer_gles.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/video/SDL_renderer_gles.c"; + sourceTree = ""; }; 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */ = { uiCtxt = { @@ -309,16 +341,6 @@ vrLen = 3; vrLoc = 0; }; - 611B0AC7116B6E8B00112153 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; - name = "DetailViewController.m: 33"; - rLen = 5; - rLoc = 1379; - rType = 0; - vrLen = 27; - vrLoc = 7; - }; 611B0AC8116B6E8B00112153 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */; @@ -439,16 +461,6 @@ vrLen = 201; vrLoc = 686; }; - 6122CC91116BE651002648E9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; - name = "SingleTeamViewController.m: 74"; - rLen = 0; - rLoc = 3036; - rType = 0; - vrLen = 146; - vrLoc = 2772; - }; 6122CD06116BECE0002648E9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; @@ -459,14 +471,6 @@ vrLen = 247; vrLoc = 0; }; - 6122CD07116BECE0002648E9 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; - }; - 6122CD09116BED82002648E9 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; - }; 612D5C451165535400C6D842 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; @@ -517,12 +521,499 @@ vrLen = 3; vrLoc = 0; }; + 61513424116C18D5001F16D1 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "5: Local variable \"vendor\" is assigned but never used"; + fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 1121; + rType = 1; + }; + 61513425116C18D5001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; + name = "uStore.pas: 1122"; + rLen = 0; + rLoc = 37059; + rType = 0; + vrLen = 699; + vrLoc = 36773; + }; + 61513433116C1AFC001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; + name = "uStore.pas: 1122"; + rLen = 0; + rLoc = 37059; + rType = 0; + vrLen = 801; + vrLoc = 36773; + }; + 61513434116C1B01001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + }; + 61513435116C1B07001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987EB114AA34C00BA94A9 /* options.inc */; + name = "options.inc: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 320; + vrLoc = 0; + }; + 61513436116C1B07001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; + name = "uStore.pas: 1122"; + rLen = 0; + rLoc = 37059; + rType = 0; + vrLen = 87; + vrLoc = 37021; + }; + 61513437116C1B07001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 61513438116C1B07001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 153; + vrLoc = 0; + }; + 6151343D116C1B07001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 32"; + rLen = 0; + rLoc = 1141; + rType = 0; + vrLen = 1930; + vrLoc = 2721; + }; + 61513440116C1B15001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + }; + 61513443116C1BAA001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; + name = "uStore.pas: 1122"; + rLen = 0; + rLoc = 37059; + rType = 0; + vrLen = 699; + vrLoc = 36773; + }; + 61513444116C1BAD001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + }; + 61513448116C1BC8001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 6151344B116C1BC8001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 135"; + rLen = 0; + rLoc = 5147; + rType = 0; + vrLen = 1525; + vrLoc = 4628; + }; + 6151344C116C1BC8001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1668; + vrLoc = 2527; + }; + 6151344F116C1BC8001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 32"; + rLen = 184; + rLoc = 737; + rType = 0; + vrLen = 2172; + vrLoc = 0; + }; + 61513451116C1C65001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; + name = "uStore.pas: 1122"; + rLen = 0; + rLoc = 37059; + rType = 0; + vrLen = 801; + vrLoc = 36773; + }; + 61513454116C1C76001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 61513455116C1C76001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 31"; + rLen = 47; + rLoc = 690; + rType = 0; + vrLen = 2172; + vrLoc = 0; + }; + 61513456116C1C76001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 135"; + rLen = 0; + rLoc = 5147; + rType = 0; + vrLen = 1525; + vrLoc = 4628; + }; + 61513457116C1C76001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1668; + vrLoc = 2527; + }; + 6151345B116C1CA3001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 6151345C116C1CA3001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 31"; + rLen = 47; + rLoc = 690; + rType = 0; + vrLen = 2172; + vrLoc = 0; + }; + 6151345D116C1CA3001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 135"; + rLen = 0; + rLoc = 5147; + rType = 0; + vrLen = 1525; + vrLoc = 4628; + }; + 6151345E116C1CA3001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1668; + vrLoc = 2527; + }; + 61513463116C1CF9001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 61513464116C1CF9001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 139"; + rLen = 0; + rLoc = 5217; + rType = 0; + vrLen = 1595; + vrLoc = 4864; + }; + 61513465116C1CF9001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1668; + vrLoc = 2527; + }; + 61513469116C1D12001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 153; + vrLoc = 0; + }; + 6151346A116C1D12001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 139"; + rLen = 0; + rLoc = 5217; + rType = 0; + vrLen = 1598; + vrLoc = 4864; + }; + 6151346B116C1D12001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1805; + vrLoc = 2527; + }; + 6151346E116C1D85001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 6151346F116C1D85001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 160"; + rLen = 0; + rLoc = 5772; + rType = 0; + vrLen = 1597; + vrLoc = 4864; + }; + 61513470116C1D85001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1668; + vrLoc = 2527; + }; + 61513476116C1E24001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 149; + vrLoc = 0; + }; + 61513477116C1E24001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 101"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 1668; + vrLoc = 2527; + }; + 61513478116C1E24001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 135"; + rLen = 0; + rLoc = 5147; + rType = 0; + vrLen = 1392; + vrLoc = 4864; + }; + 6151347A116C2662001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + }; + 61513488116C294A001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + }; + 6151348B116C2954001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 115"; + rLen = 0; + rLoc = 3977; + rType = 0; + vrLen = 153; + vrLoc = 0; + }; + 6151348C116C2954001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798A26114ADD2600BA94A9 /* Icon.png */; + }; + 6151348D116C2954001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 6151347D116C2803001F16D1 /* Icon-iPad.png */; + }; + 6151348E116C2954001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798A2B114ADD2600BA94A9 /* title.png */; + }; + 6151348F116C2954001F16D1 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/Info.plist; + rLen = 0; + rLoc = 9223372036854775807; + }; + 61513490116C2954001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 391; + rType = 0; + vrLen = 196; + vrLoc = 51; + }; + 61513491116C2954001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 391; + rType = 0; + vrLen = 196; + vrLoc = 51; + }; + 61513494116C2954001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 94"; + rLen = 0; + rLoc = 2966; + rType = 0; + vrLen = 1806; + vrLoc = 2528; + }; + 61513497116C2954001F16D1 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/Info.plist; + rLen = 0; + rLoc = 9223372036854775807; + }; + 615134A4116C2B69001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 391; + rType = 0; + vrLen = 170; + vrLoc = 51; + }; + 615134A5116C2B69001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 92"; + rLen = 0; + rLoc = 2851; + rType = 0; + vrLen = 1679; + vrLoc = 2528; + }; + 615134A7116C2B99001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + }; + 615134AA116C2BA9001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 391; + rType = 0; + vrLen = 170; + vrLoc = 51; + }; + 615134AD116C2BA9001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 35"; + rLen = 0; + rLoc = 990; + rType = 0; + vrLen = 2215; + vrLoc = 0; + }; + 615134AE116C2BA9001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 92"; + rLen = 0; + rLoc = 2851; + rType = 0; + vrLen = 1679; + vrLoc = 2528; + }; 615F1316116561BE002444F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; name = "SDL_uikitappdelegate.h: 40"; rLen = 0; - rLoc = 1430; + rLoc = 1384; rType = 0; vrLen = 331; vrLoc = 1260; @@ -677,9 +1168,9 @@ }; 617987EB114AA34C00BA94A9 /* options.inc */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {862, 572}}"; + sepNavIntBoundsRect = "{{0, 0}, {509, 507}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{317, 874}"; + sepNavVisRange = "{0, 320}"; sepNavWindowFrame = "{{864, 517}, {921, 605}}"; }; }; @@ -916,9 +1407,9 @@ }; 6179880B114AA34C00BA94A9 /* uStore.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {824, 19799}}"; - sepNavSelRange = "{36649, 0}"; - sepNavVisRange = "{36112, 1360}"; + sepNavIntBoundsRect = "{{0, 0}, {824, 19708}}"; + sepNavSelRange = "{37059, 0}"; + sepNavVisRange = "{36773, 699}"; sepNavWindowFrame = "{{38, 478}, {803, 674}}"; }; }; @@ -1000,18 +1491,18 @@ }; 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {744, 754}}"; - sepNavSelRange = "{1258, 0}"; - sepNavVisRange = "{745, 1228}"; + sepNavIntBoundsRect = "{{0, 0}, {744, 728}}"; + sepNavSelRange = "{1384, 0}"; + sepNavVisRange = "{673, 1182}"; sepNavWindowFrame = "{{471, 203}, {803, 674}}"; }; }; 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {483, 2041}}"; - sepNavSelRange = "{1141, 0}"; - sepNavVisRange = "{0, 0}"; - sepNavWindowFrame = "{{567, 167}, {803, 674}}"; + sepNavIntBoundsRect = "{{0, 0}, {873, 2119}}"; + sepNavSelRange = "{2851, 0}"; + sepNavVisRange = "{2528, 1679}"; + sepNavWindowFrame = "{{1045, 206}, {803, 674}}"; }; }; 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */ = { @@ -1023,9 +1514,9 @@ }; 61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {691, 1625}}"; + sepNavIntBoundsRect = "{{0, 0}, {735, 1677}}"; sepNavSelRange = "{1723, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavVisRange = "{0, 1306}"; sepNavWindowFrame = "{{880, 321}, {794, 632}}"; }; }; @@ -1039,9 +1530,9 @@ }; 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 2483}}"; - sepNavSelRange = "{2834, 0}"; - sepNavVisRange = "{1602, 2823}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2431}}"; + sepNavSelRange = "{5147, 0}"; + sepNavVisRange = "{4864, 1466}"; sepNavWindowFrame = "{{260, 136}, {1058, 792}}"; }; }; @@ -1076,6 +1567,11 @@ sepNavWindowFrame = "{{38, 360}, {1058, 792}}"; }; }; + 61798A26114ADD2600BA94A9 /* Icon.png */ = { + uiCtxt = { + sepNavWindowFrame = "{{38, 360}, {1058, 792}}"; + }; + }; 6179928B114AE0C800BA94A9 /* UpdateDataFolder */ = { activeExec = 0; }; @@ -1168,9 +1664,9 @@ }; 61A11AC81168DA9400359010 /* MasterViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 2054}}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 2015}}"; sepNavSelRange = "{260, 0}"; - sepNavVisRange = "{3996, 207}"; + sepNavVisRange = "{3996, 203}"; sepNavWindowFrame = "{{312, 236}, {1058, 792}}"; }; }; @@ -1217,7 +1713,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1111, 3250}}"; sepNavSelRange = "{2616, 0}"; - sepNavVisRange = "{1660, 1670}"; + sepNavVisRange = "{1897, 1752}"; sepNavWindowFrame = "{{530, 146}, {1058, 792}}"; }; }; @@ -1230,9 +1726,9 @@ }; 61A11AE31168DC9400359010 /* HogHatViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1090, 2847}}"; - sepNavSelRange = "{1222, 0}"; - sepNavVisRange = "{152, 1971}"; + sepNavIntBoundsRect = "{{0, 0}, {551, 2912}}"; + sepNavSelRange = "{3977, 0}"; + sepNavVisRange = "{0, 153}"; sepNavWindowFrame = "{{861, 250}, {1058, 792}}"; }; }; @@ -1470,9 +1966,9 @@ }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {985, 4238}}"; - sepNavSelRange = "{391, 0}"; - sepNavVisRange = "{0, 247}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 4134}}"; + sepNavSelRange = "{990, 0}"; + sepNavVisRange = "{0, 2273}"; sepNavWindowFrame = "{{690, 149}, {938, 967}}"; }; }; @@ -1484,6 +1980,26 @@ isa = PBXBookmark; fRef = 61798A28114ADD2600BA94A9 /* playButton.png */; }; + 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 32"; + rLen = 0; + rLoc = 1141; + rType = 0; + vrLen = 392; + vrLoc = 3; + }; + 61CEC5BD116C1734009FFF36 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987EB114AA34C00BA94A9 /* options.inc */; + name = "options.inc: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 387; + vrLoc = 0; + }; 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; @@ -1524,16 +2040,6 @@ vrLen = 0; vrLoc = 0; }; - 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; - name = "SDL_uikitappdelegate.m: 32"; - rLen = 0; - rLoc = 1141; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 61DFFE27116BC80100EA93BB /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; @@ -1554,6 +2060,11 @@ vrLen = 181; vrLoc = 0; }; + 8D1107310486CEB800E47090 /* Info.plist */ = { + uiCtxt = { + sepNavWindowFrame = "{{777, 277}, {1058, 792}}"; + }; + }; 928301160F10CAFC00CC5A3C /* fpc */ = { activeExec = 0; }; diff -r 52f0482b043f -r 198ec44b6d92 project_files/HedgewarsMobile/Info.plist --- a/project_files/HedgewarsMobile/Info.plist Wed Apr 07 01:22:05 2010 +0000 +++ b/project_files/HedgewarsMobile/Info.plist Wed Apr 07 02:58:12 2010 +0000 @@ -16,8 +16,11 @@ com.kodahedge.${PRODUCT_NAME:identifier} CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - + CFBundleIconFiles + + Icon.png + Icon-iPad.png + CFBundleDevelopmentRegion English CFBundleInfoDictionaryVersion