# HG changeset patch # User koda # Date 1283139723 -7200 # Node ID 98072b3871c1f3e178cc7412ac876b69847a2bb3 # Parent 8f48b54f42cea17b25678dbf2c2f7d1761352273 help page for ingame, some other fixes here and there diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.h Mon Aug 30 05:42:03 2010 +0200 @@ -0,0 +1,18 @@ +// +// HelpPageLobbyViewController.h +// Hedgewars +// +// Created by Vittorio on 30/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface HelpPageLobbyViewController : UIViewController { + +} + +-(IBAction) dismiss; + +@end diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m Mon Aug 30 05:42:03 2010 +0200 @@ -0,0 +1,42 @@ + // +// HelpPageLobbyViewController.m +// Hedgewars +// +// Created by Vittorio on 30/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "HelpPageLobbyViewController.h" +#import "CommodityFunctions.h" + +@implementation HelpPageLobbyViewController + + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + +-(void) didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + // Release any cached data, images, etc that aren't in use. +} + +-(void) viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + +-(void) dealloc { + [super dealloc]; +} + +-(IBAction) dismiss { + [UIView beginAnimations:@"helpingame" context:NULL]; + self.view.alpha = 0; + [UIView commitAnimations]; + [self.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1]; +} + +@end diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib Mon Aug 30 05:42:03 2010 +0200 @@ -0,0 +1,889 @@ + + + + 1024 + 10F569 + 788 + 1038.29 + 461.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 117 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + + YES + + + 292 + {{0, -1}, {1024, 768}} + + NO + NO + IBIPadFramework + + NSImage + helpingame.png + + + + + 292 + {{79, 473}, {150, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Direction buttons + + Helvetica-Bold + 18 + 16 + + + 1 + MCAwIDAAA + + + 1 + 10 + + + + 292 + {{79, 491}, {203, 85}} + + NO + YES + 7 + NO + IBIPadFramework + With these buttons you can move your hog, aim and control certain weapons. + + Helvetica + 16 + 16 + + + + 1 + 10 + 0 + + + + 292 + {{53, 97}, {186, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Timer + + + + 1 + 10 + + + + 292 + {{53, 118}, {187, 43}} + + NO + YES + 7 + NO + IBIPadFramework + Don't let your turn time run out! + + + + 1 + 10 + 0 + + + + 292 + {{780, 248}, {240, 128}} + + NO + NO + IBIPadFramework + + NSImage + helpright.png + + + + + 292 + {{790, 256}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Ammo Menu + + + + 1 + 10 + + + + 292 + {{790, 282}, {214, 84}} + + NO + YES + 7 + NO + IBIPadFramework + This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does! + + + + 1 + 10 + 0 + + + + 292 + {{780, 97}, {186, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Pause / Open ammos + + + + 1 + 10 + + + + 292 + {{782, 118}, {187, 43}} + + NO + YES + 7 + NO + IBIPadFramework + Tap to pause or open the ammo menu. + + + + 1 + 10 + 0 + + + + 292 + {{418, 73}, {186, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Wind bar + + + + 1 + 10 + + + + 292 + {{418, 89}, {191, 63}} + + NO + YES + 7 + NO + IBIPadFramework + Some weapons are affected by the wind and their direction may shift. + + + + 1 + 10 + 0 + + + + 292 + {{447, 573}, {203, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Teams flags and health + + + + 1 + 10 + + + + 292 + {{447, 592}, {203, 85}} + + NO + YES + 7 + NO + IBIPadFramework + These bars report the team name, the team flags and the global health status of every hog. + + + + 1 + 10 + 4 + + + + 292 + {{741, 501}, {135, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Joypad buttons + + + + 1 + 10 + + + + 292 + {{741, 520}, {211, 85}} + + NO + YES + 7 + NO + IBIPadFramework + Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items. + + + + 1 + 10 + 0 + + + + 292 + {{67, 238}, {240, 128}} + + NO + NO + IBIPadFramework + + NSImage + helpplain.png + + + + + 292 + {{72, 246}, {229, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Tap to return to game + + + + 1 + 10 + 1 + + + + 292 + {{72, 268}, {229, 87}} + + NO + YES + 7 + NO + IBIPadFramework + Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more! + + + + 1 + 10 + 0 + + + {1024, 768} + + + 3 + MCAwLjQAA + + NO + NO + + 3 + + IBIPadFramework + + + + + YES + + + view + + + + 3 + + + + dismiss + + + 7 + + 16 + + + + + YES + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 14 + + + + + 17 + + + + + 18 + + + + + 21 + + + + + 22 + + + + + 23 + + + + + 24 + + + + + 25 + + + + + 26 + + + + + 27 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 10.IBPluginDependency + 11.IBPluginDependency + 12.IBPluginDependency + 13.IBPluginDependency + 14.IBPluginDependency + 17.IBPluginDependency + 18.IBPluginDependency + 2.CustomClassName + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 21.IBPluginDependency + 22.IBPluginDependency + 23.IBPluginDependency + 24.IBPluginDependency + 25.IBPluginDependency + 26.IBPluginDependency + 27.IBPluginDependency + 5.IBPluginDependency + 6.IBPluginDependency + 7.IBPluginDependency + 8.IBPluginDependency + 9.IBPluginDependency + + + YES + HelpPageLobbyViewController + UIResponder + 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 + UIControl + {{288, 156}, {1024, 768}} + 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 27 + + + + YES + + HelpPageLobbyViewController + UIViewController + + dismiss + id + + + dismiss + + dismiss + id + + + + IBProjectSource + Classes/HelpPageLobbyViewController.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/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.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 + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.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 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../Hedgewars.xcodeproj + 3 + + YES + + YES + helpingame.png + helpplain.png + helpright.png + + + YES + {1024, 768} + {296, 138} + {308, 144} + + + 117 + + diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/InGameMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Aug 30 05:42:03 2010 +0200 @@ -109,7 +109,7 @@ switch ([indexPath row]) { case 0: - HW_pause(); + [[NSNotificationCenter defaultCenter] postNotificationName:@"show help ingame" object:nil]; break; case 1: if (SDL_iPhoneKeyboardIsShown(sdlwindow)) diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 30 05:42:03 2010 +0200 @@ -464,7 +464,7 @@ // dummy value, everything is set by -updatePreview -> -didSelectRowAtIndexPath -> -updatePreviewWithMap staticmap = @"map Bamboo"; self.slider.enabled = NO; - self.sizeLabel.text = @""; + self.sizeLabel.text = NSLocalizedString(@"No filter",@""); [self restoreBackgroundImage]; break; @@ -538,6 +538,10 @@ // select a map at first because it's faster - done in IB //self.segmentedControl.selectedSegmentIndex = 1; + if (self.segmentedControl.selectedSegmentIndex == 1) { + self.slider.enabled = NO; + self.sizeLabel.text = NSLocalizedString(@"No filter",@""); + } self.templateFilterCommand = @"e$template_filter 0"; self.mazeSizeCommand = @"e$maze_size 0"; @@ -574,6 +578,7 @@ -(void) didReceiveMemoryWarning { [super didReceiveMemoryWarning]; //[previewButton setImage:nil forState:UIControlStateNormal]; + MSG_MEMCLEAN(); } -(void) viewDidUnload { diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 30 05:42:03 2010 +0200 @@ -10,6 +10,7 @@ #import "SDL_sysvideo.h" @class InGameMenuViewController; +@class HelpPageLobbyViewController; @interface OverlayViewController : UIViewController { // the timer that dims the overlay @@ -20,6 +21,9 @@ InGameMenuViewController *popupMenu; BOOL isPopoverVisible; + // the help menu + HelpPageLobbyViewController *helpPage; + // ths touch section CGFloat initialDistanceForPinching; CGPoint startingPoint; @@ -32,6 +36,7 @@ @property (nonatomic,retain) id popoverController; @property (nonatomic,retain) InGameMenuViewController *popupMenu; +@property (nonatomic,retain) HelpPageLobbyViewController *helpPage; -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; @@ -48,5 +53,7 @@ @end +// understands when the loading screen is done BOOL isGameRunning; - +// cache the grenade time +NSInteger cachedGrenadeTime; \ No newline at end of file diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Classes/OverlayViewController.m --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 30 05:42:03 2010 +0200 @@ -8,12 +8,13 @@ #import "OverlayViewController.h" #import "SDL_uikitappdelegate.h" +#import "InGameMenuViewController.h" +#import "HelpPageLobbyViewController.h" #import "PascalImports.h" +#import "CommodityFunctions.h" #import "CGPointUtils.h" +#import "SDL_config_iphoneos.h" #import "SDL_mouse.h" -#import "InGameMenuViewController.h" -#import "CommodityFunctions.h" -#import "SDL_config_iphoneos.h" #define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] #define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] @@ -26,7 +27,7 @@ #define removeConfirmationInput() [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; @implementation OverlayViewController -@synthesize popoverController, popupMenu; +@synthesize popoverController, popupMenu, helpPage; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return rotationManager(interfaceOrientation); @@ -82,6 +83,8 @@ #pragma mark - #pragma mark View Management -(void) viewDidLoad { + isGameRunning = NO; + cachedGrenadeTime = 2; isAttacking = NO; // i called it a popover even on the iphone @@ -124,6 +127,11 @@ name:UIDeviceOrientationDidChangeNotification object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(showHelp:) + name:@"show help ingame" + object:nil]; + [UIView beginAnimations:@"showing overlay" context:NULL]; [UIView setAnimationDuration:1]; self.view.alpha = 1; @@ -135,10 +143,23 @@ sdlwindow = display->windows; } +-(void) showHelp:(id) sender { + if (self.helpPage == nil) + self.helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController" bundle:nil]; + self.helpPage.view.alpha = 0; + [self.view addSubview:helpPage.view]; + [UIView beginAnimations:@"helpingame" context:NULL]; + self.helpPage.view.alpha = 1; + [UIView commitAnimations]; + doNotDim(); +} + -(void) didReceiveMemoryWarning { [super didReceiveMemoryWarning]; if (self.popupMenu.view.superview == nil) self.popupMenu = nil; + if (self.helpPage.view.superview == nil) + self.helpPage = nil; MSG_MEMCLEAN(); } @@ -152,6 +173,7 @@ -(void) dealloc { [popupMenu release]; + [helpPage release]; [popoverController release]; // dimTimer is autoreleased [super dealloc]; @@ -250,11 +272,13 @@ HW_backjump(); break; case 10: + playSound(@"clickSound"); HW_pause(); removeConfirmationInput(); [self showPopover]; break; case 11: + playSound(@"clickSound"); removeConfirmationInput(); HW_ammoMenu(); break; @@ -419,7 +443,7 @@ [grenadeTime addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged]; grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); - grenadeTime.selectedSegmentIndex = 2; + grenadeTime.selectedSegmentIndex = cachedGrenadeTime; grenadeTime.tag = GRENADE_TAG; [self.view addSubview:grenadeTime]; [grenadeTime release]; @@ -456,7 +480,10 @@ -(void) setGrenadeTime:(id) sender { UISegmentedControl *theSegment = (UISegmentedControl *)sender; - HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); + if (cachedGrenadeTime != theSegment.selectedSegmentIndex) { + HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); + cachedGrenadeTime = theSegment.selectedSegmentIndex; + } } -(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { @@ -555,6 +582,8 @@ [theWindow performSelector:@selector(removeFromSuperview) withObject:theButton afterDelay:0.3]; [theWindow performSelector:@selector(removeFromSuperview) withObject:theSegment afterDelay:0.3]; + + cachedGrenadeTime = 2; } @end diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 30 05:42:03 2010 +0200 @@ -34,6 +34,12 @@ 611EE9D9122AA10A00DF6938 /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; }; 611EE9DA122AA10A00DF6938 /* selSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D8122AA10A00DF6938 /* selSound.wav */; }; 611EEA7E122B09C200DF6938 /* background_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEA7D122B09C200DF6938 /* background_small.png */; }; + 611EEAEE122B2A4D00DF6938 /* HelpPageLobbyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611EEAEC122B2A4D00DF6938 /* HelpPageLobbyViewController.m */; }; + 611EEAEF122B2A4D00DF6938 /* HelpPageLobbyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */; }; + 611EEBC1122B34A800DF6938 /* helpingame.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEBC0122B34A800DF6938 /* helpingame.png */; }; + 611EEBC4122B355700DF6938 /* helpbottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEBC2122B355700DF6938 /* helpbottom.png */; }; + 611EEBC5122B355700DF6938 /* helpright.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEBC3122B355700DF6938 /* helpright.png */; }; + 611EEC31122B54D700DF6938 /* helpplain.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEC30122B54D700DF6938 /* helpplain.png */; }; 611F4D4B11B27A9900F9759A /* uScript.pas in Sources */ = {isa = PBXBuildFile; fileRef = 611F4D4A11B27A9900F9759A /* uScript.pas */; }; 61272334117DF764005B90CF /* libSDL_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272333117DF752005B90CF /* libSDL_image.a */; }; 61272339117DF778005B90CF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272338117DF778005B90CF /* MobileCoreServices.framework */; }; @@ -687,6 +693,13 @@ 611EE9D7122AA10A00DF6938 /* backSound.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = backSound.wav; path = Resources/backSound.wav; sourceTree = ""; }; 611EE9D8122AA10A00DF6938 /* selSound.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = selSound.wav; path = Resources/selSound.wav; sourceTree = ""; }; 611EEA7D122B09C200DF6938 /* background_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background_small.png; path = Resources/Overlay/background_small.png; sourceTree = ""; }; + 611EEAEB122B2A4D00DF6938 /* HelpPageLobbyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPageLobbyViewController.h; sourceTree = ""; }; + 611EEAEC122B2A4D00DF6938 /* HelpPageLobbyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPageLobbyViewController.m; sourceTree = ""; }; + 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HelpPageLobbyViewController.xib; sourceTree = ""; }; + 611EEBC0122B34A800DF6938 /* helpingame.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpingame.png; path = Resources/Overlay/helpingame.png; sourceTree = ""; }; + 611EEBC2122B355700DF6938 /* helpbottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpbottom.png; path = Resources/Overlay/helpbottom.png; sourceTree = ""; }; + 611EEBC3122B355700DF6938 /* helpright.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpright.png; path = Resources/Overlay/helpright.png; sourceTree = ""; }; + 611EEC30122B54D700DF6938 /* helpplain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpplain.png; path = Resources/Overlay/helpplain.png; sourceTree = ""; }; 611F4D4A11B27A9900F9759A /* uScript.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uScript.pas; path = ../../hedgewars/uScript.pas; sourceTree = SOURCE_ROOT; }; 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HedgewarsTitle.png; path = ../../QTfrontend/res/HedgewarsTitle.png; sourceTree = SOURCE_ROOT; }; 6127232E117DF752005B90CF /* SDL_image.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_image.xcodeproj; path = "../../../Library/SDL-1.3/SDL_image/Xcode_iPhone/SDL_image.xcodeproj"; sourceTree = SOURCE_ROOT; }; @@ -948,6 +961,10 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 611EEBC0122B34A800DF6938 /* helpingame.png */, + 611EEC30122B54D700DF6938 /* helpplain.png */, + 611EEBC2122B355700DF6938 /* helpbottom.png */, + 611EEBC3122B355700DF6938 /* helpright.png */, 6129B9F611EFB04D0017E305 /* denied.png */, 61F2E7EB12060E31005734F7 /* checkbox.png */, 611EE973122A9C4100DF6938 /* clickSound.wav */, @@ -1169,6 +1186,9 @@ 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, + 611EEAEB122B2A4D00DF6938 /* HelpPageLobbyViewController.h */, + 611EEAEC122B2A4D00DF6938 /* HelpPageLobbyViewController.m */, + 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */, ); name = Overlay; sourceTree = ""; @@ -1973,6 +1993,11 @@ 611EE9D9122AA10A00DF6938 /* backSound.wav in Resources */, 611EE9DA122AA10A00DF6938 /* selSound.wav in Resources */, 611EEA7E122B09C200DF6938 /* background_small.png in Resources */, + 611EEAEF122B2A4D00DF6938 /* HelpPageLobbyViewController.xib in Resources */, + 611EEBC1122B34A800DF6938 /* helpingame.png in Resources */, + 611EEBC4122B355700DF6938 /* helpbottom.png in Resources */, + 611EEBC5122B355700DF6938 /* helpright.png in Resources */, + 611EEC31122B54D700DF6938 /* helpplain.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2097,6 +2122,7 @@ 61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */, 61C079E411F35A300072BF46 /* EditableCellView.m in Sources */, 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */, + 611EEAEE122B2A4D00DF6938 /* HelpPageLobbyViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2199,7 +2225,7 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; }; @@ -2291,7 +2317,7 @@ ); PREBINDING = NO; SDKROOT = iphoneos4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; }; @@ -2423,7 +2449,7 @@ ); PREBINDING = NO; SDKROOT = iphoneos4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; }; @@ -2468,7 +2494,7 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; }; diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Aug 30 05:42:03 2010 +0200 @@ -131,7 +131,7 @@ NO IBIPadFramework Max Hogs: - + Helvetica-Oblique 18 16 @@ -269,11 +269,7 @@ NO IBIPadFramework Label - - Helvetica - 24 - 16 - + 2 MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Resources/Overlay/helpbottom.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpbottom.png has changed diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Resources/Overlay/helpingame.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpingame.png has changed diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Resources/Overlay/helpplain.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpplain.png has changed diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Resources/Overlay/helpright.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpright.png has changed diff -r 8f48b54f42ce -r 98072b3871c1 project_files/HedgewarsMobile/Resources/OverlayViewController.xib --- a/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Mon Aug 30 01:43:21 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Mon Aug 30 05:42:03 2010 +0200 @@ -1,7 +1,7 @@ - 800 + 1024 10F569 788 1038.29 @@ -154,7 +154,7 @@ NSImage - joyButton_forwardjump.png + joyButton_backjump.png @@ -178,7 +178,7 @@ NSImage - joyButton_backjump.png + joyButton_forwardjump.png @@ -854,13 +854,6 @@ NSObject IBFrameworkSource - Foundation.framework/Headers/NSNetServices.h - - - - NSObject - - IBFrameworkSource Foundation.framework/Headers/NSObject.h @@ -868,13 +861,6 @@ NSObject IBFrameworkSource - Foundation.framework/Headers/NSPort.h - - - - NSObject - - IBFrameworkSource Foundation.framework/Headers/NSRunLoop.h @@ -882,13 +868,6 @@ NSObject IBFrameworkSource - Foundation.framework/Headers/NSStream.h - - - - NSObject - - IBFrameworkSource Foundation.framework/Headers/NSThread.h @@ -910,13 +889,6 @@ NSObject IBFrameworkSource - Foundation.framework/Headers/NSXMLParser.h - - - - NSObject - - IBFrameworkSource QuartzCore.framework/Headers/CAAnimation.h @@ -1042,7 +1014,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3