Skip to content

Commit

Permalink
fixed bad sprite sheets; removed instructions button; reduced size of…
Browse files Browse the repository at this point in the history
… rock hit boxes
  • Loading branch information
seangtkelley committed Jul 17, 2017
1 parent 0da5e7c commit 7dbd0ba
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Classes/GameScene.cpp
Expand Up @@ -169,7 +169,7 @@ bool Game::init()
rock->setPosition(0 - (rock->getBoundingBox().size.width / 2), visibleSize.height/2);

// create physics body for tree
auto rockBody = PhysicsBody::createCircle(rock->getContentSize().width/1.75, PHYSICSBODY_MATERIAL_DEFAULT);
auto rockBody = PhysicsBody::createCircle(rock->getContentSize().width/2, PHYSICSBODY_MATERIAL_DEFAULT);
rockBody->setDynamic(false);
rockBody->setContactTestBitmask(0xFFFFFFFF);
rock->setPhysicsBody(rockBody);
Expand Down
10 changes: 5 additions & 5 deletions Classes/MainMenuScene.cpp
Expand Up @@ -39,20 +39,20 @@ bool MainMenu::init()

auto play_menu_item = MenuItemSprite::create(play_sprite, play_selected_sprite, CC_CALLBACK_1(MainMenu::play, this));
//auto highscores_menu_item = MenuItemFont::create("Puntajes", CC_CALLBACK_1(MainMenu::highscores, this));
auto instructions_menu_item = MenuItemSprite::create(instrucciones_sprite, instrucciones_selected_sprite, CC_CALLBACK_1(MainMenu::instructions, this));
//auto instructions_menu_item = MenuItemSprite::create(instrucciones_sprite, instrucciones_selected_sprite, CC_CALLBACK_1(MainMenu::instructions, this));
auto quit_menu_item = MenuItemSprite::create(salir_sprite, salir_selected_sprite, CC_CALLBACK_1(MainMenu::quit, this));

play_menu_item->setScale(2.0);
instructions_menu_item->setScale(2.0);
//instructions_menu_item->setScale(2.0);
quit_menu_item->setScale(2.0);

play_menu_item->setPosition(visibleSize.width/2, (visibleSize.height/6) * 4);
//highscores_menu_item->setPosition(visibleSize.width/2, (visibleSize.height/5) * 3);
instructions_menu_item->setPosition(visibleSize.width/2, (visibleSize.height/6) * 3);
quit_menu_item->setPosition(visibleSize.width/2, (visibleSize.height/6) * 2);
//instructions_menu_item->setPosition(visibleSize.width/2, (visibleSize.height/6) * 3);
quit_menu_item->setPosition(visibleSize.width/2, (visibleSize.height/6) * 3);

// create menu, it's an autorelease object
menu = Menu::create(play_menu_item, /*highscores_menu_item,*/ instructions_menu_item, quit_menu_item, NULL);
menu = Menu::create(play_menu_item, /*highscores_menu_item, instructions_menu_item,*/ quit_menu_item, NULL);
menu->setPosition(Vec2::ZERO);
this->addChild(menu, 2);

Expand Down
2 changes: 1 addition & 1 deletion Resources/res/HD/game-assets.plist
Expand Up @@ -459,7 +459,7 @@
<key>size</key>
<string>{960,1071}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:41d1ac96aaf11b8eef4509b8cfbbc203:a59ca3f8958138fc74e622f85efede10:2dc9081a33486ba0a4db11e41094e5ae$</string>
<string>$TexturePacker:SmartUpdate:0afe9af505e7632658db3f9d255f8c70:a59ca3f8958138fc74e622f85efede10:2dc9081a33486ba0a4db11e41094e5ae$</string>
<key>textureFileName</key>
<string>game-assets.png</string>
</dict>
Expand Down
Binary file modified Resources/res/HD/game-assets.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/res/HDR/game-assets.plist
Expand Up @@ -459,7 +459,7 @@
<key>size</key>
<string>{2045,2048}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:41d1ac96aaf11b8eef4509b8cfbbc203:a59ca3f8958138fc74e622f85efede10:2dc9081a33486ba0a4db11e41094e5ae$</string>
<string>$TexturePacker:SmartUpdate:0afe9af505e7632658db3f9d255f8c70:a59ca3f8958138fc74e622f85efede10:2dc9081a33486ba0a4db11e41094e5ae$</string>
<key>textureFileName</key>
<string>game-assets.png</string>
</dict>
Expand Down
Binary file modified Resources/res/HDR/game-assets.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/res/SD/game-assets.plist
Expand Up @@ -459,7 +459,7 @@
<key>size</key>
<string>{480,531}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:41d1ac96aaf11b8eef4509b8cfbbc203:a59ca3f8958138fc74e622f85efede10:2dc9081a33486ba0a4db11e41094e5ae$</string>
<string>$TexturePacker:SmartUpdate:0afe9af505e7632658db3f9d255f8c70:a59ca3f8958138fc74e622f85efede10:2dc9081a33486ba0a4db11e41094e5ae$</string>
<key>textureFileName</key>
<string>game-assets.png</string>
</dict>
Expand Down
Binary file modified Resources/res/SD/game-assets.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/debug/android/BienArgentinoJuego-debug.apk
Binary file not shown.

0 comments on commit 7dbd0ba

Please sign in to comment.