Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #8

Open
wants to merge 9 commits into
base: Cocos3.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: objective-c

script:
- xctool -project PeevedPenguins.spritebuilder/PeevedPenguins.xcodeproj -scheme PeevedPenguins -sdk iphonesimulator build test CODE_SIGNING_REQUIRED=NO
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SequencerJoints</key>
<dict>
<key>hidden</key>
<false/>
<key>locked</key>
<false/>
</dict>
<key>UUID</key>
<integer>2</integer>
<key>centeredOrigin</key>
<false/>
<key>currentResolution</key>
Expand All @@ -14,12 +23,20 @@
<string>CocosBuilder</string>
<key>fileVersion</key>
<integer>4</integer>
<key>gridspaceHeight</key>
<integer>64</integer>
<key>gridspaceWidth</key>
<integer>64</integer>
<key>guides</key>
<array/>
<key>joints</key>
<array/>
<key>jsControlled</key>
<false/>
<key>nodeGraph</key>
<dict>
<key>UUID</key>
<integer>1</integer>
<key>animatedProperties</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -2207,7 +2224,7 @@
<key>memberVarAssignmentName</key>
<string></string>
<key>memberVarAssignmentType</key>
<integer>0</integer>
<integer>1</integer>
<key>properties</key>
<array>
<dict>
Expand Down Expand Up @@ -2286,8 +2303,6 @@
</array>
</dict>
</array>
<key>selected</key>
<true/>
</dict>
<key>notes</key>
<array/>
Expand Down Expand Up @@ -2360,8 +2375,46 @@
<integer>11</integer>
</dict>
</dict>
<dict>
<key>autoPlay</key>
<true/>
<key>callbackChannel</key>
<dict>
<key>keyframes</key>
<array/>
<key>type</key>
<integer>12</integer>
</dict>
<key>chainedSequenceId</key>
<integer>-1</integer>
<key>length</key>
<real>10</real>
<key>name</key>
<string>Untitled Timeline</string>
<key>offset</key>
<real>0.0</real>
<key>position</key>
<real>0.0</real>
<key>resolution</key>
<real>30</real>
<key>scale</key>
<real>128</real>
<key>sequenceId</key>
<integer>1</integer>
<key>soundChannel</key>
<dict>
<key>isExpanded</key>
<false/>
<key>keyframes</key>
<array/>
<key>type</key>
<integer>11</integer>
</dict>
</dict>
</array>
<key>stageBorder</key>
<integer>3</integer>
<key>stageColor</key>
<integer>2</integer>
</dict>
</plist>
Binary file not shown.
17 changes: 9 additions & 8 deletions PeevedPenguins.spritebuilder/PeevedPenguins.ccbproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<plist version="1.0">
<dict>
<key>cocos2dUpdateIgnoredVersions</key>
<array/>
<array>
<string>3.1.1</string>
</array>
<key>defaultOrientation</key>
<integer>0</integer>
<key>designTarget</key>
Expand All @@ -20,16 +22,14 @@
<integer>0</integer>
<key>engine</key>
<integer>0</integer>
<key>excludedFromPackageMigration</key>
<false/>
<key>exporter</key>
<string>ccbi</string>
<key>fileType</key>
<string>CocosBuilderProject</string>
<key>fileVersion</key>
<integer>1</integer>
<key>flattenPaths</key>
<false/>
<key>needRepublish</key>
<false/>
<key>onlyPublishCCBs</key>
<false/>
<key>publishAudioQuality_android</key>
Expand Down Expand Up @@ -70,7 +70,7 @@
<array>
<dict>
<key>path</key>
<string>SpriteBuilder Resources</string>
<string>Packages/SpriteBuilder Resources.sbpack</string>
</dict>
</array>
<key>resourceProperties</key>
Expand Down Expand Up @@ -176,8 +176,9 @@
</dict>
</dict>
<key>versionStr</key>
<string>Version: 1.1.0-rc
GitHub: 12746019b4
<string>revision : eea568a5c7
sku : default
version : 1.4.9
</string>
</dict>
</plist>
12 changes: 7 additions & 5 deletions PeevedPenguins.spritebuilder/Source/Gameplay.m
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ - (void)nextAttempt {

#pragma mark - Touch Handling

- (void)touchBegan:(UITouch *)touch withEvent:(UIEvent *)event {
- (void)touchBegan:(CCTouch *)touch withEvent:(CCTouchEvent *)event {
CGPoint touchLocation = [touch locationInNode:_contentNode];

// start catapult dragging when a touch inside of the catapult arm occurs
Expand All @@ -127,18 +127,20 @@ - (void)touchBegan:(UITouch *)touch withEvent:(UIEvent *)event {
}
}

- (void)touchMoved:(UITouch *)touch withEvent:(UIEvent *)event {


- (void)touchMoved:(CCTouch *)touch withEvent:(CCTouchEvent *)event {
// whenever touches move, update the position of the mouseJointNode to the touch position
CGPoint touchLocation = [touch locationInNode:_contentNode];
_mouseJointNode.position = touchLocation;
}

- (void)touchEnded:(UITouch *)touch withEvent:(UIEvent *)event {
// when touches end, release the catapult
- (void)touchEnded:(CCTouch *)touch withEvent:(CCTouchEvent *)event {
// when touches end, release the catapult
[self releaseCatapult];
}

- (void)touchCancelled:(UITouch *)touch withEvent:(UIEvent *)event {
- (void)touchCancelled:(CCTouch *)touch withEvent:(CCTouchEvent *)event {
// when touches are cancelled, release the catapult
[self releaseCatapult];
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>activeLanguages</key>
<array>
<string>en</string>
</array>
<key>fileType</key>
<string>SpriteBuilderTranslations</string>
<key>fileVersion</key>
<integer>1</integer>
<key>translations</key>
<array/>
</dict>
</plist>
Binary file not shown.
Loading