Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from iOS branch
authorantonc27 <antonc27@mail.ru>
Tue, 17 Nov 2015 20:53:05 +0100
changeset 11416 0566458ffdfc
parent 11415 1b9e183841e7 (current diff)
parent 11414 e0600c5964c7 (diff)
child 11417 c19f2387d24f
Merge from iOS branch
--- a/.hgtags	Tue Nov 17 17:08:26 2015 +0100
+++ b/.hgtags	Tue Nov 17 20:53:05 2015 +0100
@@ -70,6 +70,7 @@
 4c4f22cc3fa4e6c1e5cd6cce35350dd93478415f 0.9.22-release
 4c4f22cc3fa4e6c1e5cd6cce35350dd93478415f 0.9.22-release
 9621fdcad96589b3fd78713a0f31e72f26f068bb 0.9.22-release
+a0163b8302c592aac60d98134bb6730f390fcaad Hedgewars-iOS-2.0
 7e55468ffe384a3065524c483eb5e3cdb1658fd5 fab746a3597e
 0000000000000000000000000000000000000000 fab746a3597e
 d9622394ec9c2974a84b9b4d9e6c0ac26c4060ff 0.9.22-RC
--- a/hedgewars/uStore.pas	Tue Nov 17 17:08:26 2015 +0100
+++ b/hedgewars/uStore.pas	Tue Nov 17 20:53:05 2015 +0100
@@ -745,7 +745,7 @@
     if SDLGLcontext = nil then
         SDLGLcontext:= SDL_GL_CreateContext(SDLwindow);
     SDLTry(SDLGLcontext <> nil, 'SDLGLcontext', true);
-    SDLTry(SDL_GL_SetSwapInterval(1) = 0, 'SDL_GL_SetSwapInterval', true);
+    SDL_GL_SetSwapInterval(1);
 
     RendererSetup();
 
Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump.png has changed
Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump_old.png has changed
--- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m	Tue Nov 17 17:08:26 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m	Tue Nov 17 20:53:05 2015 +0100
@@ -267,7 +267,6 @@
 
 -(void) didReceiveMemoryWarning
 {
-    self.previewImage = nil;
     self.missionName = nil;
     self.listOfMissionIDs = nil;
     self.dictOfMissions = nil;
--- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m	Tue Nov 17 17:08:26 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m	Tue Nov 17 20:53:05 2015 +0100
@@ -268,14 +268,14 @@
     footer.backgroundColor = [UIColor clearColor];
     footer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*80/100, height)];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*90/100, height)];
     label.center = CGPointMake(aTableView.frame.size.width/2, height/2);
     label.textAlignment = UITextAlignmentCenter;
     label.font = [UIFont italicSystemFontOfSize:12];
     label.textColor = [UIColor whiteColor];
     label.numberOfLines = 2;
     label.backgroundColor = [UIColor clearColor];
-    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
 
     label.text = NSLocalizedString(@"Setting a Style might force a particular Scheme or Weapon configuration.",@"");
 
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m	Tue Nov 17 17:08:26 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m	Tue Nov 17 20:53:05 2015 +0100
@@ -194,23 +194,23 @@
 }
 
 -(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
-    return IS_IPAD() ? 40 : 20;
+    return IS_IPAD() ? 40 : 30;
 }
 
 -(UIView *)tableView:(UITableView *)aTableView viewForFooterInSection:(NSInteger) section {
-    NSInteger height = IS_IPAD() ? 40 : 20;
+    NSInteger height = IS_IPAD() ? 40 : 30;
     UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width, height)];
     footer.backgroundColor = [UIColor clearColor];
     footer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*80/100, height)];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*90/100, height)];
     label.center = CGPointMake(aTableView.frame.size.width/2, height/2);
     label.textAlignment = UITextAlignmentCenter;
     label.font = [UIFont italicSystemFontOfSize:12];
     label.textColor = [UIColor whiteColor];
     label.numberOfLines = 2;
     label.backgroundColor = [UIColor clearColor];
-    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
 
     if (section == 0)
         label.text = NSLocalizedString(@"Tap to add hogs or change color, touch and hold to remove a team.",@"");
sheepy-clone