Merge remote-tracking branch 'origin/master' into niels/game

1 files changed, 3 insertions, 2 deletions

diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp
index 3aeabfe..d0142e0 100644
--- a/game/player/PlayerSubScene.cpp
+++ b/game/player/PlayerSubScene.cpp
@@ -123,7 +123,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) {
 			.looping = true,
 		}
 	);
-	player.add_component<BoxCollider>(vec2(50, 50));
+	player.add_component<BoxCollider>(vec2(50, 35));
 	Asset player_head_asset {"asset/barry/defaultHead.png"};
 	Sprite & player_head_sprite = player.add_component<Sprite>(
 		player_head_asset,
@@ -160,7 +160,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) {
 			.looping = true,
 		}
 	);
-	player.add_component<BoxCollider>(vec2(40, 60), vec2(-20, 0));
+	player.add_component<BoxCollider>(vec2(40, 50), vec2(-20, 0));
 	player.add_component<Rigidbody>(Rigidbody::Data {
 		.gravity_scale = 1.0,
 		.body_type = Rigidbody::BodyType::DYNAMIC,
@@ -170,6 +170,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) {
 		},
 		.collision_layer = COLL_LAY_PLAYER,
 	});
+
 	player.add_component<BehaviorScript>().set_script<PlayerScript>().active = false;
 	player.add_component<BehaviorScript>().set_script<CoinScript>();
 	player.add_component<BehaviorScript>().set_script<PlayerEndScript>().active = false;