Merge branch 'master' of github.com:okamstudio/godot

19 files changed, 274 insertions, 42 deletions

diff --git a/platform/iphone/Appirater.h b/platform/iphone/Appirater.h
index d11b2f7793..f0bf2c01d5 100644
--- a/platform/iphone/Appirater.h
+++ b/platform/iphone/Appirater.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/app_delegate.h b/platform/iphone/app_delegate.h
index 9437e04738..0d20f886cc 100644
--- a/platform/iphone/app_delegate.h
+++ b/platform/iphone/app_delegate.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm
index fe11b672ac..3c79137171 100644
--- a/platform/iphone/app_delegate.mm
+++ b/platform/iphone/app_delegate.mm
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -138,6 +138,29 @@ static int frame_count = 0;
 		Main::setup2();
 		++frame_count;
 
+		// this might be necessary before here
+		for (NSString* key in [[NSBundle mainBundle] infoDictionary]) {
+			NSObject* value = [[[NSBundle mainBundle] infoDictionary] objectForKey:key];
+			String ukey = String::utf8([key UTF8String]);
+
+			// we need a NSObject to Variant conversor
+
+			if ([value isKindOfClass:[NSString class]]) {
+				NSString* str = (NSString*)value;
+				String uval = String::utf8([str UTF8String]);
+
+				Globals::get_singleton()->set("Info.plist/"+ukey, uval);
+
+			} else if ([value isKindOfClass:[NSNumber class]]) {
+
+				NSNumber* n = (NSNumber*)value;
+				double dval = [n doubleValue];
+
+				Globals::get_singleton()->set("Info.plist/"+ukey, dval);
+			};
+			// do stuff
+		}
+
 	} break;
 /*
 	case 3: {
diff --git a/platform/iphone/audio_driver_iphone.cpp b/platform/iphone/audio_driver_iphone.cpp
index c3ba0e6944..a95cb436a7 100644
--- a/platform/iphone/audio_driver_iphone.cpp
+++ b/platform/iphone/audio_driver_iphone.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/audio_driver_iphone.h b/platform/iphone/audio_driver_iphone.h
index 05fa741282..5d406940a3 100644
--- a/platform/iphone/audio_driver_iphone.h
+++ b/platform/iphone/audio_driver_iphone.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/game_center.h b/platform/iphone/game_center.h
index df1d980c04..8f180d1638 100644
--- a/platform/iphone/game_center.h
+++ b/platform/iphone/game_center.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -51,6 +51,12 @@ public:
 
 	Error post_score(Variant p_score);
 	Error award_achievement(Variant p_params);
+	void reset_achievements();
+	void request_achievements();
+	void request_achievement_descriptions();
+	Error show_game_center(Variant p_params);
+
+	void game_center_closed();
 
 	int get_pending_event_count();
 	Variant pop_pending_event();
diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm
index d517ddd105..79c056776d 100644
--- a/platform/iphone/game_center.mm
+++ b/platform/iphone/game_center.mm
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -32,6 +32,7 @@
 
 extern "C" {
 #import <GameKit/GameKit.h>
+#import "app_delegate.h"
 };
 
 GameCenter* GameCenter::instance = NULL;
@@ -42,6 +43,10 @@ void GameCenter::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("post_score"),&GameCenter::post_score);
 	ObjectTypeDB::bind_method(_MD("award_achievement"),&GameCenter::award_achievement);
+	ObjectTypeDB::bind_method(_MD("reset_achievements"),&GameCenter::reset_achievements);
+	ObjectTypeDB::bind_method(_MD("request_achievements"),&GameCenter::request_achievements);
+	ObjectTypeDB::bind_method(_MD("request_achievement_descriptions"),&GameCenter::request_achievement_descriptions);
+	ObjectTypeDB::bind_method(_MD("show_game_center"),&GameCenter::show_game_center);
 
 	ObjectTypeDB::bind_method(_MD("get_pending_event_count"),&GameCenter::get_pending_event_count);
 	ObjectTypeDB::bind_method(_MD("pop_pending_event"),&GameCenter::pop_pending_event);
@@ -50,23 +55,41 @@ void GameCenter::_bind_methods() {
 
 Error GameCenter::connect() {
 
-	GKLocalPlayer* player = [GKLocalPlayer localPlayer];
-	[player authenticateWithCompletionHandler:^(NSError* error) {
+	//if this class isn't available, game center isn't implemented
+	if ((NSClassFromString(@"GKLocalPlayer")) == nil) {
+		GameCenter::get_singleton()->connected = false;
+		return ERR_UNAVAILABLE;
+	}
 
-		Dictionary ret;
-		ret["type"] = "authentication";
-		if (player.isAuthenticated) {
-			ret["result"] = "ok";
-			GameCenter::get_singleton()->connected = true;
-		} else {
-			ret["result"] = "error";
-			ret["error_code"] = error.code;
-			ret["error_description"] = [error.localizedDescription UTF8String];
-			GameCenter::get_singleton()->connected = false;
-		};
+	GKLocalPlayer* player = [GKLocalPlayer localPlayer];
+	ERR_FAIL_COND_V(![player respondsToSelector:@selector(authenticateHandler)], ERR_UNAVAILABLE);
+
+	ViewController *root_controller=(ViewController *)((AppDelegate *)[[UIApplication sharedApplication] delegate]).window.rootViewController;
+	ERR_FAIL_COND_V(!root_controller, FAILED);
+
+    //this handler is called serveral times.  first when the view needs to be shown, then again after the view is cancelled or the user logs in.  or if the user's already logged in, it's called just once to confirm they're authenticated.  This is why no result needs to be specified in the presentViewController phase. in this case, more calls to this function will follow.
+	player.authenticateHandler = (^(UIViewController *controller, NSError *error) {
+        if (controller) {
+            [root_controller presentViewController:controller animated:YES completion:nil];
+        }
+        else {
+            Dictionary ret;
+            ret["type"] = "authentication";
+            if (player.isAuthenticated) {
+                ret["result"] = "ok";
+                GameCenter::get_singleton()->connected = true;
+            } else {
+                ret["result"] = "error";
+                ret["error_code"] = error.code;
+                ret["error_description"] = [error.localizedDescription UTF8String];
+                GameCenter::get_singleton()->connected = false;
+            };
+            
+            pending_events.push_back(ret);
+        };
+	
+	});
 
-		pending_events.push_back(ret);
-	}];
 	return OK;
 };
 
@@ -85,7 +108,9 @@ Error GameCenter::post_score(Variant p_score) {
 	GKScore* reporter = [[[GKScore alloc] initWithCategory:cat_str] autorelease];
 	reporter.value = score;
 
-	[reporter reportScoreWithCompletionHandler:^(NSError* error) {
+	ERR_FAIL_COND_V([GKScore respondsToSelector:@selector(reportScores)], ERR_UNAVAILABLE);
+
+	[GKScore reportScores:@[reporter] withCompletionHandler:^(NSError* error) {
 
 		Dictionary ret;
 		ret["type"] = "post_score";
@@ -114,8 +139,15 @@ Error GameCenter::award_achievement(Variant p_params) {
 	GKAchievement* achievement = [[[GKAchievement alloc] initWithIdentifier: name_str] autorelease];
 	ERR_FAIL_COND_V(!achievement, FAILED);
 
+	ERR_FAIL_COND_V([GKAchievement respondsToSelector:@selector(reportAchievements)], ERR_UNAVAILABLE);
+
 	achievement.percentComplete = progress;
-	[achievement reportAchievementWithCompletionHandler:^(NSError* error) {
+	achievement.showsCompletionBanner = NO;
+	if (params.has("show_completion_banner")) {
+		achievement.showsCompletionBanner = params["show_completion_banner"] ? YES : NO;
+	}
+	
+	[GKAchievement reportAchievements:@[achievement] withCompletionHandler:^(NSError *error) {
 
 		Dictionary ret;
 		ret["type"] = "award_achievement";
@@ -132,6 +164,168 @@ Error GameCenter::award_achievement(Variant p_params) {
 	return OK;
 };
 
+void GameCenter::request_achievement_descriptions() {
+
+	[GKAchievementDescription loadAchievementDescriptionsWithCompletionHandler:^(NSArray *descriptions, NSError *error) {
+
+		Dictionary ret;
+		ret["type"] = "achievement_descriptions";
+		if (error == nil) {
+			ret["result"] = "ok";
+			StringArray names;
+			StringArray titles;
+			StringArray unachieved_descriptions;
+			StringArray achieved_descriptions;
+			IntArray maximum_points;
+			Array hidden;
+			Array replayable;
+			
+			for (int i=0; i<[descriptions count]; i++) {
+
+				GKAchievementDescription* description = [descriptions objectAtIndex:i];
+				
+				const char* str = [description.identifier UTF8String];
+				names.push_back(String::utf8(str != NULL ? str : ""));
+				
+				str = [description.title UTF8String];
+				titles.push_back(String::utf8(str != NULL ? str : ""));
+				  
+				str = [description.unachievedDescription UTF8String];
+				unachieved_descriptions.push_back(String::utf8(str != NULL ? str : ""));
+				
+				str = [description.achievedDescription UTF8String];
+				achieved_descriptions.push_back(String::utf8(str != NULL ? str : ""));
+				
+				maximum_points.push_back(description.maximumPoints);
+				
+				hidden.push_back(description.hidden == YES);
+				
+				replayable.push_back(description.replayable == YES);
+			}
+			
+			ret["names"] = names;
+			ret["titles"] = titles;
+			ret["unachieved_descriptions"] = unachieved_descriptions;
+			ret["achieved_descriptions"] = achieved_descriptions;
+			ret["maximum_points"] = maximum_points;
+			ret["hidden"] = hidden;
+			ret["replayable"] = replayable;
+			
+		} else {
+			ret["result"] = "error";
+			ret["error_code"] = error.code;
+		};
+
+		pending_events.push_back(ret);
+	}];
+};
+
+
+void GameCenter::request_achievements() {
+
+	[GKAchievement loadAchievementsWithCompletionHandler:^(NSArray *achievements, NSError *error) {
+
+		Dictionary ret;
+		ret["type"] = "achievements";
+		if (error == nil) {
+			ret["result"] = "ok";
+			StringArray names;
+			RealArray percentages;
+					
+			for (int i=0; i<[achievements count]; i++) {
+
+				GKAchievement* achievement = [achievements objectAtIndex:i];
+				const char* str = [achievement.identifier UTF8String];
+				names.push_back(String::utf8(str != NULL ? str : ""));
+				
+				percentages.push_back(achievement.percentComplete);
+			}
+			
+			ret["names"] = names;
+			ret["progress"] = percentages;
+			
+		} else {
+			ret["result"] = "error";
+			ret["error_code"] = error.code;
+		};
+
+		pending_events.push_back(ret);
+	}];
+};
+
+void GameCenter::reset_achievements() {
+
+	[GKAchievement resetAchievementsWithCompletionHandler:^(NSError *error)
+	{
+		Dictionary ret;
+		ret["type"] = "reset_achievements";
+		if (error == nil) {
+			ret["result"] = "ok";
+		} else {
+			ret["result"] = "error";
+			ret["error_code"] = error.code;
+		};
+		
+		pending_events.push_back(ret);
+	}];
+};
+
+Error GameCenter::show_game_center(Variant p_params) {
+
+	ERR_FAIL_COND_V(!NSProtocolFromString(@"GKGameCenterControllerDelegate"), FAILED);
+
+	Dictionary params = p_params;
+
+	GKGameCenterViewControllerState view_state = GKGameCenterViewControllerStateDefault;
+	if (params.has("view")) {
+		String view_name = params["view"];
+		if (view_name == "default") {
+			view_state = GKGameCenterViewControllerStateDefault;
+		}
+		else if (view_name == "leaderboards") {
+			view_state = GKGameCenterViewControllerStateLeaderboards;
+		}
+		else if (view_name == "achievements") {
+			view_state = GKGameCenterViewControllerStateAchievements;
+		}
+		else if (view_name == "challenges") {
+			view_state = GKGameCenterViewControllerStateChallenges;
+		}
+		else {
+			return ERR_INVALID_PARAMETER;
+		}
+	}
+
+	GKGameCenterViewController *controller = [[GKGameCenterViewController alloc] init];
+	ERR_FAIL_COND_V(!controller, FAILED);
+
+	ViewController *root_controller=(ViewController *)((AppDelegate *)[[UIApplication sharedApplication] delegate]).window.rootViewController;
+	ERR_FAIL_COND_V(!root_controller, FAILED);
+	
+	controller.gameCenterDelegate = root_controller;
+	controller.viewState = view_state;
+	if (view_state == GKGameCenterViewControllerStateLeaderboards) {
+		controller.leaderboardIdentifier = nil;
+		if (params.has("leaderboard_name")) {
+			String name = params["leaderboard_name"];
+			NSString* name_str = [[[NSString alloc] initWithUTF8String:name.utf8().get_data()] autorelease];
+			controller.leaderboardIdentifier = name_str;
+		}
+	}
+ 
+	[root_controller presentViewController: controller animated: YES completion:nil];
+	
+	return OK;	
+};
+
+void GameCenter::game_center_closed() {
+	
+	Dictionary ret;
+        ret["type"] = "show_game_center";
+	ret["result"] = "ok";
+	pending_events.push_back(ret);
+}
+
 int GameCenter::get_pending_event_count() {
 
 	return pending_events.size();
diff --git a/platform/iphone/gl_view.h b/platform/iphone/gl_view.h
index 04334991fd..c58c863510 100755
--- a/platform/iphone/gl_view.h
+++ b/platform/iphone/gl_view.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm
index 3d6c48ffaf..3309fd0820 100755
--- a/platform/iphone/gl_view.mm
+++ b/platform/iphone/gl_view.mm
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -352,8 +352,9 @@ static void clear_touches() {
 	// Generate IDs for a framebuffer object and a color renderbuffer
 	UIScreen* mainscr = [UIScreen mainScreen];
 	printf("******** screen size %i, %i\n", (int)mainscr.currentMode.size.width, (int)mainscr.currentMode.size.height);
-	if (mainscr.currentMode.size.width == 640 || mainscr.currentMode.size.width == 960) // modern iphone, can go to 640x960
-		self.contentScaleFactor = 2.0;
+	float minPointSize = MIN(mainscr.bounds.size.width, mainscr.bounds.size.height);
+	float minScreenSize = MIN(mainscr.currentMode.size.width, mainscr.currentMode.size.height);
+	self.contentScaleFactor = minScreenSize / minPointSize;
 
 	glGenFramebuffersOES(1, &viewFramebuffer);
 	glGenRenderbuffersOES(1, &viewRenderbuffer);
diff --git a/platform/iphone/godot_iphone.cpp b/platform/iphone/godot_iphone.cpp
index b86af007f8..b7b9b747b4 100644
--- a/platform/iphone/godot_iphone.cpp
+++ b/platform/iphone/godot_iphone.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/in_app_store.h b/platform/iphone/in_app_store.h
index 656d126ead..585cd19538 100644
--- a/platform/iphone/in_app_store.h
+++ b/platform/iphone/in_app_store.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm
index f3640c3076..e3ba6bbd73 100644
--- a/platform/iphone/in_app_store.mm
+++ b/platform/iphone/in_app_store.mm
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -210,7 +210,7 @@ Error InAppStore::request_product_info(Variant p_params) {
                 receipt_to_send = [receipt description];
             }
             Dictionary receipt_ret;
-            receipt_ret["receipt"] = String::utf8([receipt_to_send UTF8String]);
+            receipt_ret["receipt"] = String::utf8(receipt_to_send != nil ? [receipt_to_send UTF8String] : "");
             receipt_ret["sdk"] = sdk_version;
             ret["receipt"] = receipt_ret;
             
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
index 06b48318ec..ade1c292a4 100644
--- a/platform/iphone/os_iphone.cpp
+++ b/platform/iphone/os_iphone.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -136,7 +136,8 @@ void OSIPhone::initialize(const VideoMode& p_desired,int p_video_driver,int p_au
 	//
 	physics_server = memnew( PhysicsServerSW );
 	physics_server->init();
-	physics_2d_server = memnew( Physics2DServerSW );
+	//physics_2d_server = memnew( Physics2DServerSW );
+	physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>();
 	physics_2d_server->init();
 
 	input = memnew( InputDefault );
diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h
index 2585a26479..844f067552 100644
--- a/platform/iphone/os_iphone.h
+++ b/platform/iphone/os_iphone.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -38,6 +38,7 @@
 #include "servers/visual/rasterizer.h"
 #include "servers/physics/physics_server_sw.h"
 #include "servers/physics_2d/physics_2d_server_sw.h"
+#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
 #include "servers/audio/audio_server_sw.h"
 #include "servers/audio/sample_manager_sw.h"
 #include "servers/spatial_sound/spatial_sound_server_sw.h"
diff --git a/platform/iphone/platform_config.h b/platform/iphone/platform_config.h
index 3d6300d8e0..3cc74099c0 100644
--- a/platform/iphone/platform_config.h
+++ b/platform/iphone/platform_config.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/rasterizer_iphone.cpp b/platform/iphone/rasterizer_iphone.cpp
index 4674a5143c..d2a0777af8 100644
--- a/platform/iphone/rasterizer_iphone.cpp
+++ b/platform/iphone/rasterizer_iphone.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/rasterizer_iphone.h b/platform/iphone/rasterizer_iphone.h
index 41dbbdaa5a..2a630e597a 100644
--- a/platform/iphone/rasterizer_iphone.h
+++ b/platform/iphone/rasterizer_iphone.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/iphone/view_controller.h b/platform/iphone/view_controller.h
index 7c4a107bb8..0cee2f6fbf 100644
--- a/platform/iphone/view_controller.h
+++ b/platform/iphone/view_controller.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -27,8 +27,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #import <UIKit/UIKit.h>
+#import <GameKit/GameKit.h>
 
-@interface ViewController : UIViewController {
+@interface ViewController : UIViewController <GKGameCenterControllerDelegate> {
 
 };
 
diff --git a/platform/iphone/view_controller.mm b/platform/iphone/view_controller.mm
index eb331a61de..bc9950979e 100644
--- a/platform/iphone/view_controller.mm
+++ b/platform/iphone/view_controller.mm
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -124,10 +124,15 @@ int add_cmdline(int p_argc, char** p_args) {
 	}
 };
 
-
 - (BOOL)prefersStatusBarHidden
 {
 	return YES;
 }
 
+- (void) gameCenterViewControllerDidFinish:(GKGameCenterViewController*) gameCenterViewController {
+    //[gameCenterViewController dismissViewControllerAnimated:YES completion:^{GameCenter::get_singleton()->game_center_closed();}];//version for signaling when overlay is completely gone
+    GameCenter::get_singleton()->game_center_closed();
+    [gameCenterViewController dismissViewControllerAnimated:YES completion:nil];
+}
+
 @end