# HG changeset patch
# User koda
# Date 1278379981 -7200
# Node ID 9f1d79e01a60541cd1be0951b3218e37e1c3dd59
# Parent 304c6d32383a54f5c0aa3470d1fdef98e691788c
icons \o/
fixed orientation and launch image issues
prevent a crash when loading lobby multiple times
diff -r 304c6d32383a -r 9f1d79e01a60 hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas Mon Jul 05 22:42:43 2010 +0200
+++ b/hedgewars/hwengine.pas Tue Jul 06 03:33:01 2010 +0200
@@ -217,7 +217,7 @@
{$IFDEF DEBUGFILE}
cShowFPS:= true;
{$ELSE}
- cShowFPS:= false;
+ cShowFPS:= true; // update me at release time
{$ENDIF}
cInitVolume:= 100;
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Classes/GameConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Tue Jul 06 03:33:01 2010 +0200
@@ -14,13 +14,13 @@
#import "SchemeWeaponConfigViewController.h"
// draw background image in uitoolbar
-@implementation UIToolbar (CustomImage)
+/*@implementation UIToolbar (CustomImage)
-(void) drawRect:(CGRect)rect {
UIImage *image = [UIImage imageWithContentsOfFile:@"toolbarBackground.png"];
[image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
}
@end
-
+*/
@implementation GameConfigViewController
@@ -33,7 +33,18 @@
UIButton *theButton = (UIButton *)sender;
switch (theButton.tag) {
case 0:
- [[self parentViewController] dismissModalViewControllerAnimated:YES];
+ if ([mapConfigViewController busy]) {
+ UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Wait for the Preview",@"")
+ message:NSLocalizedString(@"Before returning the preview needs to be generated",@"")
+ delegate:nil
+ cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
+ otherButtonTitles:nil];
+ [alert show];
+ [alert release];
+ } else {
+ [[self parentViewController] dismissModalViewControllerAnimated:YES];
+
+ }
break;
case 1:
theButton.enabled = NO;
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Classes/MapConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Tue Jul 06 03:33:01 2010 +0200
@@ -284,7 +284,7 @@
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- cell.textLabel.textColor = [UIColor yellowColor]; //TODO: find proper color
+ cell.textLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ];
}
if (self.segmentedControl.selectedSegmentIndex != 1) {
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Classes/OverlayViewController.m
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Tue Jul 06 03:33:01 2010 +0200
@@ -149,8 +149,8 @@
}
-(void) viewDidUnload {
+ [popoverController dismissPopoverAnimated:NO];
[dimTimer invalidate];
- [popoverController dismissPopoverAnimated:NO];
self.writeChatTextField = nil;
self.popoverController = nil;
self.popupMenu = nil;
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m
--- a/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Tue Jul 06 03:33:01 2010 +0200
@@ -122,8 +122,7 @@
// override the direct execution of SDL_main to allow us to implement the frontend (or even using a nib)
-(void) applicationDidFinishLaunching:(UIApplication *)application {
- [application setStatusBarHidden:YES];
- [application setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
+ [application setStatusBarHidden:YES];
UIWindow *uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
uiwindow.backgroundColor = [UIColor blackColor];
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Tue Jul 06 03:33:01 2010 +0200
@@ -124,14 +124,20 @@
SquareButtonView *squareButton = (SquareButtonView *)[cell viewWithTag:SQUAREBUTTON_TAG];
[squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]];
squareButton.ownerDictionary = selectedRow;
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ cellLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ];
+ }
} else {
cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
if (cell == nil)
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
cell.textLabel.text = [[[listOfTeams objectAtIndex:[indexPath row]] objectForKey:@"team"] stringByDeletingPathExtension];
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ cell.textLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ];
+ }
}
-
+
return cell;
}
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Jul 06 03:33:01 2010 +0200
@@ -30,7 +30,6 @@
61272334117DF764005B90CF /* libSDL_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272333117DF752005B90CF /* libSDL_image.a */; };
61272339117DF778005B90CF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272338117DF778005B90CF /* MobileCoreServices.framework */; };
61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */; };
- 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6151347D116C2803001F16D1 /* Icon-iPad.png */; };
61536CCF11CE836E00D87A7E /* libfreetype_x86.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798917114AAF2100BA94A9 /* libfreetype_x86.a */; };
61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */; };
6163EE7E11CC2600001C0453 /* SingleWeaponViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */; };
@@ -77,7 +76,6 @@
6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */; };
6165925611CA9CB400D6E256 /* MapConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */; };
6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165925011CA9CB400D6E256 /* OverlayViewController.xib */; };
- 6165928011CA9D3200D6E256 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6165927C11CA9D3200D6E256 /* Icon.png */; };
6165929E11CA9E2F00D6E256 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */; };
61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; };
61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; };
@@ -119,6 +117,8 @@
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 */; };
+ 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */; };
+ 6183D83F11E2BCE200A88903 /* LI-iphone-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* LI-iphone-Landscape.png */; };
61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; };
61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; };
61C3255B1179A384001E70B1 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C3255A1179A384001E70B1 /* OpenAL.framework */; };
@@ -136,11 +136,15 @@
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 */; };
61EF921611DF57AC003441C4 /* menuCorner.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920D11DF57AC003441C4 /* menuCorner.png */; };
- 61F7A2FA11E270E70040BA66 /* Default-LandscapeLeft-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2F811E270E70040BA66 /* Default-LandscapeLeft-iphone.png */; };
- 61F7A2FB11E270E70040BA66 /* Default-LandscapeRight-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2F911E270E70040BA66 /* Default-LandscapeRight-iphone.png */; };
- 61F7A2FE11E270F00040BA66 /* Default-LandscapeLeft-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2FC11E270F00040BA66 /* Default-LandscapeLeft-ipad.png */; };
- 61F7A2FF11E270F00040BA66 /* Default-LandscapeRight-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2FD11E270F00040BA66 /* Default-LandscapeRight-ipad.png */; };
61F7A30211E272280040BA66 /* lateralButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A30111E272280040BA66 /* lateralButton.png */; };
+ 61F7A35511E27D3C0040BA66 /* background-lobby.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A35411E27D3C0040BA66 /* background-lobby.png */; };
+ 61F7A43811E290650040BA66 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43111E290650040BA66 /* Icon-72.png */; };
+ 61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43211E290650040BA66 /* Icon-Small-50.png */; };
+ 61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43311E290650040BA66 /* Icon-Small.png */; };
+ 61F7A43B11E290650040BA66 /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43411E290650040BA66 /* Icon-Small@2x.png */; };
+ 61F7A43C11E290650040BA66 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43511E290650040BA66 /* Icon.png */; };
+ 61F7A43D11E290650040BA66 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43611E290650040BA66 /* Icon@2x.png */; };
+ 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43711E290650040BA66 /* iTunesArtwork.png */; };
61F903EF11DF58550068B24D /* backgroundBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E411DF58550068B24D /* backgroundBottom.png */; };
61F903F011DF58550068B24D /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; };
61F903F111DF58550068B24D /* backgroundLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E611DF58550068B24D /* backgroundLeft.png */; };
@@ -247,7 +251,6 @@
61272338117DF778005B90CF /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
61370652117B1D50004EE44A /* Entitlements-Distribution.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Distribution.plist"; sourceTree = "<group>"; };
614E333D11DE9A93009DBA4E /* VGSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = VGSHandlers.inc; path = ../../hedgewars/VGSHandlers.inc; sourceTree = SOURCE_ROOT; };
- 6151347D116C2803001F16D1 /* Icon-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-iPad.png"; path = "Resources/Icon-iPad.png"; sourceTree = "<group>"; };
6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = "<group>"; };
6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleWeaponViewController.m; sourceTree = "<group>"; };
616591DE11CA9BA200D6E256 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailViewController.h; sourceTree = "<group>"; };
@@ -323,7 +326,6 @@
6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MapConfigViewController-iPad.xib"; path = "Resources/MapConfigViewController-iPad.xib"; sourceTree = SOURCE_ROOT; };
6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MapConfigViewController-iPhone.xib"; path = "Resources/MapConfigViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; };
6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = Resources/OverlayViewController.xib; sourceTree = SOURCE_ROOT; };
- 6165927C11CA9D3200D6E256 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icon.png; sourceTree = "<group>"; };
6165929C11CA9E2F00D6E256 /* SDL_uikitappdelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_uikitappdelegate.h; path = Classes/SDL_uikitappdelegate.h; sourceTree = "<group>"; };
6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_uikitappdelegate.m; path = Classes/SDL_uikitappdelegate.m; sourceTree = "<group>"; };
617987E1114AA34C00BA94A9 /* CCHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = CCHandlers.inc; path = ../../hedgewars/CCHandlers.inc; sourceTree = SOURCE_ROOT; };
@@ -373,6 +375,8 @@
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 = "<group>"; };
+ 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LI-ipad-Landscape.png"; path = "Resources/Icons/LI-ipad-Landscape.png"; sourceTree = "<group>"; };
+ 6183D83D11E2BCE200A88903 /* LI-iphone-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LI-iphone-Landscape.png"; path = "Resources/Icons/LI-iphone-Landscape.png"; sourceTree = "<group>"; };
618736B8118CA28600123B23 /* GearDrawing.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GearDrawing.inc; path = ../../hedgewars/GearDrawing.inc; sourceTree = SOURCE_ROOT; };
61A117FE1168322700359010 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
61C3251D1179A300001E70B1 /* libopenalbridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenalbridge.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -389,11 +393,15 @@
61EF920A11DF57AC003441C4 /* joyButton_backjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_backjump.png; path = Resources/Overlay/joyButton_backjump.png; sourceTree = "<group>"; };
61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_forwardjump.png; path = Resources/Overlay/joyButton_forwardjump.png; sourceTree = "<group>"; };
61EF920D11DF57AC003441C4 /* menuCorner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menuCorner.png; path = Resources/Overlay/menuCorner.png; sourceTree = "<group>"; };
- 61F7A2F811E270E70040BA66 /* Default-LandscapeLeft-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeLeft-iphone.png"; path = "Resources/Default-LandscapeLeft-iphone.png"; sourceTree = "<group>"; };
- 61F7A2F911E270E70040BA66 /* Default-LandscapeRight-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeRight-iphone.png"; path = "Resources/Default-LandscapeRight-iphone.png"; sourceTree = "<group>"; };
- 61F7A2FC11E270F00040BA66 /* Default-LandscapeLeft-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeLeft-ipad.png"; path = "Resources/Default-LandscapeLeft-ipad.png"; sourceTree = "<group>"; };
- 61F7A2FD11E270F00040BA66 /* Default-LandscapeRight-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeRight-ipad.png"; path = "Resources/Default-LandscapeRight-ipad.png"; sourceTree = "<group>"; };
- 61F7A30111E272280040BA66 /* lateralButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lateralButton.png; path = Resources/lateralButton.png; sourceTree = "<group>"; };
+ 61F7A30111E272280040BA66 /* lateralButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lateralButton.png; path = Resources/Overlay/lateralButton.png; sourceTree = "<group>"; };
+ 61F7A35411E27D3C0040BA66 /* background-lobby.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background-lobby.png"; path = "Resources/Frontend-iPad/background-lobby.png"; sourceTree = "<group>"; };
+ 61F7A43111E290650040BA66 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/Icons/Icon-72.png"; sourceTree = "<group>"; };
+ 61F7A43211E290650040BA66 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "Resources/Icons/Icon-Small-50.png"; sourceTree = "<group>"; };
+ 61F7A43311E290650040BA66 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "Resources/Icons/Icon-Small.png"; sourceTree = "<group>"; };
+ 61F7A43411E290650040BA66 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small@2x.png"; path = "Resources/Icons/Icon-Small@2x.png"; sourceTree = "<group>"; };
+ 61F7A43511E290650040BA66 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icons/Icon.png; sourceTree = "<group>"; };
+ 61F7A43611E290650040BA66 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Resources/Icons/Icon@2x.png"; sourceTree = "<group>"; };
+ 61F7A43711E290650040BA66 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = Resources/Icons/iTunesArtwork.png; sourceTree = "<group>"; };
61F903E411DF58550068B24D /* backgroundBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundBottom.png; path = "Resources/Frontend-iPhone/backgroundBottom.png"; sourceTree = "<group>"; };
61F903E511DF58550068B24D /* backgroundCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundCenter.png; path = "Resources/Frontend-iPhone/backgroundCenter.png"; sourceTree = "<group>"; };
61F903E611DF58550068B24D /* backgroundLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundLeft.png; path = "Resources/Frontend-iPhone/backgroundLeft.png"; sourceTree = "<group>"; };
@@ -519,14 +527,12 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
- 6100DAD4115446B000F455E0 /* Resources-iPad */,
+ 61F7A42811E2905C0040BA66 /* Icons */,
61F903FA11DF58680068B24D /* Frontend-iPad */,
61F903E311DF584D0068B24D /* Frontend-iPhone */,
6179936611501D1E00BA94A9 /* Overlay */,
61798A5E114AE08600BA94A9 /* Data */,
- 61F7A2F811E270E70040BA66 /* Default-LandscapeLeft-iphone.png */,
- 61F7A2F911E270E70040BA66 /* Default-LandscapeRight-iphone.png */,
- 6165927C11CA9D3200D6E256 /* Icon.png */,
+ 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */,
8D1107310486CEB800E47090 /* Info.plist */,
61F9040811DF58B00068B24D /* settingsButton.png */,
);
@@ -556,17 +562,6 @@
name = Frameworks;
sourceTree = "<group>";
};
- 6100DAD4115446B000F455E0 /* Resources-iPad */ = {
- isa = PBXGroup;
- children = (
- 6151347D116C2803001F16D1 /* Icon-iPad.png */,
- 61F7A2FC11E270F00040BA66 /* Default-LandscapeLeft-ipad.png */,
- 61F7A2FD11E270F00040BA66 /* Default-LandscapeRight-ipad.png */,
- 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */,
- );
- name = "Resources-iPad";
- sourceTree = "<group>";
- };
6127232F117DF752005B90CF /* Products */ = {
isa = PBXGroup;
children = (
@@ -751,6 +746,22 @@
name = Overlay;
sourceTree = "<group>";
};
+ 61F7A42811E2905C0040BA66 /* Icons */ = {
+ isa = PBXGroup;
+ children = (
+ 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */,
+ 6183D83D11E2BCE200A88903 /* LI-iphone-Landscape.png */,
+ 61F7A43111E290650040BA66 /* Icon-72.png */,
+ 61F7A43211E290650040BA66 /* Icon-Small-50.png */,
+ 61F7A43311E290650040BA66 /* Icon-Small.png */,
+ 61F7A43411E290650040BA66 /* Icon-Small@2x.png */,
+ 61F7A43511E290650040BA66 /* Icon.png */,
+ 61F7A43611E290650040BA66 /* Icon@2x.png */,
+ 61F7A43711E290650040BA66 /* iTunesArtwork.png */,
+ );
+ name = Icons;
+ sourceTree = "<group>";
+ };
61F903E311DF584D0068B24D /* Frontend-iPhone */ = {
isa = PBXGroup;
children = (
@@ -778,6 +789,7 @@
61F9040C11DF59D10068B24D /* localplayButton.png */,
61F9040D11DF59D10068B24D /* netplayButton.png */,
61F9040A11DF59370068B24D /* background.png */,
+ 61F7A35411E27D3C0040BA66 /* background-lobby.png */,
61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */,
);
name = "Frontend-iPad";
@@ -995,7 +1007,6 @@
61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */,
61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */,
61799289114AE08700BA94A9 /* Data in Resources */,
- 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */,
61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */,
611E12FF117BBBDA0044B62F /* Entitlements-Development.plist in Resources */,
6165925311CA9CB400D6E256 /* MainMenuViewController-iPad.xib in Resources */,
@@ -1003,7 +1014,6 @@
6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */,
6165925611CA9CB400D6E256 /* MapConfigViewController-iPhone.xib in Resources */,
6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */,
- 6165928011CA9D3200D6E256 /* Icon.png in Resources */,
61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */,
61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */,
61EF921011DF57AC003441C4 /* arrowRight.png in Resources */,
@@ -1031,11 +1041,17 @@
61EBA62911DFF2BC0048B68A /* bricks.png in Resources */,
61EBA62A11DFF2BC0048B68A /* title.png in Resources */,
61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */,
- 61F7A2FA11E270E70040BA66 /* Default-LandscapeLeft-iphone.png in Resources */,
- 61F7A2FB11E270E70040BA66 /* Default-LandscapeRight-iphone.png in Resources */,
- 61F7A2FE11E270F00040BA66 /* Default-LandscapeLeft-ipad.png in Resources */,
- 61F7A2FF11E270F00040BA66 /* Default-LandscapeRight-ipad.png in Resources */,
61F7A30211E272280040BA66 /* lateralButton.png in Resources */,
+ 61F7A35511E27D3C0040BA66 /* background-lobby.png in Resources */,
+ 61F7A43811E290650040BA66 /* Icon-72.png in Resources */,
+ 61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */,
+ 61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */,
+ 61F7A43B11E290650040BA66 /* Icon-Small@2x.png in Resources */,
+ 61F7A43C11E290650040BA66 /* Icon.png in Resources */,
+ 61F7A43D11E290650040BA66 /* Icon@2x.png in Resources */,
+ 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */,
+ 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */,
+ 6183D83F11E2BCE200A88903 /* LI-iphone-Landscape.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Info.plist
--- a/project_files/HedgewarsMobile/Info.plist Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Info.plist Tue Jul 06 03:33:01 2010 +0200
@@ -11,7 +11,11 @@
<key>CFBundleIconFiles</key>
<array>
<string>Icon.png</string>
- <string>Icon-iPad.png</string>
+ <string>Icon-72.png</string>
+ <string>Icon@2x.png</string>
+ <string>Icon-Small.png</string>
+ <string>Icon-Small-50.png</string>
+ <string>Icon-Small@2x.png</string>
</array>
<key>CFBundleIdentifier</key>
<string>org.hedgewars.mobile</string>
@@ -27,9 +31,16 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
- <key>UIInterfaceOrientation</key>
- <string>UIInterfaceOrientationLandscapeRight</string>
<key>UIStatusBarHidden</key>
<true/>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UILaunchImageFile~ipad</key>
+ <string>LI-ipad</string>
+ <key>UILaunchImageFile~iphone</key>
+ <string>LI-iphone</string>
</dict>
</plist>
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-ipad.png
Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-ipad.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-iphone.png
Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-iphone.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Default-LandscapeRight-ipad.png
Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeRight-ipad.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Default-LandscapeRight-iphone.png
Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeRight-iphone.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Frontend-iPad/background-lobby.png
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/background-lobby.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/GameConfigViewController.xib
--- a/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Tue Jul 06 03:33:01 2010 +0200
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">800</int>
<string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">762</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">87</string>
+ <string key="NS.object.0">117</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -88,6 +88,10 @@
<reference ref="4"/>
<reference ref="4"/>
</object>
+ <object class="NSColor" key="IBTintColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4yNTA5ODA0MDcgMC41MDE5NjA4MTQgMAA</bytes>
+ </object>
</object>
</object>
<string key="NSFrame">{{0, 276}, {480, 44}}</string>
@@ -95,6 +99,7 @@
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIBarStyle">1</int>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIBarButtonItem" id="80281356">
@@ -323,6 +328,25 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>segmentPressed:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">segmentPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/GameConfigViewController.h</string>
@@ -589,8 +613,8 @@
<integer value="3100" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">87</string>
+ <string key="IBCocoaTouchPluginVersion">117</string>
</data>
</archive>
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icon-iPad.png
Binary file project_files/HedgewarsMobile/Resources/Icon-iPad.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icon.png
Binary file project_files/HedgewarsMobile/Resources/Icon.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/Icon-72.png
Binary file project_files/HedgewarsMobile/Resources/Icons/Icon-72.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/Icon-Small-50.png
Binary file project_files/HedgewarsMobile/Resources/Icons/Icon-Small-50.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/Icon-Small.png
Binary file project_files/HedgewarsMobile/Resources/Icons/Icon-Small.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/Icon-Small@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/Icon-Small@2x.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/Icon.png
Binary file project_files/HedgewarsMobile/Resources/Icons/Icon.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/Icon@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/Icon@2x.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/LI-ipad-Landscape.png
Binary file project_files/HedgewarsMobile/Resources/Icons/LI-ipad-Landscape.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/LI-iphone-Landscape.png
Binary file project_files/HedgewarsMobile/Resources/Icons/LI-iphone-Landscape.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Icons/iTunesArtwork.png
Binary file project_files/HedgewarsMobile/Resources/Icons/iTunesArtwork.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Tue Jul 06 03:33:01 2010 +0200
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="37"/>
+ <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -342,7 +342,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MainMenuViewController</string>
<string>UIResponder</string>
- <string>{{141, 89}, {1024, 768}}</string>
+ <string>{{267, 388}, {1024, 768}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Jul 05 22:42:43 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Tue Jul 06 03:33:01 2010 +0200
@@ -45,13 +45,13 @@
<object class="IBUIImageView" id="420136851">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrameSize">{1024, 768}</string>
+ <string key="NSFrameSize">{1024, 704}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">background.png</string>
+ <string key="NSResourceName">background-lobby.png</string>
</object>
</object>
<object class="IBUIImageView" id="553937568">
@@ -87,6 +87,16 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUIImage" ref="1034685562"/>
</object>
+ <object class="IBUIImageView" id="697924047">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{17, 20}, {272, 162}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="1034685562"/>
+ </object>
<object class="IBUISegmentedControl" id="88728219">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">289</int>
@@ -131,7 +141,7 @@
<object class="IBUISlider" id="938256702">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{75, 143}, {149, 23}}</string>
+ <string key="NSFrame">{{75, 138}, {149, 23}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -174,7 +184,7 @@
<object class="IBUILabel" id="634417433">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{128, 46}, {42, 21}}</string>
+ <string key="NSFrame">{{129, 41}, {42, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -182,9 +192,9 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">...</string>
- <object class="NSColor" key="IBUITextColor" id="1054032130">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45MTc2NDcxMjMzIDAuNjc0NTA5ODIzMyAwAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
@@ -194,7 +204,7 @@
<object class="IBUILabel" id="743202682">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{77, 92}, {145, 29}}</string>
+ <string key="NSFrame">{{77, 87}, {145, 29}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -207,7 +217,10 @@
<double key="NSSize">24</double>
<int key="NSfFlags">16</int>
</object>
- <reference key="IBUITextColor" ref="1054032130"/>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA</bytes>
+ </object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
@@ -271,6 +284,19 @@
</object>
<reference key="IBUINormalTitleShadowColor" ref="65043801"/>
</object>
+ <object class="IBUIImageView" id="920829014">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{357, 57}, {309, 165}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">title.png</string>
+ </object>
+ </object>
<object class="IBUIImageView" id="12554882">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
@@ -283,19 +309,6 @@
<string key="NSResourceName">bricks.png</string>
</object>
</object>
- <object class="IBUIImageView" id="920829014">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{357, 35}, {309, 165}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">title.png</string>
- </object>
- </object>
</object>
<string key="NSFrameSize">{1024, 724}</string>
<reference key="NSSuperview"/>
@@ -436,20 +449,21 @@
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="420136851"/>
- <reference ref="938256702"/>
- <reference ref="634417433"/>
- <reference ref="743202682"/>
<reference ref="326163764"/>
<reference ref="88728219"/>
<reference ref="867832822"/>
<reference ref="438802257"/>
<reference ref="553937568"/>
- <reference ref="565214171"/>
<reference ref="68378447"/>
<reference ref="967260168"/>
+ <reference ref="920829014"/>
<reference ref="12554882"/>
- <reference ref="920829014"/>
+ <reference ref="565214171"/>
+ <reference ref="420136851"/>
+ <reference ref="697924047"/>
+ <reference ref="634417433"/>
+ <reference ref="743202682"/>
+ <reference ref="938256702"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -485,15 +499,6 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="565214171"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">Table View (Themes)</string>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">39</int>
<reference key="object" ref="967260168"/>
<reference key="parent" ref="191373211"/>
@@ -504,11 +509,6 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">50</int>
- <reference key="object" ref="420136851"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">51</int>
<reference key="object" ref="68378447"/>
<reference key="parent" ref="191373211"/>
@@ -529,13 +529,29 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">56</int>
+ <int key="objectID">57</int>
+ <reference key="object" ref="920829014"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">50</int>
+ <reference key="object" ref="420136851"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
<reference key="object" ref="12554882"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="920829014"/>
+ <int key="objectID">25</int>
+ <reference key="object" ref="565214171"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">Table View (Themes)</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">59</int>
+ <reference key="object" ref="697924047"/>
<reference key="parent" ref="191373211"/>
</object>
</object>
@@ -557,8 +573,9 @@
<string>53.IBPluginDependency</string>
<string>54.IBPluginDependency</string>
<string>55.IBPluginDependency</string>
- <string>56.IBPluginDependency</string>
<string>57.IBPluginDependency</string>
+ <string>58.IBPluginDependency</string>
+ <string>59.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
@@ -583,6 +600,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -601,7 +619,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">57</int>
+ <int key="maxID">60</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1011,14 +1029,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>background.png</string>
+ <string>background-lobby.png</string>
<string>bluebox.png</string>
<string>bricks.png</string>
<string>title.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>{1024, 768}</string>
+ <string>{1024, 704}</string>
<string>{512, 512}</string>
<string>{1024, 20}</string>
<string>{273, 151}</string>
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/Overlay/lateralButton.png
Binary file project_files/HedgewarsMobile/Resources/Overlay/lateralButton.png has changed
diff -r 304c6d32383a -r 9f1d79e01a60 project_files/HedgewarsMobile/Resources/lateralButton.png
Binary file project_files/HedgewarsMobile/Resources/lateralButton.png has changed