# HG changeset patch # User koda # Date 1291153607 -3600 # Node ID 94c948a927596054e45ccf9b6534e27c79c3fc83 # Parent d19adc635c99b7e6d4a63701f435151bb149c571# Parent 996ef18fa3969b022a7716859d69faab2a4e92be OMG merge diff -r 996ef18fa396 -r 94c948a92759 .hgtags --- a/.hgtags Mon Nov 29 23:10:38 2010 -0500 +++ b/.hgtags Tue Nov 30 22:46:47 2010 +0100 @@ -22,3 +22,4 @@ 0000000000000000000000000000000000000000 Hedgewars-iOS-1.0.1 3620607258cdc1213dce20cb6ad7872f6b8085e0 Hedgewars-iOS-1.0.1 adffb668f06e265b45d1e4aedc283e6f4e5ba7e8 Hedgewars-iOS-1.1 +ede569bb76f389bd5dfbb7ebf68af3087e3e881c Hedgewars-iOS-1.2 diff -r 996ef18fa396 -r 94c948a92759 CMakeLists.txt --- a/CMakeLists.txt Mon Nov 29 23:10:38 2010 -0500 +++ b/CMakeLists.txt Tue Nov 30 22:46:47 2010 +0100 @@ -18,13 +18,9 @@ ARGS identify -in ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE version_suffix ) - STRING(REGEX REPLACE "(.*) +(.*)" "\\2:\\1" version_suffix ${version_suffix}) + STRING(REGEX REPLACE "([0-9a-zA-Z]+)(.*) ([0-9]+)(.*)" "\\3:\\1" version_suffix ${version_suffix}) MESSAGE(STATUS "Building revision ${version_suffix}") set(version_suffix ".${version_suffix}") -# #truncate to numbers only - trying to fix a problem described in http://www.hedgewars.org/node/2019 -# STRING(REGEX REPLACE "^\\.(\\d+)" ".\\1" version_suffix ${version_suffix}) -# # screw whole suffix if there's no number -# STRING(REGEX REPLACE "^\\.([a-z]+.*)" "-dev" version_suffix ${version_suffix}) ENDIF() ENDIF() ELSE() diff -r 996ef18fa396 -r 94c948a92759 hedgewars/SDLMain.m --- a/hedgewars/SDLMain.m Mon Nov 29 23:10:38 2010 -0500 +++ b/hedgewars/SDLMain.m Tue Nov 30 22:46:47 2010 +0100 @@ -216,9 +216,11 @@ #endif /* SDL_USE_CPS */ /* Set up the menubar */ - [NSApp setMainMenu:[[NSMenu alloc] init]]; + NSMenu *menu = [[NSMenu alloc] init]; + [NSApp setMainMenu:menu]; setApplicationMenu(); setupWindowMenu(); + [menu release]; /* Create SDLMain and make it the app delegate */ sdlMain = [[SDLMain alloc] init]; diff -r 996ef18fa396 -r 94c948a92759 hedgewars/uConsole.pas --- a/hedgewars/uConsole.pas Mon Nov 29 23:10:38 2010 -0500 +++ b/hedgewars/uConsole.pas Tue Nov 30 22:46:47 2010 +0100 @@ -20,26 +20,44 @@ unit uConsole; interface +uses uFloat; + +var isDeveloperMode: boolean; +type TVariableType = (vtCommand, vtLongInt, vthwFloat, vtBoolean); + TCommandHandler = procedure (var params: shortstring); procedure initModule; procedure freeModule; procedure WriteToConsole(s: shortstring); procedure WriteLnToConsole(s: shortstring); +procedure ParseCommand(CmdStr: shortstring; TrustedSource: boolean); +procedure StopMessages(Message: Longword); function GetLastConsoleLine: shortstring; +procedure doPut(putX, putY: LongInt; fromAI: boolean); + implementation -uses Types, uVariables, uUtils; +uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uWorld, + uRandom, uAmmos, uStats, uChat, SDLh, uSound, uVisualGears, uScript; const cLineWidth: LongInt = 0; cLinesCount = 256; -type +type PVariable = ^TVariable; + TVariable = record + Next: PVariable; + Name: string[15]; + VType: TVariableType; + Handler: pointer; + Trusted: boolean; + end; TTextLine = record s: shortstring; end; var ConsoleLines: array[byte] of TTextLine; CurrLine: LongInt; + Variables: PVariable; procedure SetLine(var tl: TTextLine; str: shortstring); begin @@ -47,6 +65,26 @@ s:= str; end; +function RegisterVariable(Name: shortstring; VType: TVariableType; p: pointer; Trusted: boolean): PVariable; +var value: PVariable; +begin +New(value); +TryDo(value <> nil, 'RegisterVariable: value = nil', true); +FillChar(value^, sizeof(TVariable), 0); +value^.Name:= Name; +value^.VType:= VType; +value^.Handler:= p; +value^.Trusted:= Trusted; + +if Variables = nil then Variables:= value + else begin + value^.Next:= Variables; + Variables:= value + end; + +RegisterVariable:= value; +end; + procedure WriteToConsole(s: shortstring); var Len: LongInt; done: boolean; @@ -84,6 +122,60 @@ {$ENDIF} end; +procedure ParseCommand(CmdStr: shortstring; TrustedSource: boolean); +var ii: LongInt; + s: shortstring; + t: PVariable; + c: char; +begin +//WriteLnToConsole(CmdStr); +if CmdStr[0]=#0 then exit; +{$IFDEF DEBUGFILE}AddFileLog('ParseCommand "' + CmdStr + '"');{$ENDIF} +c:= CmdStr[1]; +if c in ['/', '$'] then Delete(CmdStr, 1, 1) else c:= '/'; +s:= ''; +SplitBySpace(CmdStr, s); +t:= Variables; +while t <> nil do + begin + if t^.Name = CmdStr then + begin + if TrustedSource or t^.Trusted then + case t^.VType of + vtCommand: if c='/' then + begin + TCommandHandler(t^.Handler)(s); + end; + vtLongInt: if c='$' then + if s[0]=#0 then + begin + str(PLongInt(t^.Handler)^, s); + WriteLnToConsole('$' + CmdStr + ' is "' + s + '"'); + end else val(s, PLongInt(t^.Handler)^); + vthwFloat: if c='$' then + if s[0]=#0 then + begin + //str(PhwFloat(t^.Handler)^:4:6, s); + WriteLnToConsole('$' + CmdStr + ' is "' + s + '"'); + end else; //val(s, PhwFloat(t^.Handler)^, i); + vtBoolean: if c='$' then + if s[0]=#0 then + begin + str(ord(boolean(t^.Handler^)), s); + WriteLnToConsole('$' + CmdStr + ' is "' + s + '"'); + end else + begin + val(s, ii); + boolean(t^.Handler^):= not (ii = 0) + end; + end; + exit + end else t:= t^.Next + end; +case c of + '$': WriteLnToConsole(errmsgUnknownVariable + ': "$' + CmdStr + '"') + else WriteLnToConsole(errmsgUnknownCommand + ': "/' + CmdStr + '"') end +end; function GetLastConsoleLine: shortstring; var valueStr: shortstring; @@ -100,10 +192,22 @@ GetLastConsoleLine:= valueStr; end; +procedure StopMessages(Message: Longword); +begin +if (Message and gmLeft) <> 0 then ParseCommand('/-left', true) else +if (Message and gmRight) <> 0 then ParseCommand('/-right', true) else +if (Message and gmUp) <> 0 then ParseCommand('/-up', true) else +if (Message and gmDown) <> 0 then ParseCommand('/-down', true) else +if (Message and gmAttack) <> 0 then ParseCommand('/-attack', true) +end; + +{$INCLUDE "CCHandlers.inc"} procedure initModule; var i: LongInt; begin CurrLine:= 0; + Variables:= nil; + isDeveloperMode:= true; // initConsole cLineWidth:= cScreenWidth div 10; @@ -111,11 +215,113 @@ cLineWidth:= 255; for i:= 0 to Pred(cLinesCount) do PByte(@ConsoleLines[i])^:= 0; + + // NOTE: please, keep most frequently used commands on bottom + RegisterVariable('flag' , vtCommand, @chFlag , false); + RegisterVariable('script' , vtCommand, @chScript , false); + RegisterVariable('proto' , vtCommand, @chCheckProto , true ); + RegisterVariable('spectate', vtBoolean, @fastUntilLag , false); + RegisterVariable('capture' , vtCommand, @chCapture , true ); + RegisterVariable('rotmask' , vtCommand, @chRotateMask , true ); + RegisterVariable('addteam' , vtCommand, @chAddTeam , false); + RegisterVariable('rdriven' , vtCommand, @chTeamLocal , false); + RegisterVariable('map' , vtCommand, @chSetMap , false); + RegisterVariable('theme' , vtCommand, @chSetTheme , false); + RegisterVariable('seed' , vtCommand, @chSetSeed , false); + RegisterVariable('template_filter', vtLongInt, @cTemplateFilter, false); + RegisterVariable('mapgen' , vtLongInt, @cMapGen , false); + RegisterVariable('maze_size',vtLongInt, @cMazeSize , false); + RegisterVariable('delay' , vtLongInt, @cInactDelay , false); + RegisterVariable('ready' , vtLongInt, @cReadyDelay , false); + RegisterVariable('casefreq', vtLongInt, @cCaseFactor , false); + RegisterVariable('healthprob', vtLongInt, @cHealthCaseProb, false); + RegisterVariable('hcaseamount', vtLongInt, @cHealthCaseAmount, false); + RegisterVariable('sd_turns', vtLongInt, @cSuddenDTurns , false); + RegisterVariable('waterrise', vtLongInt, @cWaterRise , false); + RegisterVariable('healthdec', vtLongInt, @cHealthDecrease, false); + RegisterVariable('damagepct',vtLongInt, @cDamagePercent , false); + RegisterVariable('minedudpct',vtLongInt,@cMineDudPercent, false); + RegisterVariable('minesnum', vtLongInt, @cLandMines , false); + RegisterVariable('explosives',vtLongInt,@cExplosives , false); + RegisterVariable('gmflags' , vtLongInt, @GameFlags , false); + RegisterVariable('trflags' , vtLongInt, @TrainingFlags , false); + RegisterVariable('turntime', vtLongInt, @cHedgehogTurnTime, false); + RegisterVariable('minestime',vtLongInt, @cMinesTime , false); + RegisterVariable('fort' , vtCommand, @chFort , false); + RegisterVariable('voicepack',vtCommand, @chVoicepack , false); + RegisterVariable('grave' , vtCommand, @chGrave , false); + RegisterVariable('bind' , vtCommand, @chBind , true ); + RegisterVariable('addhh' , vtCommand, @chAddHH , false); + RegisterVariable('hat' , vtCommand, @chSetHat , false); + RegisterVariable('hhcoords', vtCommand, @chSetHHCoords , false); + RegisterVariable('ammloadt', vtCommand, @chSetAmmoLoadout, false); + RegisterVariable('ammdelay', vtCommand, @chSetAmmoDelay, false); + RegisterVariable('ammprob', vtCommand, @chSetAmmoProbability, false); + RegisterVariable('ammreinf', vtCommand, @chSetAmmoReinforcement, false); + RegisterVariable('ammstore', vtCommand, @chAddAmmoStore , false); + RegisterVariable('quit' , vtCommand, @chQuit , true ); + RegisterVariable('confirm' , vtCommand, @chConfirm , true ); + RegisterVariable('+speedup', vtCommand, @chSpeedup_p , true ); + RegisterVariable('-speedup', vtCommand, @chSpeedup_m , true ); + RegisterVariable('zoomin' , vtCommand, @chZoomIn , true ); + RegisterVariable('zoomout' , vtCommand, @chZoomOut , true ); + RegisterVariable('zoomreset',vtCommand, @chZoomReset , true ); + RegisterVariable('skip' , vtCommand, @chSkip , false); + RegisterVariable('history' , vtCommand, @chHistory , true ); + RegisterVariable('chat' , vtCommand, @chChat , true ); + RegisterVariable('say' , vtCommand, @chSay , true ); + RegisterVariable('hogsay' , vtCommand, @chHogSay , true ); + RegisterVariable('team' , vtCommand, @chTeamSay , true ); + RegisterVariable('ammomenu', vtCommand, @chAmmoMenu , true); + RegisterVariable('+precise', vtCommand, @chPrecise_p , false); + RegisterVariable('-precise', vtCommand, @chPrecise_m , false); + RegisterVariable('+left' , vtCommand, @chLeft_p , false); + RegisterVariable('-left' , vtCommand, @chLeft_m , false); + RegisterVariable('+right' , vtCommand, @chRight_p , false); + RegisterVariable('-right' , vtCommand, @chRight_m , false); + RegisterVariable('+up' , vtCommand, @chUp_p , false); + RegisterVariable('-up' , vtCommand, @chUp_m , false); + RegisterVariable('+down' , vtCommand, @chDown_p , false); + RegisterVariable('-down' , vtCommand, @chDown_m , false); + RegisterVariable('+attack' , vtCommand, @chAttack_p , false); + RegisterVariable('-attack' , vtCommand, @chAttack_m , false); + RegisterVariable('switch' , vtCommand, @chSwitch , false); + RegisterVariable('nextturn', vtCommand, @chNextTurn , false); + RegisterVariable('timer' , vtCommand, @chTimer , false); + RegisterVariable('taunt' , vtCommand, @chTaunt , false); + RegisterVariable('setweap' , vtCommand, @chSetWeapon , false); + RegisterVariable('slot' , vtCommand, @chSlot , false); + RegisterVariable('put' , vtCommand, @chPut , false); + RegisterVariable('ljump' , vtCommand, @chLJump , false); + RegisterVariable('hjump' , vtCommand, @chHJump , false); + RegisterVariable('fullscr' , vtCommand, @chFullScr , true ); + RegisterVariable('+volup' , vtCommand, @chVol_p , true ); + RegisterVariable('-volup' , vtCommand, @chVol_m , true ); + RegisterVariable('+voldown', vtCommand, @chVol_m , true ); + RegisterVariable('-voldown', vtCommand, @chVol_p , true ); + RegisterVariable('findhh' , vtCommand, @chFindhh , true ); + RegisterVariable('pause' , vtCommand, @chPause , true ); + RegisterVariable('+cur_u' , vtCommand, @chCurU_p , true ); + RegisterVariable('-cur_u' , vtCommand, @chCurU_m , true ); + RegisterVariable('+cur_d' , vtCommand, @chCurD_p , true ); + RegisterVariable('-cur_d' , vtCommand, @chCurD_m , true ); + RegisterVariable('+cur_l' , vtCommand, @chCurL_p , true ); + RegisterVariable('-cur_l' , vtCommand, @chCurL_m , true ); + RegisterVariable('+cur_r' , vtCommand, @chCurR_p , true ); + RegisterVariable('-cur_r' , vtCommand, @chCurR_m , true ); end; procedure freeModule; +var t, tt: PVariable; begin - + tt:= Variables; + Variables:= nil; + while tt <> nil do + begin + t:= tt; + tt:= tt^.Next; + Dispose(t) + end; end; end. diff -r 996ef18fa396 -r 94c948a92759 hedgewars/uMobile.pas --- a/hedgewars/uMobile.pas Mon Nov 29 23:10:38 2010 -0500 +++ b/hedgewars/uMobile.pas Tue Nov 30 22:46:47 2010 +0100 @@ -76,7 +76,9 @@ procedure perfExt_AmmoUpdate; // don't inline begin {$IFDEF IPHONEOS} - if (CurrentTeam^.ExtDriven) or (CurrentTeam^.Hedgehogs[0].BotLevel <> 0) then + if (CurrentTeam = nil) or + (CurrentTeam^.ExtDriven) or + (CurrentTeam^.Hedgehogs[0].BotLevel <> 0) then exit(); // the other way around throws a compiler error updateVisualsNewTurn(); {$ENDIF} diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -27,7 +27,7 @@ #define BTNS_PER_ROW 9 #define DEFAULT_DESCRIPTION IS_IPAD() ? \ - NSLocalizedString(@"Hold your finger on a weapon to see what it does...",@"") : \ + NSLocalizedString(@"Hold your finger on a weapon to see what it does.\nYou can move this window anywhere on the screen.",@"") : \ NSLocalizedString(@"Hold your finger on a weapon to see what it does.\nTap anywhere to dismiss.",@"") @implementation AmmoMenuViewController @@ -40,11 +40,6 @@ #pragma mark - #pragma mark view handling -(void) viewDidLoad { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(updateAmmoVisuals) - name:@"updateAmmoVisuals" - object:nil]; - self.view.frame = CGRectMake(0, 0, 480, 320); self.view.backgroundColor = [UIColor blackColor]; self.view.layer.borderColor = [[UIColor whiteColor] CGColor]; @@ -344,7 +339,6 @@ } -(void) viewDidUnload { - [[NSNotificationCenter defaultCenter] removeObserver:self]; self.imagesArray = nil; self.buttonsArray = nil; self.nameLabel = nil; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/CommodityFunctions.m --- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Tue Nov 30 22:46:47 2010 +0100 @@ -29,11 +29,8 @@ #import "PascalImports.h" BOOL inline rotationManager (UIInterfaceOrientation interfaceOrientation) { - if (IS_IPAD()) - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight) || - (interfaceOrientation == UIInterfaceOrientationLandscapeLeft); - else - return (interfaceOrientation == UIInterfaceOrientationLandscapeLeft); + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight) || + (interfaceOrientation == UIInterfaceOrientationLandscapeLeft); } NSInteger inline randomPort () { diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -38,12 +38,7 @@ } -(IBAction) buttonPressed:(id) sender { - // works even if it's not actually a button - UIButton *theButton; - if (IS_IPAD()) - theButton = [[(NSNotification *)sender userInfo] objectForKey:@"sender"]; - else - theButton = (UIButton *)sender; + UIButton *theButton = (UIButton *)sender; switch (theButton.tag) { case 0: @@ -171,7 +166,7 @@ // play if there aren't too many teams if ([self.teamConfigViewController.listOfSelectedTeams count] > HW_getMaxNumberOfTeams()) { UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too many teams",@"") - message:NSLocalizedString(@"Max six teams are allowed in the same game",@"") + message:NSLocalizedString(@"You exceeded the maximum number of tems allowed in a game",@"") delegate:nil cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") otherButtonTitles:nil]; @@ -234,38 +229,17 @@ // finally launch game and remove this controller DLog(@"sending config %@", gameDictionary); - if ([[gameDictionary allKeys] count] == 11) { - NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:gameDictionary,@"game_dictionary", @"",@"savefile", - [NSNumber numberWithBool:NO],@"netgame", nil]; - // let's hide all the views while the game is on + NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:gameDictionary,@"game_dictionary", @"",@"savefile", + [NSNumber numberWithBool:NO],@"netgame", nil]; + if (IS_IPAD()) + [[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary]; + else { + // this causes a sporadic crash on the ipad but without this rotation doesn't work on iphone UIViewController *dummy = [[UIViewController alloc] init]; [self presentModalViewController:dummy animated:NO]; [[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary]; [self dismissModalViewControllerAnimated:NO]; [dummy release]; - } else { - DLog(@"gameconfig data not complete!!"); - [self.parentViewController dismissModalViewControllerAnimated:YES]; - - // present an alert to the user, with an image on the ipad (too big for the iphone) - NSString *msg = NSLocalizedString(@"Something went wrong with your configuration. Please try again.",@""); - if (IS_IPAD()) - msg = [msg stringByAppendingString:@"\n\n\n\n\n\n\n\n"]; // this makes space for the image - - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Whoops" - message:msg - delegate:nil - cancelButtonTitle:@"Ok" - otherButtonTitles:nil]; - - if (IS_IPAD()) { - UIImageView *deniedImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"denied.png"]]; - deniedImg.frame = CGRectMake(25, 80, 240, 160); - [alert addSubview:deniedImg]; - [deniedImg release]; - } - [alert show]; - [alert release]; } } @@ -311,12 +285,6 @@ self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width); if (IS_IPAD()) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(buttonPressed:) - name:@"buttonPressed" - object:nil]; - srandom(time(NULL)); - // load other controllers if (self.mapConfigViewController == nil) self.mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil]; @@ -357,6 +325,7 @@ self.teamConfigViewController.view.frame = CGRectMake(348, 200, 328, 480); self.schemeWeaponConfigViewController.view.frame = CGRectMake(10, 70, 300, 600); + self.mapConfigViewController.parentController = self; } else { // this is the visible controller if (self.mapConfigViewController == nil) @@ -420,7 +389,6 @@ } -(void) viewDidUnload { - [[NSNotificationCenter defaultCenter] removeObserver:self]; self.imgContainer = nil; self.mapConfigViewController = nil; self.teamConfigViewController = nil; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/HelpPageViewController.m --- a/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -47,11 +47,6 @@ [super viewDidLoad]; } - --(void) scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view { - [self.view removeFromSuperview]; -} - -(void) viewDidUnload { [super viewDidUnload]; self.scrollView = nil; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/InGameMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -185,7 +185,7 @@ #pragma mark - #pragma mark actionSheet methods -(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { - if (IS_IPAD()){ + if (IS_IPAD() == NO){ CGRect screen = [[UIScreen mainScreen] bounds]; [UIView beginAnimations:@"table width less" context:NULL]; [UIView setAnimationDuration:0.2]; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/MainMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -190,11 +190,11 @@ if (nil == self.aboutViewController) { AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil]; about.modalTransitionStyle = UIModalTransitionStyleCoverVertical; - about.modalPresentationStyle = UIModalPresentationFormSheet; + if ([about respondsToSelector:@selector(setModalPresentationStyle:)]) + about.modalPresentationStyle = UIModalPresentationFormSheet; self.aboutViewController = about; [about release]; } - [self presentModalViewController:self.aboutViewController animated:YES]; #endif break; @@ -202,7 +202,8 @@ if (nil == self.savedGamesViewController) { SavedGamesViewController *savedgames = [[SavedGamesViewController alloc] initWithNibName:@"SavedGamesViewController" bundle:nil]; savedgames.modalTransitionStyle = UIModalTransitionStyleCoverVertical; - savedgames.modalPresentationStyle = UIModalPresentationPageSheet; + if ([savedgames respondsToSelector:@selector(setModalPresentationStyle:)]) + savedgames.modalPresentationStyle = UIModalPresentationPageSheet; self.savedGamesViewController = savedgames; [savedgames release]; } diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/MapConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Tue Nov 30 22:46:47 2010 +0100 @@ -23,6 +23,7 @@ #import "MapPreviewButtonView.h" @class SchemeWeaponConfigViewController; +@class GameConfigViewController; @interface MapConfigViewController : UIViewController { NSInteger oldValue; // for the slider @@ -53,6 +54,7 @@ // controller for mission state SchemeWeaponConfigViewController *externalController; + GameConfigViewController *parentController; } @@ -77,6 +79,7 @@ @property (nonatomic,retain) NSArray *dataSourceArray; @property (nonatomic,assign) SchemeWeaponConfigViewController *externalController; +@property (nonatomic,assign) GameConfigViewController *parentController; -(IBAction) buttonPressed:(id) sender; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -24,13 +24,15 @@ #import "CommodityFunctions.h" #import "UIImageExtra.h" #import "SchemeWeaponConfigViewController.h" +#import "GameConfigViewController.h" #define scIndex self.segmentedControl.selectedSegmentIndex #define isRandomness() (segmentedControl.selectedSegmentIndex == 0 || segmentedControl.selectedSegmentIndex == 2) @implementation MapConfigViewController @synthesize previewButton, maxHogs, seedCommand, templateFilterCommand, mapGenCommand, mazeSizeCommand, themeCommand, staticMapCommand, - missionCommand, tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, dataSourceArray, busy, externalController; + missionCommand, tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, dataSourceArray, busy, + externalController, parentController; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { @@ -369,9 +371,7 @@ } -(IBAction) buttonPressed:(id) sender { - [[NSNotificationCenter defaultCenter] postNotificationName:@"buttonPressed" - object:nil - userInfo:[NSDictionary dictionaryWithObject:sender forKey:@"sender"]]; + [self.parentController buttonPressed:sender]; } #pragma mark - @@ -389,10 +389,10 @@ NSMutableArray *mapArray = [[NSMutableArray alloc] init]; for (NSString *str in mapArrayFull) { CGSize imgSize = PSPNGSizeFromMetaData([MAPS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]); - //DLog(@"%@ %f %f", str, imgSize.width, imgSize.height); + // remove images that are too big for certain devices if (IS_NOT_POWERFUL() && imgSize.height > 1024.0f) continue; - if (IS_IPAD() && imgSize.height > 1280.0f) + if ([modelType() hasPrefix:@"iPad1"] && imgSize.height > 1280.0f) continue; [mapArray addObject:str]; } @@ -401,10 +401,10 @@ NSMutableArray *missionArray = [[NSMutableArray alloc] init]; for (NSString *str in missionArrayFull) { CGSize imgSize = PSPNGSizeFromMetaData([MISSIONS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]); - //DLog(@"%@ %f %f", str, imgSize.width, imgSize.height); + // remove images that are too big for certain devices if (IS_NOT_POWERFUL() && imgSize.height > 1024.0f) continue; - if (IS_IPAD() && imgSize.height > 1280.0f) + if ([modelType() hasPrefix:@"iPad1"] && imgSize.height > 1280.0f) continue; [missionArray addObject:str]; } @@ -449,7 +449,7 @@ if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) [self.tableView setBackgroundView:nil]; - self.view.backgroundColor = [UIColor clearColor]; + self.tableView.backgroundColor = [UIColor clearColor]; self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } @@ -491,14 +491,16 @@ -(void) didReceiveMemoryWarning { self.dataSourceArray = nil; + [super didReceiveMemoryWarning]; - self.tableView = nil; - self.maxLabel = nil; - self.sizeLabel = nil; - self.slider = nil; + if (self.view.superview == nil) { + self.tableView = nil; + self.maxLabel = nil; + self.sizeLabel = nil; + self.slider = nil; + } MSG_MEMCLEAN(); - [super didReceiveMemoryWarning]; } -(void) dealloc { diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m --- a/project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m Tue Nov 30 22:46:47 2010 +0100 @@ -53,11 +53,12 @@ #pragma mark - #pragma mark image wrappers -(void) setBackgroundImageRounded:(UIImage *)image forState:(UIControlState)state { - [self setBackgroundImage:[image makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:UIControlStateNormal]; + // TODO:http://stackoverflow.com/questions/4272476/setbackgroundimage-behaviour-changed-on-ipad-4-2 + [self setBackgroundImage:[image makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:state]; } -(void) setImageRounded:(UIImage *)image forState:(UIControlState)state { - [self setImage:[image makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:UIControlStateNormal]; + [self setImage:[image makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:state]; } -(void) setImageRoundedForNormalState:(UIImage *)image { diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/ObjcExports.h --- a/project_files/HedgewarsMobile/Classes/ObjcExports.h Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/ObjcExports.h Tue Nov 30 22:46:47 2010 +0100 @@ -25,8 +25,11 @@ #define REPLAYBLACKVIEW_TAG 9955 #define ACTIVITYINDICATOR_TAG 987654 +@class AmmoMenuViewController; + void objcExportsInit(); BOOL isGameRunning(); void setGameRunning(BOOL value); NSInteger cachedGrenadeTime(); void setGrenadeTime(NSInteger value); +void setAmmoMenuInstance(AmmoMenuViewController *instance); diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/ObjcExports.m --- a/project_files/HedgewarsMobile/Classes/ObjcExports.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/ObjcExports.m Tue Nov 30 22:46:47 2010 +0100 @@ -20,6 +20,7 @@ #import "ObjcExports.h" +#import "AmmoMenuViewController.h" #pragma mark - #pragma mark internal variables @@ -29,6 +30,8 @@ BOOL savedGame; // cache the grenade time NSInteger grenadeTime; +// the reference to the newMenu instance +AmmoMenuViewController *amvc_instance; #pragma mark - #pragma mark functions called like oop @@ -54,6 +57,10 @@ grenadeTime = value; } +void inline setAmmoMenuInstance(AmmoMenuViewController *instance) { + amvc_instance = instance; +} + #pragma mark - #pragma mark functions called by pascal code void startSpinning() { @@ -141,5 +148,6 @@ } void updateVisualsNewTurn(void) { - [[NSNotificationCenter defaultCenter] postNotificationName:@"updateAmmoVisuals" object:nil]; + DLog(@"updating visuals"); + [amvc_instance updateAmmoVisuals]; } diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Tue Nov 30 22:46:47 2010 +0100 @@ -51,6 +51,7 @@ // stuff initialized externally BOOL isNetGame; BOOL useClassicMenu; + NSInteger initialOrientation; // dual head support NSInteger initialScreenCount; @@ -63,6 +64,7 @@ @property (nonatomic,retain) AmmoMenuViewController *amvc; @property (assign) BOOL isNetGame; @property (assign) BOOL useClassicMenu; +@property (assign) NSInteger initialOrientation; -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/OverlayViewController.m --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -38,16 +38,22 @@ #define removeConfirmationInput() [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; @implementation OverlayViewController -@synthesize popoverController, popupMenu, helpPage, amvc, isNetGame, useClassicMenu; +@synthesize popoverController, popupMenu, helpPage, amvc, isNetGame, useClassicMenu, initialOrientation; #pragma mark - #pragma mark rotation -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + // don't rotate until the game is running for performance and synchronization with the sdlview + if (isGameRunning() == NO) + return (interfaceOrientation == (UIInterfaceOrientation) self.initialOrientation); return rotationManager(interfaceOrientation); } // pause the game and remove objc menus so that animation is smoother -(void) willRotateToInterfaceOrientation:(UIInterfaceOrientation) toInterfaceOrientation duration:(NSTimeInterval) duration{ + if (isGameRunning() == NO) + return; + [self dismissPopover]; if (HW_isPaused() == NO) HW_pause(); @@ -75,6 +81,9 @@ // now restore previous state -(void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation) fromInterfaceOrientation { + if (isGameRunning() == NO) + return; + if (wasVisible || IS_DUALHEAD()) [self.amvc appearInView:self.view]; if (HW_isPaused() == YES) @@ -85,6 +94,9 @@ // while in dual head the above rotation functions are not called -(void) dualHeadRotation:(NSNotification *)notification { + if (isGameRunning() == NO) + return; + UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; [UIView beginAnimations:@"rotation" context:NULL]; @@ -398,7 +410,7 @@ if (IS_DUALHEAD() || self.useClassicMenu == NO) { if (self.amvc == nil) self.amvc = [[AmmoMenuViewController alloc] init]; - + setAmmoMenuInstance(amvc); if (self.amvc.isVisible) { doDim(); [self.amvc disappear]; @@ -409,6 +421,7 @@ } } } else { + setAmmoMenuInstance(nil); HW_ammoMenu(); } break; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.h --- a/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.h Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.h Tue Nov 30 22:46:47 2010 +0100 @@ -23,9 +23,11 @@ #import @class MainMenuViewController; +@class OverlayViewController; @interface SDLUIKitDelegate:NSObject { MainMenuViewController *mainViewController; + OverlayViewController *overlayController; UIWindow *uiwindow; UIWindow *secondWindow; BOOL isInGame; @@ -33,6 +35,7 @@ @property (assign) BOOL isInGame; @property (nonatomic,retain) MainMenuViewController *mainViewController; +@property (nonatomic,retain) OverlayViewController *overlayController; @property (nonatomic,retain) UIWindow *uiwindow; @property (nonatomic,retain) UIWindow *secondWindow; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m --- a/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Tue Nov 30 22:46:47 2010 +0100 @@ -57,7 +57,7 @@ } @implementation SDLUIKitDelegate -@synthesize mainViewController, uiwindow, secondWindow, isInGame; +@synthesize mainViewController, overlayController, uiwindow, secondWindow, isInGame; // convenience method +(SDLUIKitDelegate *)sharedAppDelegate { @@ -77,6 +77,7 @@ -(void) dealloc { [mainViewController release]; + [overlayController release]; [uiwindow release]; [secondWindow release]; [super dealloc]; @@ -127,7 +128,11 @@ [setup release]; // since the sdlwindow is not yet created, we add the overlayController with a delay - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:isNetGameNum,@"net",menuStyle,@"menu",nil]; + NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys: + isNetGameNum,@"net", + menuStyle,@"menu", + [[gameDictionary objectForKey:@"game_dictionary"] objectForKey:@"orientation"],@"orientation", + nil]; [self performSelector:@selector(displayOverlayLater:) withObject:dict afterDelay:1]; // this is the pascal fuction that starts the game (wrapped around isInGame) @@ -153,19 +158,17 @@ // overlay with controls, become visible later, with a transparency effect -(void) displayOverlayLater:(id) object { NSDictionary *dict = (NSDictionary *)object; - OverlayViewController *overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController" bundle:nil]; - overlayController.isNetGame = [[dict objectForKey:@"net"] boolValue]; - overlayController.useClassicMenu = [[dict objectForKey:@"menu"] boolValue]; + self.overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController" bundle:nil]; + self.overlayController.isNetGame = [[dict objectForKey:@"net"] boolValue]; + self.overlayController.useClassicMenu = [[dict objectForKey:@"menu"] boolValue]; + self.overlayController.initialOrientation = [[dict objectForKey:@"orientation"] intValue]; UIWindow *gameWindow; if (IS_DUALHEAD()) gameWindow = self.uiwindow; else gameWindow = [[UIApplication sharedApplication] keyWindow]; - [gameWindow addSubview:overlayController.view]; - //[[[gameWindow subviews] objectAtIndex:0] addSubview:overlayController.view]; - // don't release a controller according to http://developer.apple.com/library/ios/#qa/qa2010/qa1688.html - //[overlayController release]; + [gameWindow addSubview:self.overlayController.view]; } // override the direct execution of SDL_main to allow us to implement the frontend (or even using a nib) diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/SavedGamesViewController.m --- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -111,7 +111,11 @@ cancelButtonTitle:cancelStr destructiveButtonTitle:confirmStr otherButtonTitles:nil]; - [actionSheet showInView:self.view]; + + if (IS_IPAD()) + [actionSheet showFromBarButtonItem:(UIBarButtonItem *)sender animated:YES]; + else + [actionSheet showInView:self.view]; [actionSheet release]; } diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -47,7 +47,7 @@ if (IS_IPAD()) [self.tableView setBackgroundView:nil]; else { - UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"backgroundCenter.png"]; + UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"background~iphone.png"]; UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage]; [backgroundImage release]; [self.tableView setBackgroundView:background]; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/SplitViewRootController.h --- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.h Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/SplitViewRootController.h Tue Nov 30 22:46:47 2010 +0100 @@ -25,8 +25,12 @@ @interface SplitViewRootController: UIViewController { MasterViewController *activeController; + UINavigationController *rightNavController; + UISplitViewController *splitViewRootController; } @property (nonatomic,retain) MasterViewController *activeController; +@property (nonatomic,retain) UINavigationController *rightNavController; +@property (nonatomic,retain) UISplitViewController *splitViewRootController; @end diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/SplitViewRootController.m --- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Tue Nov 30 22:46:47 2010 +0100 @@ -24,7 +24,7 @@ #import "CommodityFunctions.h" @implementation SplitViewRootController -@synthesize activeController; +@synthesize activeController, rightNavController, splitViewRootController; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { return rotationManager(interfaceOrientation); @@ -49,7 +49,7 @@ self.activeController = rightController; [rightController release]; } - UINavigationController *rightNavController = [[UINavigationController alloc] initWithRootViewController:self.activeController]; + self.rightNavController = [[UINavigationController alloc] initWithRootViewController:self.activeController]; if (IS_IPAD()) { MasterViewController *leftController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain]; @@ -57,18 +57,18 @@ UINavigationController *leftNavController = [[UINavigationController alloc] initWithRootViewController:leftController]; [leftController release]; - UISplitViewController *splitViewRootController = [[UISplitViewController alloc] init]; - splitViewRootController.delegate = nil; - splitViewRootController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width); - splitViewRootController.viewControllers = [NSArray arrayWithObjects: leftNavController, rightNavController, nil]; + self.splitViewRootController = [[UISplitViewController alloc] init]; + self.splitViewRootController.delegate = nil; + self.splitViewRootController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width); + self.splitViewRootController.viewControllers = [NSArray arrayWithObjects: leftNavController, self.rightNavController, nil]; [leftNavController release]; - [rightNavController release]; + [self.rightNavController release]; // add view to main controller - [self.view addSubview:splitViewRootController.view]; + [self.view addSubview:self.splitViewRootController.view]; } else { - rightNavController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width); - [self.view addSubview:rightNavController.view]; + self.rightNavController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width); + [self.view addSubview:self.rightNavController.view]; } [super viewDidLoad]; @@ -76,12 +76,16 @@ -(void) viewDidUnload { self.activeController = nil; + self.rightNavController = nil; + self.splitViewRootController = nil; MSG_DIDUNLOAD(); [super viewDidUnload]; } -(void) dealloc { - [self.activeController release]; + [activeController release]; + [rightNavController release]; + [splitViewRootController release]; [super dealloc]; } diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Tue Nov 30 22:46:47 2010 +0100 @@ -43,7 +43,7 @@ if (IS_IPAD()) [self.tableView setBackgroundView:nil]; else { - UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"backgroundCenter.png"]; + UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"background~iphone.png"]; UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage]; [backgroundImage release]; [self.tableView setBackgroundView:background]; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Classes/UIImageExtra.m --- a/project_files/HedgewarsMobile/Classes/UIImageExtra.m Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Classes/UIImageExtra.m Tue Nov 30 22:46:47 2010 +0100 @@ -232,16 +232,22 @@ } +(UIImage *)whiteImage:(CGSize) ofSize { - UIGraphicsBeginImageContext(ofSize); - CGContextRef context = UIGraphicsGetCurrentContext(); - UIGraphicsPushContext(context); + CGFloat w = ofSize.width; + CGFloat h = ofSize.height; + CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); + CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst); + + CGContextBeginPath(context); CGContextSetRGBFillColor(context, 1.0, 1.0, 1.0, 1.0); CGContextFillRect(context,CGRectMake(0,0,ofSize.width,ofSize.height)); - UIGraphicsPopContext(); - UIImage *bkgImg = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); + CGImageRef image = CGBitmapContextCreateImage(context); + CGContextRelease(context); + CGColorSpaceRelease(colorSpace); + + UIImage *bkgImg = [UIImage imageWithCGImage:image]; + CGImageRelease(image); return bkgImg; } diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Nov 30 22:46:47 2010 +0100 @@ -26,11 +26,11 @@ 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 61006F95128DE31F00EBA7F7 /* CreationChamber.m in Sources */ = {isa = PBXBuildFile; fileRef = 61006F94128DE31F00EBA7F7 /* CreationChamber.m */; }; + 6103D414129B417500911D8D /* plus@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D413129B417500911D8D /* plus@2x.png */; }; 610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43411E290650040BA66 /* Icon-Small@2x.png */; }; 610D5FB31270E26C0033333A /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43611E290650040BA66 /* Icon@2x.png */; }; 611D9BFB12497E9800008271 /* SavedGamesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611D9BF912497E9800008271 /* SavedGamesViewController.m */; }; 611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */; }; - 611DA031124E2BC500008271 /* mediumBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 611DA030124E2BC500008271 /* mediumBackground~ipad.png */; }; 611DA1D0124E5C6300008271 /* plus.png in Resources */ = {isa = PBXBuildFile; fileRef = 611DA1CF124E5C6300008271 /* plus.png */; }; 611E03E711FA747C0077A41E /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 611E037C11FA74590077A41E /* libvorbis.a */; }; 611E0E5111FA92170077A41E /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 611E0E5011FA92130077A41E /* libfreetype.a */; }; @@ -52,12 +52,12 @@ 61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */; }; 61399013125D19C0003C2DC0 /* uMobile.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61399012125D19C0003C2DC0 /* uMobile.pas */; }; 6147DAD31253DCDE0010357E /* savesButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 6147DAD21253DCDE0010357E /* savesButton.png */; }; - 614AE65D127D090A0070BF5F /* smallerBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 614AE65A127D090A0070BF5F /* smallerBackground~ipad.png */; }; - 614AE65E127D090A0070BF5F /* smallerBackground~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 614AE65B127D090A0070BF5F /* smallerBackground~iphone.png */; }; 61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */; }; 615AD96212073B4D00F2FF04 /* startGameButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD96112073B4D00F2FF04 /* startGameButton.png */; }; 615AD9E9120764CA00F2FF04 /* backButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9E8120764CA00F2FF04 /* backButton.png */; }; 615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9EA1207654E00F2FF04 /* helpButton.png */; }; + 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */; }; + 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */; }; 6163EE7E11CC2600001C0453 /* SingleWeaponViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */; }; 6165920D11CA9BA200D6E256 /* FlagsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E111CA9BA200D6E256 /* FlagsViewController.m */; }; 6165920E11CA9BA200D6E256 /* FortsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E311CA9BA200D6E256 /* FortsViewController.m */; }; @@ -90,6 +90,10 @@ 6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */; }; 6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165925011CA9CB400D6E256 /* OverlayViewController.xib */; }; 6165929E11CA9E2F00D6E256 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */; }; + 6172FED91298CF9800D73365 /* background~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED71298CF9800D73365 /* background~iphone.png */; }; + 6172FEEF1298D25D00D73365 /* mediumBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */; }; + 6172FEF11298D25D00D73365 /* smallerBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */; }; + 6172FEF21298D25D00D73365 /* smallerBackground~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEE1298D25D00D73365 /* smallerBackground~iphone.png */; }; 61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; 61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; }; 6179881B114AA34C00BA94A9 /* PascalExports.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; }; @@ -124,17 +128,15 @@ 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */; }; 61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798934114AB25F00BA94A9 /* AudioToolbox.framework */; }; 61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798993114AB3FA00BA94A9 /* libSDL_mixer.a */; }; - 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617989BB114AB47500BA94A9 /* libSDL_net.a */; }; 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798A13114AB65600BA94A9 /* libSDL_ttf.a */; }; 61799289114AE08700BA94A9 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; - 61808A4B128C901B005D0E2F /* startButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61808A4A128C901B005D0E2F /* startButton.png */; }; 61808A5D128C930A005D0E2F /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; }; - 61808A6F128C94E1005D0E2F /* backgroundTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61808A6E128C94E1005D0E2F /* backgroundTop.png */; }; - 6183D83E11E2BCE200A88903 /* Default-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */; }; 61842B24122B619D0096E335 /* HelpPageInGameViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.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 */; }; + 61889985129995B500D55FD6 /* title~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61889984129995B500D55FD6 /* title~ipad.png */; }; + 618E27BC12A2C32600C20EF0 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 618E27BB12A2C30700C20EF0 /* libSDL_net.a */; }; 6199E81612463EA800DADF8C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6199E81512463EA800DADF8C /* CFNetwork.framework */; }; 6199E81A12463EC400DADF8C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6199E81912463EC400DADF8C /* SystemConfiguration.framework */; }; 6199E839124647DE00DADF8C /* SupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6199E837124647DE00DADF8C /* SupportViewController.m */; }; @@ -143,13 +145,9 @@ 619C5AF4124F7E3100D041AE /* LuaPas.pas in Sources */ = {isa = PBXBuildFile; fileRef = 619C5AF3124F7E3100D041AE /* LuaPas.pas */; }; 619C5BA2124FA59000D041AE /* MapPreviewButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 619C5BA1124FA59000D041AE /* MapPreviewButtonView.m */; }; 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 */; }; - 61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E911DF58550068B24D /* borderBottom.png */; }; 61A670C012747D9B00B06CE7 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* Default.png */; }; 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */; }; 61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */; }; - 61A670FB12747E0D00B06CE7 /* title_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 619C09E911E8B8D600F1DF16 /* title_small.png */; }; - 61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; }; 61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; }; 61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; }; 61D205A1127CDD1100ABD83E /* ObjcExports.m in Sources */ = {isa = PBXBuildFile; fileRef = 61D205A0127CDD1100ABD83E /* ObjcExports.m */; }; @@ -161,14 +159,13 @@ 61E2F7441283752C00E12521 /* fb.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7421283752C00E12521 /* fb.png */; }; 61E2F7451283752C00E12521 /* tw.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7431283752C00E12521 /* tw.png */; }; 61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; }; - 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */; }; 61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920511DF57AC003441C4 /* arrowDown.png */; }; 61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920611DF57AC003441C4 /* arrowLeft.png */; }; 61EF921011DF57AC003441C4 /* arrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920711DF57AC003441C4 /* arrowRight.png */; }; 61EF921111DF57AC003441C4 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920811DF57AC003441C4 /* arrowUp.png */; }; - 61EF921211DF57AC003441C4 /* joyButton_attack.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920911DF57AC003441C4 /* joyButton_attack.png */; }; - 61EF921311DF57AC003441C4 /* joyButton_backjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */; }; - 61EF921411DF57AC003441C4 /* joyButton_forwardjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */; }; + 61EF921211DF57AC003441C4 /* joyButtonAttack.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920911DF57AC003441C4 /* joyButtonAttack.png */; }; + 61EF921311DF57AC003441C4 /* joyButtonBackJump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920A11DF57AC003441C4 /* joyButtonBackJump.png */; }; + 61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920B11DF57AC003441C4 /* joyButtonForwardJump.png */; }; 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */; }; 61F2E7CF1205EDE0005734F7 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */; }; 61F2E7EC12060E31005734F7 /* checkbox.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7EB12060E31005734F7 /* checkbox.png */; }; @@ -179,7 +176,6 @@ 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43711E290650040BA66 /* iTunesArtwork.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 */; }; 61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F904D611DF7DA30068B24D /* WeaponCellView.m */; }; 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; /* End PBXBuildFile section */ @@ -674,13 +670,6 @@ remoteGlobalIDString = BE1FA95407AF96B2004B6283; remoteInfo = "Static Library"; }; - 617989BA114AB47500BA94A9 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA; - remoteInfo = "Static Library"; - }; 61798A12114AB65600BA94A9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */; @@ -695,6 +684,13 @@ remoteGlobalIDString = 006E982211955059001DE610; remoteInfo = testsdl; }; + 618E27BA12A2C30700C20EF0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA; + remoteInfo = "Static Library"; + }; 619C5AC9124F7DDF00D041AE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 619C5AC0124F7DDF00D041AE /* Lua.xcodeproj */; @@ -734,11 +730,23 @@ 32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hedgewars_Prefix.pch; sourceTree = ""; }; 61006F93128DE31F00EBA7F7 /* CreationChamber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CreationChamber.h; path = Classes/CreationChamber.h; sourceTree = ""; }; 61006F94128DE31F00EBA7F7 /* CreationChamber.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CreationChamber.m; path = Classes/CreationChamber.m; sourceTree = ""; }; + 6103D383129B346A00911D8D /* fb@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fb@2x.png"; path = "Resources/Icons/fb@2x.png"; sourceTree = ""; }; + 6103D384129B347700911D8D /* irc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "irc@2x.png"; path = "Resources/Icons/irc@2x.png"; sourceTree = ""; }; + 6103D385129B348200911D8D /* tw@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "tw@2x.png"; path = "Resources/Icons/tw@2x.png"; sourceTree = ""; }; + 6103D392129B34E900911D8D /* joyButtonAttack@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "joyButtonAttack@2x.png"; path = "Resources/Overlay/joyButtonAttack@2x.png"; sourceTree = ""; }; + 6103D393129B34E900911D8D /* joyButtonBackJump@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "joyButtonBackJump@2x.png"; path = "Resources/Overlay/joyButtonBackJump@2x.png"; sourceTree = ""; }; + 6103D394129B34E900911D8D /* joyButtonForwardJump@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "joyButtonForwardJump@2x.png"; path = "Resources/Overlay/joyButtonForwardJump@2x.png"; sourceTree = ""; }; + 6103D399129B350700911D8D /* ammoButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ammoButton@2x.png"; path = "Resources/Overlay/ammoButton@2x.png"; sourceTree = ""; }; + 6103D39A129B350700911D8D /* arrowDown@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrowDown@2x.png"; path = "Resources/Overlay/arrowDown@2x.png"; sourceTree = ""; }; + 6103D39B129B350700911D8D /* arrowLeft@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrowLeft@2x.png"; path = "Resources/Overlay/arrowLeft@2x.png"; sourceTree = ""; }; + 6103D39C129B350700911D8D /* arrowRight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrowRight@2x.png"; path = "Resources/Overlay/arrowRight@2x.png"; sourceTree = ""; }; + 6103D39D129B350700911D8D /* arrowUp@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrowUp@2x.png"; path = "Resources/Overlay/arrowUp@2x.png"; sourceTree = ""; }; + 6103D39E129B350700911D8D /* cornerButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cornerButton@2x.png"; path = "Resources/Overlay/cornerButton@2x.png"; sourceTree = ""; }; + 6103D413129B417500911D8D /* plus@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "plus@2x.png"; path = "Resources/Icons/plus@2x.png"; sourceTree = ""; }; 611D9BF812497E9800008271 /* SavedGamesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SavedGamesViewController.h; sourceTree = ""; }; 611D9BF912497E9800008271 /* SavedGamesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SavedGamesViewController.m; sourceTree = ""; }; 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SavedGamesViewController.xib; path = ../Resources/SavedGamesViewController.xib; sourceTree = ""; }; - 611DA030124E2BC500008271 /* mediumBackground~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mediumBackground~ipad.png"; path = "Resources/Overlay/mediumBackground~ipad.png"; sourceTree = ""; }; - 611DA1CF124E5C6300008271 /* plus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = plus.png; path = Resources/Overlay/plus.png; sourceTree = ""; }; + 611DA1CF124E5C6300008271 /* plus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = plus.png; path = Resources/Icons/plus.png; sourceTree = ""; }; 611E02EC11FA74580077A41E /* cocos2d-iphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "cocos2d-iphone.xcodeproj"; path = "../../../Library/cocos2d/cocos2d-iphone.xcodeproj"; sourceTree = SOURCE_ROOT; }; 611E0E4B11FA92130077A41E /* freetype.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = freetype.xcodeproj; path = "../../../Library/freetype/Xcode-iPhoneOS/freetype.xcodeproj"; sourceTree = SOURCE_ROOT; }; 611E0EE511FB20610077A41E /* ammoButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ammoButton.png; path = Resources/Overlay/ammoButton.png; sourceTree = ""; }; @@ -755,20 +763,20 @@ 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; }; 61272338117DF778005B90CF /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 6129B9F611EFB04D0017E305 /* denied.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = denied.png; path = Resources/denied.png; sourceTree = ""; }; 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Distribution.plist"; sourceTree = ""; }; 61399012125D19C0003C2DC0 /* uMobile.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uMobile.pas; path = ../../hedgewars/uMobile.pas; sourceTree = SOURCE_ROOT; }; - 6147DAD21253DCDE0010357E /* savesButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = savesButton.png; path = Resources/savesButton.png; sourceTree = ""; }; - 614AE659127D090A0070BF5F /* smallerBackground@2x-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground@2x-iphone.png"; path = "Resources/Overlay/smallerBackground@2x-iphone.png"; sourceTree = ""; }; - 614AE65A127D090A0070BF5F /* smallerBackground~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~ipad.png"; path = "Resources/Overlay/smallerBackground~ipad.png"; sourceTree = ""; }; - 614AE65B127D090A0070BF5F /* smallerBackground~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~iphone.png"; path = "Resources/Overlay/smallerBackground~iphone.png"; sourceTree = ""; }; + 6147DAD21253DCDE0010357E /* savesButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = savesButton.png; path = Resources/Frontend/savesButton.png; sourceTree = ""; }; 614E333D11DE9A93009DBA4E /* VGSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = VGSHandlers.inc; path = ../../hedgewars/VGSHandlers.inc; sourceTree = SOURCE_ROOT; }; - 615AD96112073B4D00F2FF04 /* startGameButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startGameButton.png; path = "Resources/Frontend-iPad/startGameButton.png"; sourceTree = ""; }; - 615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = "Resources/Frontend-iPad/backButton.png"; sourceTree = ""; }; - 615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = "Resources/Frontend-iPad/helpButton.png"; sourceTree = ""; }; + 615AD96112073B4D00F2FF04 /* startGameButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startGameButton.png; path = Resources/Frontend/startGameButton.png; sourceTree = ""; }; + 615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = Resources/Frontend/backButton.png; sourceTree = ""; }; + 615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = Resources/Frontend/helpButton.png; sourceTree = ""; }; + 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "checkbox@2x.png"; path = "Resources/Icons/checkbox@2x.png"; sourceTree = ""; }; + 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton@2x~iphone.png"; path = "Resources/Frontend/localplayButton@2x~iphone.png"; sourceTree = ""; }; + 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~ipad.png"; path = "Resources/Frontend/localplayButton~ipad.png"; sourceTree = ""; }; + 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~iphone.png"; path = "Resources/Frontend/localplayButton~iphone.png"; sourceTree = ""; }; 6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = ""; }; 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleWeaponViewController.m; sourceTree = ""; }; 616591E011CA9BA200D6E256 /* FlagsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagsViewController.h; sourceTree = ""; }; @@ -834,6 +842,16 @@ 6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = Resources/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; 6165929C11CA9E2F00D6E256 /* SDL_uikitappdelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_uikitappdelegate.h; path = Classes/SDL_uikitappdelegate.h; sourceTree = ""; }; 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_uikitappdelegate.m; path = Classes/SDL_uikitappdelegate.m; sourceTree = ""; }; + 6172FEA21298C7F900D73365 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Icons/Default@2x.png"; sourceTree = ""; }; + 6172FEC81298CE4800D73365 /* savesButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "savesButton@2x.png"; path = "Resources/Frontend/savesButton@2x.png"; sourceTree = ""; }; + 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settingsButton@2x.png"; path = "Resources/Frontend/settingsButton@2x.png"; sourceTree = ""; }; + 6172FED31298CE6600D73365 /* backButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "backButton@2x.png"; path = "Resources/Frontend/backButton@2x.png"; sourceTree = ""; }; + 6172FED61298CF9800D73365 /* background@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background@2x~iphone.png"; path = "Resources/Frontend/background@2x~iphone.png"; sourceTree = ""; }; + 6172FED71298CF9800D73365 /* background~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background~iphone.png"; path = "Resources/Frontend/background~iphone.png"; sourceTree = ""; }; + 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mediumBackground~ipad.png"; path = "Resources/Frontend/mediumBackground~ipad.png"; sourceTree = ""; }; + 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground@2x~iphone.png"; path = "Resources/Frontend/smallerBackground@2x~iphone.png"; sourceTree = ""; }; + 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~ipad.png"; path = "Resources/Frontend/smallerBackground~ipad.png"; sourceTree = ""; }; + 6172FEEE1298D25D00D73365 /* smallerBackground~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~iphone.png"; path = "Resources/Frontend/smallerBackground~iphone.png"; sourceTree = ""; }; 617987E1114AA34C00BA94A9 /* CCHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = CCHandlers.inc; path = ../../hedgewars/CCHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E4114AA34C00BA94A9 /* GSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GSHandlers.inc; path = ../../hedgewars/GSHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E5114AA34C00BA94A9 /* HHHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = HHHandlers.inc; path = ../../hedgewars/HHHandlers.inc; sourceTree = SOURCE_ROOT; }; @@ -875,11 +893,8 @@ 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = "../../../Library/SDL-1.3/SDL/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798934114AB25F00BA94A9 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../Library/SDL-1.3/SDL_mixer/Xcode-iPhoneOS/SDL_mixer.xcodeproj"; sourceTree = SOURCE_ROOT; }; - 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_ttf.xcodeproj; path = "../../../Library/SDL-1.3/SDL_ttf/Xcode-iPhoneOS/SDL_ttf.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = ""; }; - 61808A4A128C901B005D0E2F /* startButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startButton.png; path = "Resources/Frontend-iPhone/startButton.png"; sourceTree = ""; }; - 61808A6E128C94E1005D0E2F /* backgroundTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundTop.png; path = "Resources/Frontend-iPhone/backgroundTop.png"; sourceTree = ""; }; 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-ipad-Landscape.png"; path = "Resources/Icons/Default-ipad-Landscape.png"; sourceTree = ""; }; 6183D83D11E2BCE200A88903 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Icons/Default.png; sourceTree = ""; }; 61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageInGameViewController-iPad.xib"; path = "../Resources/HelpPageInGameViewController-iPad.xib"; sourceTree = ""; }; @@ -887,12 +902,14 @@ 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 = ""; }; + 618899811299516000D55FD6 /* title@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x.png"; path = "Resources/Frontend/title@2x.png"; sourceTree = ""; }; + 61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = ""; }; + 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 6199E81512463EA800DADF8C /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 6199E81912463EC400DADF8C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 6199E836124647DE00DADF8C /* SupportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SupportViewController.h; sourceTree = ""; }; 6199E837124647DE00DADF8C /* SupportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SupportViewController.m; sourceTree = ""; }; 6199E86C12464A8E00DADF8C /* surprise.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = surprise.png; path = Resources/surprise.png; sourceTree = ""; }; - 619C09E911E8B8D600F1DF16 /* title_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title_small.png; path = "Resources/Frontend-iPhone/title_small.png"; sourceTree = ""; }; 619C5AC0124F7DDF00D041AE /* Lua.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lua.xcodeproj; path = ../../../Library/Lua/Lua.xcodeproj; sourceTree = SOURCE_ROOT; }; 619C5AF3124F7E3100D041AE /* LuaPas.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = LuaPas.pas; path = ../../hedgewars/LuaPas.pas; sourceTree = SOURCE_ROOT; }; 619C5BA0124FA59000D041AE /* MapPreviewButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapPreviewButtonView.h; path = Classes/MapPreviewButtonView.h; sourceTree = ""; }; @@ -910,19 +927,18 @@ 61E1F4F711D004240016A5AA /* adler32.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = adler32.pas; path = ../../hedgewars/adler32.pas; sourceTree = SOURCE_ROOT; }; 61E2F7421283752C00E12521 /* fb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fb.png; path = Resources/Icons/fb.png; sourceTree = ""; }; 61E2F7431283752C00E12521 /* tw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tw.png; path = Resources/Icons/tw.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 = ""; }; + 61EBA62811DFF2BC0048B68A /* title.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title.png; path = Resources/Frontend/title.png; sourceTree = ""; }; 61EF920511DF57AC003441C4 /* arrowDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowDown.png; path = Resources/Overlay/arrowDown.png; sourceTree = ""; }; 61EF920611DF57AC003441C4 /* arrowLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowLeft.png; path = Resources/Overlay/arrowLeft.png; sourceTree = ""; }; 61EF920711DF57AC003441C4 /* arrowRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowRight.png; path = Resources/Overlay/arrowRight.png; sourceTree = ""; }; 61EF920811DF57AC003441C4 /* arrowUp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowUp.png; path = Resources/Overlay/arrowUp.png; sourceTree = ""; }; - 61EF920911DF57AC003441C4 /* joyButton_attack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_attack.png; path = Resources/Overlay/joyButton_attack.png; sourceTree = ""; }; - 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_backjump.png; path = Resources/Overlay/joyButton_backjump.png; sourceTree = ""; }; - 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_forwardjump.png; path = Resources/Overlay/joyButton_forwardjump.png; sourceTree = ""; }; + 61EF920911DF57AC003441C4 /* joyButtonAttack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButtonAttack.png; path = Resources/Overlay/joyButtonAttack.png; sourceTree = ""; }; + 61EF920A11DF57AC003441C4 /* joyButtonBackJump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButtonBackJump.png; path = Resources/Overlay/joyButtonBackJump.png; sourceTree = ""; }; + 61EF920B11DF57AC003441C4 /* joyButtonForwardJump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButtonForwardJump.png; path = Resources/Overlay/joyButtonForwardJump.png; sourceTree = ""; }; 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = ""; }; 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = ""; }; 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AboutViewController.xib; path = ../Resources/AboutViewController.xib; sourceTree = ""; }; - 61F2E7EB12060E31005734F7 /* checkbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = checkbox.png; path = Resources/checkbox.png; sourceTree = ""; }; + 61F2E7EB12060E31005734F7 /* checkbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = checkbox.png; path = Resources/Icons/checkbox.png; sourceTree = ""; }; 61F7A43111E290650040BA66 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/Icons/Icon-72.png"; sourceTree = ""; }; 61F7A43211E290650040BA66 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "Resources/Icons/Icon-Small-50.png"; sourceTree = ""; }; 61F7A43311E290650040BA66 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "Resources/Icons/Icon-Small.png"; sourceTree = ""; }; @@ -930,12 +946,9 @@ 61F7A43511E290650040BA66 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icons/Icon.png; sourceTree = ""; }; 61F7A43611E290650040BA66 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Resources/Icons/Icon@2x.png"; sourceTree = ""; }; 61F7A43711E290650040BA66 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = Resources/Icons/iTunesArtwork.png; sourceTree = ""; }; - 61F903E511DF58550068B24D /* backgroundCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundCenter.png; path = "Resources/Frontend-iPhone/backgroundCenter.png"; sourceTree = ""; }; - 61F903E911DF58550068B24D /* borderBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = borderBottom.png; path = "Resources/Frontend-iPhone/borderBottom.png"; sourceTree = ""; }; - 61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/settingsButton.png; sourceTree = ""; }; - 61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = "Resources/Frontend-iPad/background.png"; sourceTree = ""; }; - 61F9040C11DF59D10068B24D /* localplayButton.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = localplayButton.png; path = "Resources/Frontend-iPad/localplayButton.png"; sourceTree = ""; }; - 61F9040D11DF59D10068B24D /* netplayButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = netplayButton.png; path = "Resources/Frontend-iPad/netplayButton.png"; sourceTree = ""; }; + 61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/Frontend/settingsButton.png; sourceTree = ""; }; + 61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = Resources/Frontend/background.png; sourceTree = ""; }; + 61F9040D11DF59D10068B24D /* netplayButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = netplayButton.png; path = Resources/Frontend/netplayButton.png; sourceTree = ""; }; 61F904D511DF7DA30068B24D /* WeaponCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeaponCellView.h; sourceTree = ""; }; 61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeaponCellView.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -947,8 +960,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 618E27BC12A2C32600C20EF0 /* libSDL_net.a in Frameworks */, 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */, - 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */, 61272334117DF764005B90CF /* libSDL_image.a in Frameworks */, 61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */, 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */, @@ -1015,21 +1028,21 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 6165929C11CA9E2F00D6E256 /* SDL_uikitappdelegate.h */, + 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */, 61DE91561258B76800B80214 /* Custom Buttons */, 32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */, 6165922911CA9BD500D6E256 /* PascalImports.h */, - 6165922411CA9BD500D6E256 /* CGPointUtils.h */, - 6165922311CA9BD500D6E256 /* CGPointUtils.c */, - 6165929C11CA9E2F00D6E256 /* SDL_uikitappdelegate.h */, - 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */, + 61D2059F127CDD1100ABD83E /* ObjcExports.h */, + 61D205A0127CDD1100ABD83E /* ObjcExports.m */, 6165922511CA9BD500D6E256 /* CommodityFunctions.h */, 6165922611CA9BD500D6E256 /* CommodityFunctions.m */, + 61006F93128DE31F00EBA7F7 /* CreationChamber.h */, + 61006F94128DE31F00EBA7F7 /* CreationChamber.m */, + 6165922411CA9BD500D6E256 /* CGPointUtils.h */, + 6165922311CA9BD500D6E256 /* CGPointUtils.c */, 6165922C11CA9BD500D6E256 /* UIImageExtra.h */, 6165922D11CA9BD500D6E256 /* UIImageExtra.m */, - 61D2059F127CDD1100ABD83E /* ObjcExports.h */, - 61D205A0127CDD1100ABD83E /* ObjcExports.m */, - 61006F93128DE31F00EBA7F7 /* CreationChamber.h */, - 61006F94128DE31F00EBA7F7 /* CreationChamber.m */, ); name = "Other Sources"; sourceTree = ""; @@ -1037,7 +1050,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 6147DAD21253DCDE0010357E /* savesButton.png */, 6199E86C12464A8E00DADF8C /* surprise.png */, 611EEBC0122B34A800DF6938 /* helpingame.png */, 611EEC30122B54D700DF6938 /* helpplain.png */, @@ -1046,7 +1058,6 @@ 611EEBC3122B355700DF6938 /* helpright.png */, 61842B3F122B66280096E335 /* helpleft.png */, 6129B9F611EFB04D0017E305 /* denied.png */, - 61F2E7EB12060E31005734F7 /* checkbox.png */, 611EE973122A9C4100DF6938 /* clickSound.wav */, 611EE9D7122AA10A00DF6938 /* backSound.wav */, 611EE9D8122AA10A00DF6938 /* selSound.wav */, @@ -1055,9 +1066,7 @@ 6179936611501D1E00BA94A9 /* Overlay */, 61798A5E114AE08600BA94A9 /* Data */, 6187AEA5120781B900B31A27 /* Settings */, - 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */, 8D1107310486CEB800E47090 /* Info.plist */, - 61F9040811DF58B00068B24D /* settingsButton.png */, ); name = Resources; sourceTree = ""; @@ -1070,8 +1079,8 @@ 611E0E4B11FA92130077A41E /* freetype.xcodeproj */, 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */, 6127232E117DF752005B90CF /* SDL_image.xcodeproj */, - 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */, 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */, + 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */, 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */, 61798934114AB25F00BA94A9 /* AudioToolbox.framework */, 61A117FE1168322700359010 /* CoreGraphics.framework */, @@ -1323,14 +1332,6 @@ name = Products; sourceTree = ""; }; - 617989B4114AB47500BA94A9 /* Products */ = { - isa = PBXGroup; - children = ( - 617989BB114AB47500BA94A9 /* libSDL_net.a */, - ); - name = Products; - sourceTree = ""; - }; 61798A0C114AB65600BA94A9 /* Products */ = { isa = PBXGroup; children = ( @@ -1342,24 +1343,36 @@ 6179936611501D1E00BA94A9 /* Overlay */ = { isa = PBXGroup; children = ( - 611DA1CF124E5C6300008271 /* plus.png */, - 611DA030124E2BC500008271 /* mediumBackground~ipad.png */, 611E0EE511FB20610077A41E /* ammoButton.png */, + 6103D399129B350700911D8D /* ammoButton@2x.png */, 611E0EE611FB20610077A41E /* cornerButton.png */, + 6103D39E129B350700911D8D /* cornerButton@2x.png */, 61EF920511DF57AC003441C4 /* arrowDown.png */, + 6103D39A129B350700911D8D /* arrowDown@2x.png */, 61EF920611DF57AC003441C4 /* arrowLeft.png */, + 6103D39B129B350700911D8D /* arrowLeft@2x.png */, 61EF920711DF57AC003441C4 /* arrowRight.png */, + 6103D39C129B350700911D8D /* arrowRight@2x.png */, 61EF920811DF57AC003441C4 /* arrowUp.png */, - 614AE659127D090A0070BF5F /* smallerBackground@2x-iphone.png */, - 614AE65A127D090A0070BF5F /* smallerBackground~ipad.png */, - 614AE65B127D090A0070BF5F /* smallerBackground~iphone.png */, - 61EF920911DF57AC003441C4 /* joyButton_attack.png */, - 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */, - 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */, + 6103D39D129B350700911D8D /* arrowUp@2x.png */, + 61EF920911DF57AC003441C4 /* joyButtonAttack.png */, + 6103D392129B34E900911D8D /* joyButtonAttack@2x.png */, + 61EF920A11DF57AC003441C4 /* joyButtonBackJump.png */, + 6103D393129B34E900911D8D /* joyButtonBackJump@2x.png */, + 61EF920B11DF57AC003441C4 /* joyButtonForwardJump.png */, + 6103D394129B34E900911D8D /* joyButtonForwardJump@2x.png */, ); name = Overlay; sourceTree = ""; }; + 618E27B712A2C30700C20EF0 /* Products */ = { + isa = PBXGroup; + children = ( + 618E27BB12A2C30700C20EF0 /* libSDL_net.a */, + ); + name = Products; + sourceTree = ""; + }; 619C5AC1124F7DDF00D041AE /* Products */ = { isa = PBXGroup; children = ( @@ -1386,11 +1399,19 @@ 61F7A42811E2905C0040BA66 /* Icons */ = { isa = PBXGroup; children = ( + 611DA1CF124E5C6300008271 /* plus.png */, + 6103D413129B417500911D8D /* plus@2x.png */, + 61F2E7EB12060E31005734F7 /* checkbox.png */, + 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */, 61D3D2A41290E03A003CE7C3 /* irc.png */, + 6103D384129B347700911D8D /* irc@2x.png */, 61E2F7421283752C00E12521 /* fb.png */, + 6103D383129B346A00911D8D /* fb@2x.png */, 61E2F7431283752C00E12521 /* tw.png */, + 6103D385129B348200911D8D /* tw@2x.png */, 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */, 6183D83D11E2BCE200A88903 /* Default.png */, + 6172FEA21298C7F900D73365 /* Default@2x.png */, 61F7A43111E290650040BA66 /* Icon-72.png */, 61F7A43211E290650040BA66 /* Icon-Small-50.png */, 61F7A43311E290650040BA66 /* Icon-Small.png */, @@ -1405,19 +1426,28 @@ 61F903FA11DF58680068B24D /* Frontend */ = { isa = PBXGroup; children = ( - 619C09E911E8B8D600F1DF16 /* title_small.png */, - 61808A6E128C94E1005D0E2F /* backgroundTop.png */, - 61F903E511DF58550068B24D /* backgroundCenter.png */, - 61F903E911DF58550068B24D /* borderBottom.png */, - 615AD96112073B4D00F2FF04 /* startGameButton.png */, + 6147DAD21253DCDE0010357E /* savesButton.png */, + 6172FEC81298CE4800D73365 /* savesButton@2x.png */, + 61F9040811DF58B00068B24D /* settingsButton.png */, + 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */, 615AD9EA1207654E00F2FF04 /* helpButton.png */, 615AD9E8120764CA00F2FF04 /* backButton.png */, - 61808A4A128C901B005D0E2F /* startButton.png */, + 6172FED31298CE6600D73365 /* backButton@2x.png */, + 615AD96112073B4D00F2FF04 /* startGameButton.png */, + 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */, + 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */, + 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */, + 61F9040D11DF59D10068B24D /* netplayButton.png */, 61EBA62811DFF2BC0048B68A /* title.png */, - 61F9040C11DF59D10068B24D /* localplayButton.png */, - 61F9040D11DF59D10068B24D /* netplayButton.png */, + 618899811299516000D55FD6 /* title@2x.png */, + 61889984129995B500D55FD6 /* title~ipad.png */, 61F9040A11DF59370068B24D /* background.png */, - 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */, + 6172FED61298CF9800D73365 /* background@2x~iphone.png */, + 6172FED71298CF9800D73365 /* background~iphone.png */, + 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */, + 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */, + 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */, + 6172FEEE1298D25D00D73365 /* smallerBackground~iphone.png */, ); name = Frontend; sourceTree = ""; @@ -1546,8 +1576,8 @@ ProjectRef = 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */; }, { - ProductGroup = 617989B4114AB47500BA94A9 /* Products */; - ProjectRef = 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */; + ProductGroup = 618E27B712A2C30700C20EF0 /* Products */; + ProjectRef = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */; }, { ProductGroup = 61798A0C114AB65600BA94A9 /* Products */; @@ -2044,13 +2074,6 @@ remoteRef = 61798992114AB3FA00BA94A9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 617989BB114AB47500BA94A9 /* libSDL_net.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDL_net.a; - remoteRef = 617989BA114AB47500BA94A9 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 61798A13114AB65600BA94A9 /* libSDL_ttf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2065,6 +2088,13 @@ remoteRef = 6184608B11DA8BF3000E1314 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 618E27BB12A2C30700C20EF0 /* libSDL_net.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libSDL_net.a; + remoteRef = 618E27BA12A2C30700C20EF0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 619C5ACA124F7DDF00D041AE /* Lua.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; @@ -2094,7 +2124,6 @@ buildActionMask = 2147483647; files = ( 61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */, - 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */, 61799289114AE08700BA94A9 /* Data in Resources */, 61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */, 611E12FF117BBBDA0044B62F /* Entitlements-Development.plist in Resources */, @@ -2105,20 +2134,17 @@ 61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */, 61EF921011DF57AC003441C4 /* arrowRight.png in Resources */, 61EF921111DF57AC003441C4 /* arrowUp.png in Resources */, - 61EF921211DF57AC003441C4 /* joyButton_attack.png in Resources */, - 61EF921311DF57AC003441C4 /* joyButton_backjump.png in Resources */, - 61EF921411DF57AC003441C4 /* joyButton_forwardjump.png in Resources */, + 61EF921211DF57AC003441C4 /* joyButtonAttack.png in Resources */, + 61EF921311DF57AC003441C4 /* joyButtonBackJump.png in Resources */, + 61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */, 61F9040911DF58B00068B24D /* settingsButton.png in Resources */, 61F9040B11DF59370068B24D /* background.png in Resources */, - 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */, 61EBA62A11DFF2BC0048B68A /* title.png in Resources */, - 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */, 61F7A43811E290650040BA66 /* Icon-72.png in Resources */, 61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */, 61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */, 61F7A43C11E290650040BA66 /* Icon.png in Resources */, 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */, - 6183D83E11E2BCE200A88903 /* Default-ipad-Landscape.png in Resources */, 6129B9F711EFB04D0017E305 /* denied.png in Resources */, 611E0EE711FB20610077A41E /* ammoButton.png in Resources */, 611E0EE811FB20610077A41E /* cornerButton.png in Resources */, @@ -2140,27 +2166,27 @@ 61842B40122B66280096E335 /* helpleft.png in Resources */, 6199E86D12464A8E00DADF8C /* surprise.png in Resources */, 611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */, - 611DA031124E2BC500008271 /* mediumBackground~ipad.png in Resources */, 611DA1D0124E5C6300008271 /* plus.png in Resources */, 6147DAD31253DCDE0010357E /* savesButton.png in Resources */, 610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */, 610D5FB31270E26C0033333A /* Icon@2x.png in Resources */, - 61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */, 61A670C012747D9B00B06CE7 /* Default.png in Resources */, 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */, 61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */, - 61A670FB12747E0D00B06CE7 /* title_small.png in Resources */, - 61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */, - 614AE65D127D090A0070BF5F /* smallerBackground~ipad.png in Resources */, - 614AE65E127D090A0070BF5F /* smallerBackground~iphone.png in Resources */, 61E2F7441283752C00E12521 /* fb.png in Resources */, 61E2F7451283752C00E12521 /* tw.png in Resources */, 61DF0EDC1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib in Resources */, 61DF0F211284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib in Resources */, - 61808A4B128C901B005D0E2F /* startButton.png in Resources */, 61808A5D128C930A005D0E2F /* backSound.wav in Resources */, - 61808A6F128C94E1005D0E2F /* backgroundTop.png in Resources */, 61D3D2A51290E03A003CE7C3 /* irc.png in Resources */, + 6172FED91298CF9800D73365 /* background~iphone.png in Resources */, + 6172FEEF1298D25D00D73365 /* mediumBackground~ipad.png in Resources */, + 6172FEF11298D25D00D73365 /* smallerBackground~ipad.png in Resources */, + 6172FEF21298D25D00D73365 /* smallerBackground~iphone.png in Resources */, + 61889985129995B500D55FD6 /* title~ipad.png in Resources */, + 6103D414129B417500911D8D /* plus@2x.png in Resources */, + 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */, + 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2362,8 +2388,8 @@ buildSettings = { APPLY_RULES_IN_COPY_FILES = YES; ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Vittorio Giovara"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Vittorio Giovara"; + CODE_SIGN_IDENTITY = "Don't Code Sign"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix"; FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1; FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas"; @@ -2389,14 +2415,15 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 3.1; ONLY_ACTIVE_ARCH = NO; + OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( "-lz", "-Wl,-no_order_inits", ); PREBINDING = NO; - PROVISIONING_PROFILE = "450C4020-346A-4F44-8DDE-E71300796C94"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "450C4020-346A-4F44-8DDE-E71300796C94"; - SDKROOT = iphoneos4.1; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv6"; @@ -2490,7 +2517,7 @@ PREBINDING = NO; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv6"; @@ -2583,7 +2610,7 @@ "-Wl,-no_order_inits", ); PREBINDING = NO; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; @@ -2699,7 +2726,7 @@ GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_STRICT_ALIASING = YES; GCC_THUMB_SUPPORT = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -2716,7 +2743,7 @@ "-Wl,-no_order_inits", ); PREBINDING = NO; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; @@ -2762,7 +2789,7 @@ PREBINDING = NO; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = NO; VALID_ARCHS = "armv7 armv6"; diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/backButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/backButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/background.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/background.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/backgroundAndTitle.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/backgroundAndTitle.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/helpButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/helpButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/localplayButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/localplayButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/netplayButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/netplayButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/startGameButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/startGameButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPad/title.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/title.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundCenter.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundCenter.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundTop.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundTop.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderBottom.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderBottom.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPhone/startButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/startButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend-iPhone/title_small.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/title_small.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/backButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend/backButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/backButton@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/backButton@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/background.png Binary file project_files/HedgewarsMobile/Resources/Frontend/background.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/background@2x~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/background@2x~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/background~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/background~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/helpButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend/helpButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/localplayButton@2x~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton@2x~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/localplayButton~ipad.png Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton~ipad.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/localplayButton~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/mediumBackground~ipad.png Binary file project_files/HedgewarsMobile/Resources/Frontend/mediumBackground~ipad.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/netplayButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend/netplayButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/savesButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend/savesButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/savesButton@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/savesButton@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/settingsButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend/settingsButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/settingsButton@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/settingsButton@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/smallerBackground@2x~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/smallerBackground@2x~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/smallerBackground~ipad.png Binary file project_files/HedgewarsMobile/Resources/Frontend/smallerBackground~ipad.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/smallerBackground~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/smallerBackground~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/startGameButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend/startGameButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/title.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/title@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Frontend/title~ipad.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title~ipad.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Tue Nov 30 22:46:47 2010 +0100 @@ -1,18 +1,18 @@ - 1024 - 10F569 - 804 - 1038.29 + 1056 + 10H574 + 823 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 123 + 132 YES - + YES @@ -161,7 +161,7 @@ 7 NO IBCocoaTouchFramework - Pinch to return + Touch interface @@ -369,8 +369,37 @@ 0 2 + + + 292 + {{203, 34}, {60, 37}} + + NO + IBCocoaTouchFramework + 0 + 0 + + Helvetica-Bold + 15 + 16 + + 1 + Back + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + - {480, 320} + {489, 332} YES YES @@ -410,6 +439,15 @@ 115 + + + dismiss + + + 7 + + 117 + @@ -462,6 +500,7 @@ + @@ -550,6 +589,11 @@ + + 116 + + + @@ -588,6 +632,8 @@ 113.IBViewBoundsToFrameTransform 114.IBPluginDependency 114.IBViewBoundsToFrameTransform + 116.IBPluginDependency + 116.IBViewBoundsToFrameTransform 2.IBEditorWindowLastContentRect 2.IBPluginDependency 2.IBViewBoundsToFrameTransform @@ -663,16 +709,18 @@ P4AAAL+AAABDZwAAw7aAAA - {{606, 570}, {480, 320}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABDSwAAwooAAA + + {{165, 514}, {480, 320}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin P4AAAL+AAAAAAAAAw4kAAA {{589, 578}, {480, 320}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw58AAA - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin P4AAAL+AAABDeQAAw6aAAA @@ -699,7 +747,7 @@ - 115 + 117 @@ -843,6 +891,22 @@ + UIButton + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UIButton.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + UILabel UIView @@ -883,6 +947,13 @@ UIView IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource UIKit.framework/Headers/UITextField.h @@ -936,7 +1007,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -945,6 +1016,6 @@ YES ../Hedgewars.xcodeproj 3 - 123 + 132 diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/Default.png Binary file project_files/HedgewarsMobile/Resources/Icons/Default.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/Default@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/Default@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/checkbox.png Binary file project_files/HedgewarsMobile/Resources/Icons/checkbox.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/checkbox@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/checkbox@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/fb.png Binary file project_files/HedgewarsMobile/Resources/Icons/fb.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/fb@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/fb@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/irc.png Binary file project_files/HedgewarsMobile/Resources/Icons/irc.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/irc@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/irc@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/plus.png Binary file project_files/HedgewarsMobile/Resources/Icons/plus.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/plus@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/plus@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/tw.png Binary file project_files/HedgewarsMobile/Resources/Icons/tw.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Icons/tw@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/tw@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Tue Nov 30 22:46:47 2010 +0100 @@ -1,14 +1,14 @@ - 1024 - 10F569 - 788 - 1038.29 + 1056 + 10H574 + 823 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 117 + 132 YES @@ -51,7 +51,7 @@ IBIPadFramework NSImage - backgroundAndTitle.png + background.png @@ -72,7 +72,6 @@ 0.0 0.0 0.0 - Single Game 3 MQA @@ -85,15 +84,15 @@ 3 MC41AA - + NSImage - localplayButton.png + localplayButton~ipad.png 292 - {{788, 300}, {18, 19}} + {{795, 317}, {18, 19}} NO 0.31690141558647156 @@ -114,7 +113,7 @@ 292 - {{932, 686}, {72, 62}} + {{940, 686}, {64, 64}} NO 2 @@ -136,7 +135,7 @@ 292 - {{20, 686}, {72, 62}} + {{20, 686}, {64, 64}} NO 4 @@ -155,6 +154,18 @@ savesButton.png + + + 292 + {{242, 43}, {540, 300}} + + NO + IBIPadFramework + + NSImage + title~ipad.png + + {1024, 768} @@ -231,10 +242,11 @@ YES + + - - + @@ -275,6 +287,11 @@ + + 90 + + + @@ -288,8 +305,13 @@ 37.IBPluginDependency 39.IBPluginDependency 45.IBPluginDependency + 45.IBViewBoundsToFrameTransform 52.IBPluginDependency + 52.IBViewBoundsToFrameTransform 88.IBPluginDependency + 88.IBViewBoundsToFrameTransform + 90.IBPluginDependency + 90.IBViewBoundsToFrameTransform YES @@ -300,8 +322,21 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABERQAAw56AAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABEaQAAxDsAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABBoAAAxDsAAA + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABDbQAAw6qAAA + @@ -320,7 +355,7 @@ - 89 + 90 @@ -501,6 +536,13 @@ UIView IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource UIKit.framework/Headers/UITextField.h @@ -554,7 +596,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -567,19 +609,21 @@ YES YES - backgroundAndTitle.png - localplayButton.png + background.png + localplayButton~ipad.png savesButton.png settingsButton.png + title~ipad.png YES {1024, 768} {263, 244} - {61, 59} - {61, 59} + {64, 64} + {64, 64} + {540, 300} - 117 + 132 diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Tue Nov 30 22:46:47 2010 +0100 @@ -1,18 +1,18 @@ - 1024 + 1056 10H574 - 804 + 823 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 123 + 132 YES - + YES @@ -45,7 +45,7 @@ 274 - {480, 300} + {480, 320} 3 @@ -56,25 +56,13 @@ IBCocoaTouchFramework NSImage - backgroundTop.png - - - - - 292 - {{0, 300}, {480, 20}} - - NO - IBCocoaTouchFramework - - NSImage - borderBottom.png + background~iphone.png 293 - {{109, 35}, {262, 84}} + {{105, 20}, {270, 150}} NO NO @@ -83,13 +71,13 @@ IBCocoaTouchFramework NSImage - title_small.png + title.png 289 - {{208, 169}, {64, 64}} + {{190, 200}, {100, 100}} 1 @@ -119,13 +107,13 @@ NSImage - startButton.png + localplayButton~iphone.png 269 - {{355, 208}, {59, 52}} + {{396, 236}, {64, 64}} NO NO @@ -148,7 +136,7 @@ 269 - {{66, 208}, {59, 52}} + {{20, 236}, {64, 64}} NO NO @@ -265,12 +253,11 @@ YES - + - + - @@ -296,11 +283,6 @@ - 45 - - - - 41 @@ -342,7 +324,6 @@ 41.IBViewBoundsToFrameTransform 43.IBPluginDependency 43.IBViewBoundsToFrameTransform - 45.IBPluginDependency YES @@ -356,15 +337,15 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABC2gAAww8AAA + P4AAAL+AAABCygAAwzcAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABDTAAAw20AAA + P4AAAL+AAABDPgAAw5UAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABDsYAAw4QAAA + P4AAAL+AAABDxgAAw5iAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -372,9 +353,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABCjAAAw4QAAA + P4AAAL+AAABBoAAAw5iAAA - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -574,6 +554,13 @@ UIView IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource UIKit.framework/Headers/UITextField.h @@ -627,7 +614,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -640,23 +627,21 @@ YES YES - backgroundTop.png - borderBottom.png + background~iphone.png + localplayButton~iphone.png savesButton.png settingsButton.png - startButton.png - title_small.png + title.png YES - {480, 300} - {480, 20} - {61, 59} - {61, 59} + {480, 320} + {100, 100} {64, 64} - {262, 84} + {64, 64} + {270, 150} - 123 + 132 diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Tue Nov 30 22:46:47 2010 +0100 @@ -1,18 +1,18 @@ - 1024 - 10F569 - 788 - 1038.29 + 1056 + 10H574 + 823 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 117 + 132 YES - + YES @@ -123,6 +123,7 @@ {{736, 26}, {256, 128}} NO + YES IBIPadFramework 0 0 @@ -950,6 +951,13 @@ UIView IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource UIKit.framework/Headers/UITextField.h @@ -1003,7 +1011,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1028,9 +1036,9 @@ {1024, 768} {64, 64} {142, 64} - {273, 151} + {270, 150} - 117 + 132 diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Tue Nov 30 22:46:47 2010 +0100 @@ -1,14 +1,14 @@ - 1024 + 1056 10H574 - 804 + 823 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 123 + 132 YES @@ -51,7 +51,7 @@ IBCocoaTouchFramework NSImage - backgroundCenter.png + background~iphone.png @@ -166,7 +166,7 @@ 292 - {{88, 209}, {169, 29}} + {{88, 210}, {169, 29}} NO YES @@ -175,8 +175,8 @@ IBCocoaTouchFramework Label - Helvetica - 24 + Helvetica-Oblique + 22 16 @@ -825,6 +825,13 @@ UIView IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource UIKit.framework/Headers/UITextField.h @@ -878,7 +885,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -888,9 +895,9 @@ ../Hedgewars.xcodeproj 3 - backgroundCenter.png - {480, 276} + background~iphone.png + {480, 320} - 123 + 132 diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/ammoButton.png Binary file project_files/HedgewarsMobile/Resources/Overlay/ammoButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/ammoButton@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/ammoButton@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowDown.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowDown.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowDown@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowDown@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowLeft.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowLeft.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowLeft@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowLeft@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowRight.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowRight.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowRight@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowRight@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowUp.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowUp.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/arrowUp@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowUp@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/cornerButton.png Binary file project_files/HedgewarsMobile/Resources/Overlay/cornerButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/cornerButton@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/cornerButton@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButtonAttack.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButtonAttack.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButtonAttack@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButtonAttack@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButtonBackJump.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButtonBackJump.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButtonBackJump@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButtonBackJump@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButtonForwardJump.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButtonForwardJump.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButtonForwardJump@2x.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButtonForwardJump@2x.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButton_attack.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButton_attack.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButton_backjump.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButton_backjump.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/joyButton_forwardjump.png Binary file project_files/HedgewarsMobile/Resources/Overlay/joyButton_forwardjump.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/mediumBackground~ipad.png Binary file project_files/HedgewarsMobile/Resources/Overlay/mediumBackground~ipad.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/plus.png Binary file project_files/HedgewarsMobile/Resources/Overlay/plus.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/smallerBackground@2x-iphone.png Binary file project_files/HedgewarsMobile/Resources/Overlay/smallerBackground@2x-iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/smallerBackground~ipad.png Binary file project_files/HedgewarsMobile/Resources/Overlay/smallerBackground~ipad.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/Overlay/smallerBackground~iphone.png Binary file project_files/HedgewarsMobile/Resources/Overlay/smallerBackground~iphone.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/OverlayViewController.xib --- a/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Tue Nov 30 22:46:47 2010 +0100 @@ -1,14 +1,14 @@ - 1024 - 10F569 - 804 - 1038.29 + 1056 + 10H574 + 823 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 123 + 132 YES @@ -154,7 +154,7 @@ NSImage - joyButton_backjump.png + joyButtonBackJump.png @@ -178,7 +178,7 @@ NSImage - joyButton_forwardjump.png + joyButtonForwardJump.png @@ -202,7 +202,7 @@ NSImage - joyButton_attack.png + joyButtonAttack.png @@ -961,6 +961,13 @@ UIView IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource UIKit.framework/Headers/UITextField.h @@ -1014,7 +1021,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1033,9 +1040,9 @@ arrowRight.png arrowUp.png cornerButton.png - joyButton_attack.png - joyButton_backjump.png - joyButton_forwardjump.png + joyButtonAttack.png + joyButtonBackJump.png + joyButtonForwardJump.png YES @@ -1050,6 +1057,6 @@ {64, 64} - 123 + 132 diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/checkbox.png Binary file project_files/HedgewarsMobile/Resources/checkbox.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/savesButton.png Binary file project_files/HedgewarsMobile/Resources/savesButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/Resources/settingsButton.png Binary file project_files/HedgewarsMobile/Resources/settingsButton.png has changed diff -r 996ef18fa396 -r 94c948a92759 project_files/HedgewarsMobile/SDL.patch --- a/project_files/HedgewarsMobile/SDL.patch Mon Nov 29 23:10:38 2010 -0500 +++ b/project_files/HedgewarsMobile/SDL.patch Tue Nov 30 22:46:47 2010 +0100 @@ -1,7 +1,22 @@ -diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj ---- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 10 15:45:58 2010 -0700 -+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Oct 16 18:35:03 2010 +0200 -@@ -1549,15 +1549,19 @@ +diff -r 834ce48a19c2 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj +--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun May 09 12:58:58 2010 +0800 ++++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Nov 28 18:14:58 2010 +0100 +@@ -1262,7 +1262,14 @@ + isa = PBXProject; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */; + compatibilityVersion = "Xcode 3.1"; ++ developmentRegion = English; + hasScannedForEncodings = 1; ++ knownRegions = ( ++ English, ++ Japanese, ++ French, ++ German, ++ ); + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + projectDirPath = ""; + projectRoot = ../..; +@@ -1549,15 +1556,19 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -18,11 +33,11 @@ ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - SDKROOT = iphoneos3.2; -+ SDKROOT = iphoneos4.0; ++ SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; -@@ -1566,14 +1570,19 @@ +@@ -1566,14 +1577,19 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -40,13 +55,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.1; PREBINDING = NO; - SDKROOT = iphoneos3.2; -+ SDKROOT = iphoneos4.0; ++ SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; -diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/testsdl-Info.plist ---- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 10 15:45:58 2010 -0700 -+++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 Xcode-iPhoneOS/SDL/testsdl-Info.plist +--- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun May 09 12:58:58 2010 +0800 ++++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Nov 28 18:14:58 2010 +0100 @@ -16,7 +16,5 @@ ???? CFBundleVersion @@ -55,9 +70,9 @@ - MainWindow -diff -r c0021a587dc7 include/SDL_config_iphoneos.h ---- a/include/SDL_config_iphoneos.h Sun Oct 10 15:45:58 2010 -0700 -+++ b/include/SDL_config_iphoneos.h Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 include/SDL_config_iphoneos.h +--- a/include/SDL_config_iphoneos.h Sun May 09 12:58:58 2010 +0800 ++++ b/include/SDL_config_iphoneos.h Sun Nov 28 18:14:58 2010 +0100 @@ -98,6 +98,8 @@ #define HAVE_COS 1 #define HAVE_COSF 1 @@ -93,9 +108,9 @@ +#define SDL_VIEW_TAG 456987 + #endif /* _SDL_config_iphoneos_h */ -diff -r c0021a587dc7 src/SDL_fatal.c ---- a/src/SDL_fatal.c Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/SDL_fatal.c Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 src/SDL_fatal.c +--- a/src/SDL_fatal.c Sun May 09 12:58:58 2010 +0800 ++++ b/src/SDL_fatal.c Sun Nov 28 18:14:58 2010 +0100 @@ -38,9 +38,9 @@ static void SDL_Parachute(int sig) @@ -108,9 +123,9 @@ } static const int SDL_fatal_signals[] = { -diff -r c0021a587dc7 src/video/SDL_renderer_gles.c ---- a/src/video/SDL_renderer_gles.c Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/video/SDL_renderer_gles.c Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 src/video/SDL_renderer_gles.c +--- a/src/video/SDL_renderer_gles.c Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/SDL_renderer_gles.c Sun Nov 28 18:14:58 2010 +0100 @@ -324,6 +324,9 @@ data->glDisable(GL_CULL_FACE); data->updateSize = SDL_TRUE; @@ -192,10 +207,10 @@ } data->glDisable(GL_TEXTURE_2D); -diff -r c0021a587dc7 src/video/SDL_video.c ---- a/src/video/SDL_video.c Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/video/SDL_video.c Sat Oct 16 18:35:03 2010 +0200 -@@ -1416,9 +1416,9 @@ +diff -r 834ce48a19c2 src/video/SDL_video.c +--- a/src/video/SDL_video.c Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/SDL_video.c Sun Nov 28 18:14:58 2010 +0100 +@@ -1421,9 +1421,9 @@ SDL_MinimizeWindow(window); } @@ -207,9 +222,9 @@ if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) && _this->SetWindowGrab) { _this->SetWindowGrab(_this, window); -diff -r c0021a587dc7 src/video/uikit/SDL_uikitopengles.m ---- a/src/video/uikit/SDL_uikitopengles.m Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/video/uikit/SDL_uikitopengles.m Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 src/video/uikit/SDL_uikitopengles.m +--- a/src/video/uikit/SDL_uikitopengles.m Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/uikit/SDL_uikitopengles.m Sun Nov 28 18:14:58 2010 +0100 @@ -114,8 +114,8 @@ bBits: _this->gl_config.blue_size \ aBits: _this->gl_config.alpha_size \ @@ -221,9 +236,27 @@ /* add the view to our window */ [uiwindow addSubview: view ]; -diff -r c0021a587dc7 src/video/uikit/SDL_uikitview.m ---- a/src/video/uikit/SDL_uikitview.m Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/video/uikit/SDL_uikitview.m Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 src/video/uikit/SDL_uikitview.h +--- a/src/video/uikit/SDL_uikitview.h Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/uikit/SDL_uikitview.h Sun Nov 28 18:14:58 2010 +0100 +@@ -23,11 +23,11 @@ + #include "SDL_stdinc.h" + #include "SDL_events.h" + +-#define IPHONE_TOUCH_EFFICIENT_DANGEROUS +-#define FIXED_MULTITOUCH ++#undef IPHONE_TOUCH_EFFICIENT_DANGEROUS ++#undef FIXED_MULTITOUCH + + #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS +-#define MAX_SIMULTANEOUS_TOUCHES 5 ++#define MAX_SIMULTANEOUS_TOUCHES 0 + #endif + + /* *INDENT-OFF* */ +diff -r 834ce48a19c2 src/video/uikit/SDL_uikitview.m +--- a/src/video/uikit/SDL_uikitview.m Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/uikit/SDL_uikitview.m Sun Nov 28 18:14:58 2010 +0100 @@ -35,9 +35,6 @@ @implementation SDL_uikitview @@ -335,24 +368,24 @@ if (NULL == view) { SDL_SetError("Window has no view"); -diff -r c0021a587dc7 src/video/uikit/SDL_uikitwindow.m ---- a/src/video/uikit/SDL_uikitwindow.m Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/video/uikit/SDL_uikitwindow.m Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 src/video/uikit/SDL_uikitwindow.m +--- a/src/video/uikit/SDL_uikitwindow.m Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/uikit/SDL_uikitwindow.m Sun Nov 28 18:14:58 2010 +0100 @@ -144,7 +144,10 @@ if (SDL_UIKit_supports_multiple_displays) { [uiwindow setScreen:uiscreen]; } - + -+ if ([[UIScreen screens] count] > 1) ++ if ([UIScreen respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1) + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; + if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { [uiwindow release]; return -1; -diff -r c0021a587dc7 src/video/uikit/keyinfotable.h ---- a/src/video/uikit/keyinfotable.h Sun Oct 10 15:45:58 2010 -0700 -+++ b/src/video/uikit/keyinfotable.h Sat Oct 16 18:35:03 2010 +0200 +diff -r 834ce48a19c2 src/video/uikit/keyinfotable.h +--- a/src/video/uikit/keyinfotable.h Sun May 09 12:58:58 2010 +0800 ++++ b/src/video/uikit/keyinfotable.h Sun Nov 28 18:14:58 2010 +0100 @@ -54,7 +54,7 @@ /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, diff -r 996ef18fa396 -r 94c948a92759 share/CMakeLists.txt --- a/share/CMakeLists.txt Mon Nov 29 23:10:38 2010 -0500 +++ b/share/CMakeLists.txt Tue Nov 30 22:46:47 2010 +0100 @@ -1,6 +1,19 @@ add_subdirectory(hedgewars) IF(APPLE) + #needed for CFBundleVersion and CFBundleShortVersionString + FIND_PROGRAM(HGCOMMAND hg) + IF (HGCOMMAND AND (EXISTS ${hedgewars_SOURCE_DIR}/.hg)) + exec_program(${HGCOMMAND} + ARGS identify -n ${hedgewars_SOURCE_DIR} + OUTPUT_VARIABLE version_suffix + ) + STRING(REGEX REPLACE "([0-9]+)(.*)" "\\1" version_suffix ${version_suffix}) + set (HEDGEWARS_REVISION ${version_suffix}) + ELSE () + set (HEDGEWARS_REVISION ${HEDGEWARS_VERSION}) + ENDIF () + configure_file(${hedgewars_SOURCE_DIR}/share/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist) install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" diff -r 996ef18fa396 -r 94c948a92759 share/Info.plist.in --- a/share/Info.plist.in Mon Nov 29 23:10:38 2010 -0500 +++ b/share/Info.plist.in Tue Nov 30 22:46:47 2010 +0100 @@ -17,31 +17,35 @@ CFBundleSignature Hedge CFBundleVersion + ${HEDGEWARS_REVISION} + CFBundleShortVersionString ${HEDGEWARS_VERSION} NSHumanReadableCopyright - GPL + © 2004-2010 Hedgewars Project NSAppleScriptEnabled LSRequiresNativeExecution - + LSMinimumSystemVersionByArchitecture - x86_64 - 10.6.0 - i386 - 10.4.0 - ppc - 10.4.0 + x86_64 + 10.6.0 + i386 + 10.4.0 + ppc + 10.4.0 LSArchitecturePriority - x86_64 - i386 - ppc + x86_64 + i386 + ppc LSMinimumSystemVersion ${minimum_macosx} SUPublicDSAKeyFile dsa_pub.pem + LSApplicationCategoryType + public.app-category.strategy-games