# HG changeset patch # User antonc27 # Date 1447039529 -3600 # Node ID 62af5c67662df185c8ceb352965c28f83598ca56 # Parent d98070707214976eb8b37417593a95a2d8786ca5# Parent c32b5d5181dd87a3ce915a2442f50a6d3e103538 Merge from default diff -r c32b5d5181dd -r 62af5c67662d project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump.png Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump.png has changed diff -r c32b5d5181dd -r 62af5c67662d project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump_old.png Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump_old.png has changed diff -r c32b5d5181dd -r 62af5c67662d project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m --- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Sun Nov 08 14:54:22 2015 +0100 +++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Mon Nov 09 04:25:29 2015 +0100 @@ -267,7 +267,6 @@ -(void) didReceiveMemoryWarning { - self.previewImage = nil; self.missionName = nil; self.listOfMissionIDs = nil; self.dictOfMissions = nil; diff -r c32b5d5181dd -r 62af5c67662d project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Nov 08 14:54:22 2015 +0100 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Mon Nov 09 04:25:29 2015 +0100 @@ -268,7 +268,7 @@ 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]; diff -r c32b5d5181dd -r 62af5c67662d project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Nov 08 14:54:22 2015 +0100 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Nov 09 04:25:29 2015 +0100 @@ -194,16 +194,16 @@ } -(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];