# HG changeset patch # User burp # Date 1283198741 -7200 # Node ID 46e6fa2cdbc62b72a92414d30cf6f0e34455d832 # Parent dd9345e74b66831c5d617c84f112011fdd719b92# Parent 9aa8a832e29684fffaaa9e2b33522c4f9ac8544a o0 merge diff -r 9aa8a832e296 -r 46e6fa2cdbc6 QTfrontend/chatwidget.cpp --- a/QTfrontend/chatwidget.cpp Mon Aug 30 22:02:33 2010 +0200 +++ b/QTfrontend/chatwidget.cpp Mon Aug 30 22:05:41 2010 +0200 @@ -54,14 +54,14 @@ mainLayout.setSpacing(1); mainLayout.setMargin(1); mainLayout.setSizeConstraint(QLayout::SetMinimumSize); - mainLayout.setColumnStretch(0, 75); - mainLayout.setColumnStretch(1, 25); + mainLayout.setColumnStretch(0, 76); + mainLayout.setColumnStretch(1, 24); chatEditLine = new QLineEdit(this); chatEditLine->setMaxLength(300); connect(chatEditLine, SIGNAL(returnPressed()), this, SLOT(returnPressed())); - mainLayout.addWidget(chatEditLine, 1, 0, 1, 2); + mainLayout.addWidget(chatEditLine, 1, 0); chatText = new QTextBrowser(this); chatText->setMinimumHeight(20); @@ -81,7 +81,7 @@ connect(chatNicks, SIGNAL(currentRowChanged(int)), this, SLOT(chatNickSelected(int))); - mainLayout.addWidget(chatNicks, 0, 1); + mainLayout.addWidget(chatNicks, 0, 1, 0, 1); acInfo = new QAction(QAction::tr("Info"), chatNicks); acInfo->setIcon(QIcon(":/res/info.png")); diff -r 9aa8a832e296 -r 46e6fa2cdbc6 hedgewars/PascalExports.pas --- a/hedgewars/PascalExports.pas Mon Aug 30 22:02:33 2010 +0200 +++ b/hedgewars/PascalExports.pas Mon Aug 30 22:05:41 2010 +0200 @@ -165,6 +165,11 @@ if closeFrontend then alsoShutdownFrontend:= true; end; +procedure HW_dismissReady; cdecl; export; +begin + ReadyTimeLeft:= 0; +end; + procedure HW_setLandscape(landscape: boolean); cdecl; export; begin if landscape then diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/AboutViewController.h --- a/project_files/HedgewarsMobile/Classes/AboutViewController.h Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.h Mon Aug 30 22:05:41 2010 +0200 @@ -9,10 +9,17 @@ #import -@interface AboutViewController : UIViewController { - +@interface AboutViewController : UIViewController { + UITableView *tableView; + UISegmentedControl *segmentedControl; + NSArray *people; } +@property (nonatomic,retain) IBOutlet UITableView *tableView; +@property (nonatomic,retain) IBOutlet UISegmentedControl *segmentedControl; +@property (nonatomic,retain) NSArray *people; + -(IBAction) buttonPressed:(id) sender; +-(IBAction) segmentedControlChanged:(id) sender; @end diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/AboutViewController.m --- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -10,32 +10,22 @@ #import "CommodityFunctions.h" @implementation AboutViewController - +@synthesize tableView, segmentedControl, people; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return rotationManager(interfaceOrientation); } -(void) viewDidLoad { - self.view.frame = CGRectMake(0, 0, 320, 480); - [super viewDidLoad]; -} + self.tableView.backgroundView = nil; + self.tableView.allowsSelection = NO; --(void) didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; + NSString *strPath = [NSString stringWithFormat:@"%@/Settings/credits.plist",[[NSBundle mainBundle] resourcePath]]; + NSArray *array = [[NSArray alloc] initWithContentsOfFile:strPath]; + self.people = array; + [array release]; - // 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]; + [super viewDidLoad]; } -(IBAction) buttonPressed:(id) sender { @@ -43,4 +33,60 @@ [[self parentViewController] dismissModalViewControllerAnimated:YES]; } +-(IBAction) segmentedControlChanged:(id) sender { + playSound(@"clickSound"); + [self.tableView setContentOffset:CGPointMake(0, 0) animated:NO]; + [self.tableView reloadData]; +} + +#pragma mark - +#pragma mark Table view data source +-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [[self.people objectAtIndex:self.segmentedControl.selectedSegmentIndex] count]; +} + +-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease]; + + // first all the names, then the title (which is offset 5) + cell.textLabel.text = [[self.people objectAtIndex:self.segmentedControl.selectedSegmentIndex] objectAtIndex:[indexPath row]]; + cell.detailTextLabel.text = [[self.people objectAtIndex:(self.segmentedControl.selectedSegmentIndex + 5)] objectAtIndex:[indexPath row]]; + + return cell; +} + +#pragma mark - +#pragma mark Table view delegate +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + // do nothing +} + +#pragma mark - +#pragma mark Memory Management +-(void) didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; +} + +-(void) viewDidUnload { + self.tableView = nil; + self.segmentedControl = nil; + self.people = nil; + [super viewDidUnload]; +} + +-(void) dealloc { + [tableView release]; + [segmentedControl release]; + [people release]; + [super dealloc]; +} + @end diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/AboutViewController.xib --- a/project_files/HedgewarsMobile/Classes/AboutViewController.xib Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.xib Mon Aug 30 22:05:41 2010 +0200 @@ -42,48 +42,115 @@ 292 YES - - - 292 - {{88, 90}, {42, 21}} - - NO - YES - 7 - NO - IBIPadFramework - Label - - 1 - MCAwIDAAA - - - 1 - 10 - 290 - {320, 44} + + YES + + + 292 + {{70, 7}, {289, 30}} + + NO + IBIPadFramework + 2 + 5 + 0 + + YES + Code + Art + Sound + Locale + Special + + + YES + + + + + + + + YES + + + + + + + + YES + {0, 0} + {0, 0} + {0, 0} + {0, 0} + {0, 0} + + + YES + + + + + + + + + {429, 44} IBIPadFramework YES - About... IBIPadFramework 1 0 + IBIPadFramework + + + 274 + {{0, 44}, {429, 433}} + + NO + IBIPadFramework + + NSImage + background_small.png + + + + + 274 + {{0, 44}, {429, 433}} + + + 1 + MCAwIDAgMAA + + YES + IBIPadFramework + YES + 1 + 2 + 0 + YES + 44 + 10 + 10 + - {320, 480} + {429, 477} 3 @@ -116,6 +183,47 @@ 8 + + + dataSource + + + + 12 + + + + delegate + + + + 13 + + + + tableView + + + + 14 + + + + segmentedControlChanged: + + + 13 + + 15 + + + + segmentedControl + + + + 16 + @@ -142,17 +250,13 @@ YES - + + - 4 - - - - 5 @@ -167,6 +271,7 @@ YES + @@ -175,6 +280,21 @@ + + 9 + + + + + 10 + + + + + 11 + + + @@ -183,18 +303,22 @@ YES -1.CustomClassName -2.CustomClassName + 10.IBPluginDependency + 11.IBPluginDependency 2.IBEditorWindowLastContentRect 2.IBPluginDependency - 4.IBPluginDependency 5.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency + 9.IBPluginDependency YES AboutViewController UIResponder - {{932, 318}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{505, 182}, {429, 477}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -218,7 +342,7 @@ - 8 + 16 @@ -227,14 +351,67 @@ AboutViewController UIViewController - buttonPressed: - id + YES + + YES + buttonPressed: + segmentedControlChanged: + + + YES + id + id + - buttonPressed: - - buttonPressed: - id + YES + + YES + buttonPressed: + segmentedControlChanged: + + + YES + + buttonPressed: + id + + + segmentedControlChanged: + id + + + + + YES + + YES + segmentedControl + tableView + + + YES + UISegmentedControl + UITableView + + + + YES + + YES + segmentedControl + tableView + + + YES + + segmentedControl + UISegmentedControl + + + tableView + UITableView + @@ -367,11 +544,19 @@ - UILabel + UIControl UIView IBFrameworkSource - UIKit.framework/Headers/UILabel.h + UIKit.framework/Headers/UIControl.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h @@ -393,6 +578,14 @@ + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + UISearchBar UIView @@ -409,6 +602,22 @@ + UISegmentedControl + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UISegmentedControl.h + + + + UITableView + UIScrollView + + IBFrameworkSource + UIKit.framework/Headers/UITableView.h + + + UIView IBFrameworkSource @@ -474,6 +683,10 @@ YES ../Hedgewars.xcodeproj 3 + + background_small.png + {320, 436} + 117 diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/FortsViewController.m --- a/project_files/HedgewarsMobile/Classes/FortsViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/FortsViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -25,10 +25,10 @@ [super viewDidLoad]; NSArray *directoryContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:FORTS_DIRECTORY() error:NULL]; - NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / 2)]; + NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / 3)]; // we need to remove the double entries and the L.png suffix for (int i = 0; i < [directoryContents count]; i++) { - if (i % 2) { + if (i % 3 == 1) { NSString *currentName = [directoryContents objectAtIndex:i]; NSString *correctName = [currentName substringToIndex:([currentName length] - 5)]; [filteredContents addObject:correctName]; @@ -88,15 +88,13 @@ NSString *fortName = [fortArray objectAtIndex:[indexPath row]]; cell.textLabel.text = fortName; - // this creates a scaled down version of the image - // TODO: create preview files, scaling is way too slow! - NSString *fortFile = [[NSString alloc] initWithFormat:@"%@/%@L.png", FORTS_DIRECTORY(), fortName]; + NSString *fortFile = [[NSString alloc] initWithFormat:@"%@/%@-preview.png", FORTS_DIRECTORY(), fortName]; UIImage *fortSprite = [[UIImage alloc] initWithContentsOfFile:fortFile]; [fortFile release]; - cell.imageView.image = [fortSprite scaleToSize:CGSizeMake(196,196)]; + cell.imageView.image = fortSprite; [fortSprite release]; - cell.detailTextLabel.text = @"Insert funny description here"; + //cell.detailTextLabel.text = @"Insert funny description here"; if ([cell.textLabel.text isEqualToString:[self.teamDictionary objectForKey:@"fort"]]) { cell.accessoryType = UITableViewCellAccessoryCheckmark; self.lastIndexPath = indexPath; diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/GameConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 30 22:05:41 2010 +0200 @@ -11,10 +11,12 @@ @class TeamConfigViewController; @class SchemeWeaponConfigViewController; +@class HelpPageViewController; @interface GameConfigViewController : UIViewController { UIImage *hedgehogImage; UIView *imgContainer; + HelpPageViewController *helpPage; UIViewController *activeController; MapConfigViewController *mapConfigViewController; @@ -24,6 +26,7 @@ @property (nonatomic,retain) UIImage *hedgehogImage; @property (nonatomic,retain) UIView *imgContainer; +@property (nonatomic,retain) HelpPageViewController *helpPage; -(IBAction) buttonPressed:(id) sender; -(IBAction) segmentPressed:(id) sender; diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -8,13 +8,14 @@ #import "GameConfigViewController.h" #import "SDL_uikitappdelegate.h" -#import "CommodityFunctions.h" #import "TeamConfigViewController.h" #import "SchemeWeaponConfigViewController.h" +#import "HelpPageViewController.h" +#import "CommodityFunctions.h" #import "UIImageExtra.h" @implementation GameConfigViewController -@synthesize hedgehogImage, imgContainer; +@synthesize hedgehogImage, imgContainer, helpPage; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { return rotationManager(interfaceOrientation); @@ -41,11 +42,19 @@ playSound(@"clickSound"); theButton.enabled = NO; [self startGame:theButton]; -// [self performSelector:@selector(startGame:) -// withObject:theButton -// afterDelay:0.25]; + break; + case 2: + playSound(@"clickSound"); + if (self.helpPage == nil) + self.helpPage = [[HelpPageViewController alloc] initWithNibName:@"HelpPageLobbyViewController" bundle:nil]; + self.helpPage.view.alpha = 0; + [self.view addSubview:helpPage.view]; + [UIView beginAnimations:@"helplobby" context:NULL]; + self.helpPage.view.alpha = 1; + [UIView commitAnimations]; break; default: + DLog(@"Nope"); break; } } diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/HelpPageInGameViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageInGameViewController.xib Mon Aug 30 22:05:41 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 + HelpPageViewController + 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, 355}, {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 + + HelpPageViewController + UIViewController + + dismiss + id + + + dismiss + + dismiss + id + + + + IBProjectSource + Classes/HelpPageViewController.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 9aa8a832e296 -r 46e6fa2cdbc6 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 22:05:41 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 9aa8a832e296 -r 46e6fa2cdbc6 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 22:05:41 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 9aa8a832e296 -r 46e6fa2cdbc6 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 22:05:41 2010 +0200 @@ -0,0 +1,1106 @@ + + + + 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 + {{742, 362}, {240, 102}} + + NO + NO + IBIPadFramework + + NSImage + helpabove.png + + + + + 292 + {{753, 381}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Map theme + + Helvetica-Bold + 18 + 16 + + + 1 + MCAwIDAAA + + + 1 + 10 + + + + 292 + {{753, 398}, {218, 66}} + + NO + YES + 7 + NO + IBIPadFramework + Here you can choose how your map will appear in game. + + Helvetica + 16 + 16 + + + + 1 + 10 + 0 + + + + 292 + {{653, 202}, {240, 109}} + + NO + NO + IBIPadFramework + + + + + 292 + {{664, 218}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Map type + + + + 1 + 10 + + + + 292 + {{664, 238}, {218, 66}} + + NO + YES + 7 + NO + IBIPadFramework + Choose between a static map or a randomly generated one (might require more time). + + + + 1 + 10 + 0 + + + + 292 + {{494, 20}, {240, 105}} + + NO + NO + IBIPadFramework + + NSImage + helpright.png + + + + + 292 + {{502, 25}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Map preview + + + + 1 + 10 + + + + 292 + {{502, 46}, {218, 65}} + + NO + YES + 7 + NO + IBIPadFramework + This is a small preview of your next map. Tap to select / generate a new map. + + + + 1 + 10 + 0 + + + + 292 + {{393, 399}, {240, 128}} + + NO + NO + IBIPadFramework + + + + + 292 + {{403, 417}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Teams + + + + 1 + 10 + + + + 292 + {{400, 427}, {232, 100}} + + NO + YES + 7 + NO + IBIPadFramework + Select which teams are playing! You can set the number of hogs and have multiple teams play together. + + + + 1 + 10 + 0 + + + + 292 + {{142, 125}, {240, 104}} + + NO + NO + IBIPadFramework + + NSImage + helpleft.png + + + + + 292 + {{162, 133}, {204, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Schemes and Weapons + + + + 1 + 10 + + + + 292 + {{162, 152}, {210, 71}} + + NO + YES + 7 + NO + IBIPadFramework + Here you can choose which rules and which weapon set will be applied in game. + + + + 1 + 10 + 0 + + + + 292 + {{164, 8}, {278, 50}} + + NO + NO + IBIPadFramework + + + + + 292 + {{186, 6}, {248, 54}} + + NO + YES + 7 + NO + IBIPadFramework + Did you know you can customize almost everything in the settings page? + + Helvetica-Oblique + 14 + 16 + + + + 1 + 10 + 0 + + + + 292 + {{686, 583}, {240, 117}} + + NO + NO + IBIPadFramework + + NSImage + helpbottom.png + + + + + 292 + {{697, 592}, {138, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Max hedgehogs + + + + 1 + 10 + + + + 292 + {{697, 609}, {218, 73}} + + NO + YES + 7 + NO + IBIPadFramework + This number is the maximum size for all the hogs playing (in every team). + + + + 1 + 10 + 0 + + + + 292 + {{20, 587}, {240, 109}} + + NO + NO + IBIPadFramework + + + + + 292 + {{30, 592}, {138, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Size slider + + + + 1 + 10 + + + + 292 + {{30, 608}, {218, 73}} + + NO + YES + 7 + NO + IBIPadFramework + For Random and Maze maps you can decide to generate only maps of a certain size. + + + + 1 + 10 + 0 + + + + 292 + {{45, 318}, {240, 128}} + + NO + NO + IBIPadFramework + + NSImage + helpplain.png + + + + + 292 + {{50, 326}, {229, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Tap anywhere to dismiss + + + + 1 + 10 + 1 + + + + 292 + {{52, 348}, {224, 87}} + + NO + YES + 7 + NO + IBIPadFramework + Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you. + + + + 1 + 10 + 0 + + + + 292 + {{344, 635}, {240, 61}} + + NO + NO + IBIPadFramework + + + + + 292 + {{353, 637}, {138, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Start button + + + + 1 + 10 + + + + 292 + {{354, 650}, {218, 46}} + + NO + YES + 7 + NO + IBIPadFramework + This button starts the game. + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 25 + + + + + 26 + + + + + 27 + + + + + 28 + + + + + 29 + + + + + 30 + + + + + 34 + + + + + 35 + + + + + 36 + + + + + 37 + + + + + 38 + + + + + 39 + + + + + 40 + + + + + 41 + + + + + 42 + + + + + 43 + + + + + 44 + + + + + 45 + + + + + 49 + + + + + 50 + + + + + 51 + + + + + 52 + + + + + 53 + + + + + 54 + + + + + 58 + + + + + 59 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 2.CustomClassName + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 25.IBPluginDependency + 26.IBPluginDependency + 27.IBPluginDependency + 28.IBPluginDependency + 29.IBPluginDependency + 30.IBPluginDependency + 34.IBPluginDependency + 35.IBPluginDependency + 36.IBPluginDependency + 37.IBPluginDependency + 38.IBPluginDependency + 39.IBPluginDependency + 40.IBPluginDependency + 41.IBPluginDependency + 42.IBPluginDependency + 43.IBPluginDependency + 44.IBPluginDependency + 45.IBPluginDependency + 49.IBPluginDependency + 50.IBPluginDependency + 51.IBPluginDependency + 52.IBPluginDependency + 53.IBPluginDependency + 54.IBPluginDependency + 58.IBPluginDependency + 59.IBPluginDependency + 6.IBPluginDependency + 7.IBPluginDependency + 8.IBPluginDependency + + + YES + HelpPageViewController + UIResponder + UIControl + {{273, 67}, {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 + 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 59 + + + + YES + + HelpPageViewController + UIViewController + + dismiss + id + + + dismiss + + dismiss + id + + + + IBProjectSource + Classes/HelpPageViewController.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 + helpabove.png + helpbottom.png + helpleft.png + helpplain.png + helpright.png + + + YES + {295, 156} + {295, 156} + {308, 144} + {296, 138} + {308, 144} + + + 117 + + diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/HelpPageViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.h Mon Aug 30 22:05:41 2010 +0200 @@ -0,0 +1,18 @@ +// +// HelpPageLobbyViewController.h +// Hedgewars +// +// Created by Vittorio on 30/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface HelpPageViewController : UIViewController { + +} + +-(IBAction) dismiss; + +@end diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/HelpPageViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -0,0 +1,42 @@ + // +// HelpPageLobbyViewController.m +// Hedgewars +// +// Created by Vittorio on 30/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "HelpPageViewController.h" +#import "CommodityFunctions.h" + +@implementation HelpPageViewController + + +-(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 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/InGameMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Aug 30 22:05:41 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 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -301,9 +301,8 @@ if (cell == nil) cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; - } if (self.segmentedControl.selectedSegmentIndex != 1) { // the % prevents a strange bug that occurs sporadically @@ -464,7 +463,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; @@ -536,15 +535,19 @@ self.sizeLabel.text = NSLocalizedString(@"All",@""); self.slider.value = 0.05f; - // select a map at first because it's faster - self.segmentedControl.selectedSegmentIndex = 1; + // 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"; self.mapGenCommand = @"e$mapgen 0"; self.staticMapCommand = @""; - self.lastIndexPath = [NSIndexPath indexPathForRow:0 inSection:0]; + self.lastIndexPath = [NSIndexPath indexPathForRow:-1 inSection:0]; oldValue = 5; oldPage = 0; @@ -574,6 +577,7 @@ -(void) didReceiveMemoryWarning { [super didReceiveMemoryWarning]; //[previewButton setImage:nil forState:UIControlStateNormal]; + MSG_MEMCLEAN(); } -(void) viewDidUnload { diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 30 22:05:41 2010 +0200 @@ -10,6 +10,7 @@ #import "SDL_sysvideo.h" @class InGameMenuViewController; +@class HelpPageViewController; @interface OverlayViewController : UIViewController { // the timer that dims the overlay @@ -20,6 +21,9 @@ InGameMenuViewController *popupMenu; BOOL isPopoverVisible; + // the help menu + HelpPageViewController *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) HelpPageViewController *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 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/OverlayViewController.m --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -8,12 +8,13 @@ #import "OverlayViewController.h" #import "SDL_uikitappdelegate.h" +#import "InGameMenuViewController.h" +#import "HelpPageViewController.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 = [[HelpPageViewController alloc] initWithNibName:@"HelpPageInGameViewController" 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]; @@ -217,7 +239,7 @@ return; if (HW_isWaiting()) - HW_shoot(); + HW_dismissReady(); UIButton *theButton = (UIButton *)sender; switch (theButton.tag) { @@ -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; @@ -369,7 +393,7 @@ case 1: // this dismisses the "get ready" if (HW_isWaiting()) - HW_shoot(); + HW_dismissReady(); // if we're in the menu we just click in the point if (HW_isAmmoOpen()) { @@ -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 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/PascalImports.h --- a/project_files/HedgewarsMobile/Classes/PascalImports.h Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/PascalImports.h Mon Aug 30 22:05:41 2010 +0200 @@ -54,6 +54,7 @@ void HW_pause(void); void HW_terminate(BOOL andCloseFrontend); + void HW_dismissReady(void); void HW_setLandscape(BOOL rotate); void HW_setCursor(int x, int y); diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Classes/SingleTeamViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Mon Aug 30 22:05:41 2010 +0200 @@ -108,7 +108,7 @@ [self.teamDictionary writeToFile:teamFile atomically:YES]; [teamFile release]; - DLog(@"%@",teamDictionary); + //DLog(@"%@",teamDictionary); isWriteNeeded = NO; } @@ -223,7 +223,7 @@ [accessoryImage release]; break; case 2: // fort - accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@L.png", + accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-preview.png", FORTS_DIRECTORY(),[teamDictionary objectForKey:@"fort"]]]; cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(42, 42)]; [accessoryImage release]; diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 30 22:05:41 2010 +0200 @@ -33,6 +33,13 @@ 611EE974122A9C4100DF6938 /* clickSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE973122A9C4100DF6938 /* clickSound.wav */; }; 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 /* HelpPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.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 */; }; @@ -115,14 +122,15 @@ 61799289114AE08700BA94A9 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */; }; 6183D83F11E2BCE200A88903 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* Default.png */; }; + 61842B24122B619D0096E335 /* HelpPageInGameViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61842B23122B619D0096E335 /* HelpPageInGameViewController.xib */; }; + 61842B3E122B65BD0096E335 /* helpabove.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3D122B65BD0096E335 /* helpabove.png */; }; + 61842B40122B66280096E335 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3F122B66280096E335 /* helpleft.png */; }; 6187AEBD120781B900B31A27 /* Settings in Resources */ = {isa = PBXBuildFile; fileRef = 6187AEA5120781B900B31A27 /* Settings */; }; - 619C09EA11E8B8D600F1DF16 /* title_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 619C09E911E8B8D600F1DF16 /* title_small.png */; }; 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; 61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; }; 61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; }; 61E1F4F811D004240016A5AA /* adler32.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61E1F4F711D004240016A5AA /* adler32.pas */; }; - 61EBA62911DFF2BC0048B68A /* bricks.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62711DFF2BC0048B68A /* bricks.png */; }; 61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; }; 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */; }; 61EBB1E41228920300C1784F /* bluebox-squeezed.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBB1E31228920300C1784F /* bluebox-squeezed.png */; }; @@ -143,16 +151,6 @@ 61F7A43C11E290650040BA66 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43511E290650040BA66 /* Icon.png */; }; 61F7A43D11E290650040BA66 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43611E290650040BA66 /* Icon@2x.png */; }; 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43711E290650040BA66 /* iTunesArtwork.png */; }; - 61F903EF11DF58550068B24D /* backgroundBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E411DF58550068B24D /* backgroundBottom.png */; }; - 61F903F011DF58550068B24D /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; }; - 61F903F111DF58550068B24D /* backgroundLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E611DF58550068B24D /* backgroundLeft.png */; }; - 61F903F211DF58550068B24D /* backgroundRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E711DF58550068B24D /* backgroundRight.png */; }; - 61F903F311DF58550068B24D /* backgroundTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E811DF58550068B24D /* backgroundTop.png */; }; - 61F903F411DF58550068B24D /* borderBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E911DF58550068B24D /* borderBottom.png */; }; - 61F903F511DF58550068B24D /* borderTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EA11DF58550068B24D /* borderTop.png */; }; - 61F903F611DF58550068B24D /* networkButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EB11DF58550068B24D /* networkButton.png */; }; - 61F903F711DF58550068B24D /* playButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EC11DF58550068B24D /* playButton.png */; }; - 61F903F811DF58550068B24D /* storeButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903ED11DF58550068B24D /* storeButton.png */; }; 61F9040911DF58B00068B24D /* settingsButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040811DF58B00068B24D /* settingsButton.png */; }; 61F9040B11DF59370068B24D /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040A11DF59370068B24D /* background.png */; }; 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040C11DF59D10068B24D /* localplayButton.png */; }; @@ -697,6 +695,14 @@ 611EE973122A9C4100DF6938 /* clickSound.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = clickSound.wav; path = Resources/clickSound.wav; sourceTree = ""; }; 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 /* HelpPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPageViewController.h; sourceTree = ""; }; + 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPageViewController.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; }; @@ -818,6 +824,9 @@ 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = ""; }; 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LI-ipad-Landscape.png"; path = "Resources/Icons/LI-ipad-Landscape.png"; sourceTree = ""; }; 6183D83D11E2BCE200A88903 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Icons/Default.png; sourceTree = ""; }; + 61842B23122B619D0096E335 /* HelpPageInGameViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HelpPageInGameViewController.xib; sourceTree = ""; }; + 61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = ""; }; + 61842B3F122B66280096E335 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpleft.png; path = Resources/Overlay/helpleft.png; sourceTree = ""; }; 618736B8118CA28600123B23 /* GearDrawing.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GearDrawing.inc; path = ../../hedgewars/GearDrawing.inc; sourceTree = SOURCE_ROOT; }; 6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = ""; }; 619C09E911E8B8D600F1DF16 /* title_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title_small.png; path = "Resources/Frontend-iPhone/title_small.png"; sourceTree = ""; }; @@ -826,7 +835,6 @@ 61C079E311F35A300072BF46 /* EditableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditableCellView.m; sourceTree = ""; }; 61C3255A1179A384001E70B1 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 61E1F4F711D004240016A5AA /* adler32.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = adler32.pas; path = ../../hedgewars/adler32.pas; sourceTree = SOURCE_ROOT; }; - 61EBA62711DFF2BC0048B68A /* bricks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bricks.png; path = "Resources/Frontend-iPad/bricks.png"; sourceTree = ""; }; 61EBA62811DFF2BC0048B68A /* title.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title.png; path = "Resources/Frontend-iPad/title.png"; sourceTree = ""; }; 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundAndTitle.png; path = "Resources/Frontend-iPad/backgroundAndTitle.png"; sourceTree = ""; }; 61EBB1E31228920300C1784F /* bluebox-squeezed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bluebox-squeezed.png"; path = "Resources/Frontend-iPad/bluebox-squeezed.png"; sourceTree = ""; }; @@ -959,6 +967,12 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 611EEBC0122B34A800DF6938 /* helpingame.png */, + 611EEC30122B54D700DF6938 /* helpplain.png */, + 611EEBC2122B355700DF6938 /* helpbottom.png */, + 61842B3D122B65BD0096E335 /* helpabove.png */, + 611EEBC3122B355700DF6938 /* helpright.png */, + 61842B3F122B66280096E335 /* helpleft.png */, 6129B9F611EFB04D0017E305 /* denied.png */, 61F2E7EB12060E31005734F7 /* checkbox.png */, 611EE973122A9C4100DF6938 /* clickSound.wav */, @@ -1180,6 +1194,10 @@ 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, + 611EEAEB122B2A4D00DF6938 /* HelpPageViewController.h */, + 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */, + 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */, + 61842B23122B619D0096E335 /* HelpPageInGameViewController.xib */, ); name = Overlay; sourceTree = ""; @@ -1241,6 +1259,7 @@ 61EF920611DF57AC003441C4 /* arrowLeft.png */, 61EF920711DF57AC003441C4 /* arrowRight.png */, 61EF920811DF57AC003441C4 /* arrowUp.png */, + 611EEA7D122B09C200DF6938 /* background_small.png */, 61EF920911DF57AC003441C4 /* joyButton_attack.png */, 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */, 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */, @@ -1290,7 +1309,6 @@ 615AD9EA1207654E00F2FF04 /* helpButton.png */, 615AD9E8120764CA00F2FF04 /* backButton.png */, 61F9043911DF64E20068B24D /* bluebox.png */, - 61EBA62711DFF2BC0048B68A /* bricks.png */, 61EBA62811DFF2BC0048B68A /* title.png */, 61F9040C11DF59D10068B24D /* localplayButton.png */, 61F9040D11DF59D10068B24D /* netplayButton.png */, @@ -1954,22 +1972,11 @@ 61EF921211DF57AC003441C4 /* joyButton_attack.png in Resources */, 61EF921311DF57AC003441C4 /* joyButton_backjump.png in Resources */, 61EF921411DF57AC003441C4 /* joyButton_forwardjump.png in Resources */, - 61F903EF11DF58550068B24D /* backgroundBottom.png in Resources */, - 61F903F011DF58550068B24D /* backgroundCenter.png in Resources */, - 61F903F111DF58550068B24D /* backgroundLeft.png in Resources */, - 61F903F211DF58550068B24D /* backgroundRight.png in Resources */, - 61F903F311DF58550068B24D /* backgroundTop.png in Resources */, - 61F903F411DF58550068B24D /* borderBottom.png in Resources */, - 61F903F511DF58550068B24D /* borderTop.png in Resources */, - 61F903F611DF58550068B24D /* networkButton.png in Resources */, - 61F903F711DF58550068B24D /* playButton.png in Resources */, - 61F903F811DF58550068B24D /* storeButton.png in Resources */, 61F9040911DF58B00068B24D /* settingsButton.png in Resources */, 61F9040B11DF59370068B24D /* background.png in Resources */, 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */, 61F9040F11DF59D10068B24D /* netplayButton.png in Resources */, 61F9043A11DF64E20068B24D /* bluebox.png in Resources */, - 61EBA62911DFF2BC0048B68A /* bricks.png in Resources */, 61EBA62A11DFF2BC0048B68A /* title.png in Resources */, 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */, 61F7A43811E290650040BA66 /* Icon-72.png in Resources */, @@ -1981,7 +1988,6 @@ 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */, 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */, 6183D83F11E2BCE200A88903 /* Default.png in Resources */, - 619C09EA11E8B8D600F1DF16 /* title_small.png in Resources */, 6129B9F711EFB04D0017E305 /* denied.png in Resources */, 611E0EE711FB20610077A41E /* ammoButton.png in Resources */, 611E0EE811FB20610077A41E /* cornerButton.png in Resources */, @@ -1995,6 +2001,15 @@ 611EE974122A9C4100DF6938 /* clickSound.wav in Resources */, 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 */, + 61842B24122B619D0096E335 /* HelpPageInGameViewController.xib in Resources */, + 61842B3E122B65BD0096E335 /* helpabove.png in Resources */, + 61842B40122B66280096E335 /* helpleft.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2119,6 +2134,7 @@ 61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */, 61C079E411F35A300072BF46 /* EditableCellView.m in Sources */, 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */, + 611EEAEE122B2A4D00DF6938 /* HelpPageViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2221,7 +2237,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"; }; @@ -2313,7 +2329,7 @@ ); PREBINDING = NO; SDKROOT = iphoneos4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; }; @@ -2445,7 +2461,7 @@ ); PREBINDING = NO; SDKROOT = iphoneos4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; }; @@ -2490,7 +2506,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 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Aug 30 22:05:41 2010 +0200 @@ -131,7 +131,7 @@ NO IBIPadFramework Max Hogs: - + Helvetica-Oblique 18 16 @@ -154,7 +154,7 @@ IBIPadFramework 2 3 - 0 + 1 YES Random @@ -269,11 +269,7 @@ NO IBIPadFramework Label - - Helvetica - 24 - 16 - + 2 MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA @@ -753,7 +749,7 @@ YES MapConfigViewController UIResponder - {{335, 290}, {1024, 768}} + {{288, 290}, {1024, 768}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/background_small.png Binary file project_files/HedgewarsMobile/Resources/Overlay/background_small.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/helpabove.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpabove.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/helpbottom.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpbottom.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/helpingame.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpingame.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/helpleft.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpleft.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/helpplain.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpplain.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Overlay/helpright.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpright.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/OverlayViewController.xib --- a/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Mon Aug 30 22:02:33 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Mon Aug 30 22:05:41 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 diff -r 9aa8a832e296 -r 46e6fa2cdbc6 project_files/HedgewarsMobile/Resources/Settings/credits.plist --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Resources/Settings/credits.plist Mon Aug 30 22:05:41 2010 +0200 @@ -0,0 +1,114 @@ + + + + + + Andrey "UnC0Rr" Korotaev + Igor "Displacer" Ulyanov + Derek "Nemo" Pomery + Martin "Affect" Boze + David "Krawek" Cuadrado + Martin "Ttsmj" Minarik + Kristian "TheXception" Lehmann + Vittorio "Koda" Giovara + Mario "Smaxx" Liebisch + Carlos "Palewolf" Vives + Richard "Sheepluva" Korlyi + Henning "Prg" Kühn + + + Finn "Tiyuri" Brice + Joshua Frese + Stanko Tadić + Julien Koesten + Joshua O'Sullivan + Nils Luck + Trey Perry + + + Stephen "Armagon" Alexander + Finn "Tiyuri" Brice + Jonatan Nilsson + Daniel Martin + + + Romulo Fernandes Machado + Svetoslav Stefanov + Petr Řezáček + Jie Luo + Andrey Korotaev + Nina Kuisma + Antoine Turmel + Peter Hüwe, Mario Liebisch + Luca Bonora + Adam Etienne + Maciej Mroziński, Wojciech Latkowski, Maciej Górny + Fábio Canário + Andrey Korotaev + Jose Riha + Carlos Vives + Niklas Grahn + Eugene V. Lyubimkin + + + Aleksey Andreev + Aleksander Rudalev + Natasha Stafeeva + Adam Higerd + + + Engine, frontend, net server author + Desktop frontend improvements + Many engine and frontend improvements + Drillrocket, Ballgun, RC Plane weapons + Mine number and time game settings + Desktop frontend improvements + Desktop frontend improvements + Mac OS X and iPhone version + Gamepad support, OpenGL wizard + Many engine improvements and graphics + Many engine and server improvements + Maze maps + + + Main graphics and art director + + + + + + Some hats + + + Hedgehogs voice + + + + + + Brazilian Portuguese + Bulgarian + Czech + Chinese + English + Finnish + French + German + Italian + Japanese + Polish + Portuguese + Russian + Slovak + Spanish + Swedish + Ukrainian + + + + + + + + + diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Barrelhouse-preview.png Binary file share/hedgewars/Data/Forts/Barrelhouse-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/CMakeLists.txt --- a/share/hedgewars/Data/Forts/CMakeLists.txt Mon Aug 30 22:02:33 2010 +0200 +++ b/share/hedgewars/Data/Forts/CMakeLists.txt Mon Aug 30 22:05:41 2010 +0200 @@ -1,4 +1,4 @@ -file(GLOB FortSprites *.png) +file(GLOB FortSprites *{L,R}.png) install(FILES ${FortSprites} diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Cake-preview.png Binary file share/hedgewars/Data/Forts/Cake-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Castle-preview.png Binary file share/hedgewars/Data/Forts/Castle-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Earth-preview.png Binary file share/hedgewars/Data/Forts/Earth-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Flowerhog-preview.png Binary file share/hedgewars/Data/Forts/Flowerhog-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Hydrant-preview.png Binary file share/hedgewars/Data/Forts/Hydrant-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Island-preview.png Binary file share/hedgewars/Data/Forts/Island-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Lego-preview.png Binary file share/hedgewars/Data/Forts/Lego-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Plane-preview.png Binary file share/hedgewars/Data/Forts/Plane-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Statue-preview.png Binary file share/hedgewars/Data/Forts/Statue-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/UFO-preview.png Binary file share/hedgewars/Data/Forts/UFO-preview.png has changed diff -r 9aa8a832e296 -r 46e6fa2cdbc6 share/hedgewars/Data/Forts/Wood-preview.png Binary file share/hedgewars/Data/Forts/Wood-preview.png has changed