Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates Chipmunk to v6.1.2

Chipmunk is a git submodule now
  • Loading branch information...
commit 7984c0e32aecf3e45c44499df70b0e559d66f729 1 parent 8604479
Ricardo Quesada ricardoquesada authored
3  .gitmodules
View
@@ -13,3 +13,6 @@
[submodule "tests/CocosDragonJS"]
path = tests/CocosDragonJS
url = git://github.com/ricardoquesada/CocosDragonJS.git
+[submodule "external/Chipmunk"]
+ path = external/Chipmunk
+ url = git://github.com/slembcke/Chipmunk-Physics.git
2  CHANGELOG
View
@@ -52,6 +52,8 @@ version 2.1-beta3 xx-Oct-2012
Chipmunk API is compatible with Chipmunk-JS
CocosBuilder Reader supports "outlets", Animation callbacks, and improved JSB API
Better registration code
+. [3RD] Chipmunk: Updated to v6.1.2.
+ Chipmunk is a git submodule now.
. [3RD] CocosBuilder Reader: Updated to v2.1
. [3RD] SpiderMonkey: Updated to v17-beta
Added armv7s support
2  CocosDenshion/TestsAndDemos/DrumPad/DenshionDemo.m
View
@@ -460,8 +460,6 @@ -(void) onQuit: (id) sender
{
[[CCDirector sharedDirector] end];
- if( [[UIApplication sharedApplication] respondsToSelector:@selector(terminate)] )
- [[UIApplication sharedApplication] performSelector:@selector(terminate)];
}
@end
2  cocos2d-ios.xcodeproj/project.pbxproj
View
@@ -19129,6 +19129,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
external/kazmath/include,
@@ -19167,6 +19168,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
external/kazmath/include,
2  cocos2d-osx.xcodeproj/xcshareddata/xcschemes/ChipmunkTest.xcscheme
View
@@ -44,7 +44,7 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
+ buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
1  external/Chipmunk
@@ -0,0 +1 @@
+Subproject commit 14b5a4f5185295258ee9bdfa13a6a42f9b3a1943
3  install-templates.sh
View
@@ -100,7 +100,8 @@ copy_box2d_files(){
copy_chipmunk_files(){
echo ...copying Chipmunk files
- copy_files external/Chipmunk "$LIBS_DIR"
+ copy_files external/Chipmunk/src "$LIBS_DIR"/Chipmunk
+ copy_files external/Chipmunk/include "$LIBS_DIR"/Chipmunk
copy_files LICENSE_Chipmunk.txt "$LIBS_DIR"
}
6 templates/Xcode4_templates/cocos2d OS X with Box2d.xctemplate/HelloWorldLayer.mm
View
@@ -40,10 +40,10 @@ -(id) init
// enable events
#ifdef __IPHONE_OS_VERSION_MAX_ALLOWED
- self.isTouchEnabled = YES;
- self.isAccelerometerEnabled = YES;
+ self.touchEnabled = YES;
+ self.accelerometerEnabled = YES;
#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED)
- self.isMouseEnabled = YES;
+ self.mouseEnabled = YES;
#endif
CGSize s = [CCDirector sharedDirector].winSize;
6 templates/Xcode4_templates/cocos2d OS X with Chipmunk.xctemplate/HelloWorldLayer.m
View
@@ -49,10 +49,10 @@ -(id) init
// enable events
#ifdef __CC_PLATFORM_IOS
- self.isTouchEnabled = YES;
- self.isAccelerometerEnabled = YES;
+ self.touchEnabled = YES;
+ self.accelerometerEnabled = YES;
#elif defined(__CC_PLATFORM_MAC)
- self.isMouseEnabled = YES;
+ self.mouseEnabled = YES;
#endif
CGSize s = [[CCDirector sharedDirector] winSize];
4 templates/Xcode4_templates/cocos2d iOS with Box2d.xctemplate/HelloWorldLayer.mm
View
@@ -52,8 +52,8 @@ -(id) init
// enable events
- self.isTouchEnabled = YES;
- self.isAccelerometerEnabled = YES;
+ self.touchEnabled = YES;
+ self.accelerometerEnabled = YES;
CGSize s = [CCDirector sharedDirector].winSize;
// init physics
6 templates/Xcode4_templates/cocos2d iOS with Chipmunk.xctemplate/HelloWorldLayer.m
View
@@ -49,10 +49,10 @@ -(id) init
// enable events
#ifdef __CC_PLATFORM_IOS
- self.isTouchEnabled = YES;
- self.isAccelerometerEnabled = YES;
+ self.touchEnabled = YES;
+ self.accelerometerEnabled = YES;
#elif defined(__CC_PLATFORM_MAC)
- self.isMouseEnabled = YES;
+ self.mouseEnabled = YES;
#endif
CGSize s = [[CCDirector sharedDirector] winSize];
24 templates/Xcode4_templates/lib_chipmunk.xctemplate/TemplateInfo.plist
View
@@ -373,28 +373,6 @@
<key>TargetIndices</key>
<array/>
</dict>
- <key>libs/Chipmunk/LICENSE.txt</key>
- <dict>
- <key>Group</key>
- <array>
- <string>libs</string>
- <string>Chipmunk</string>
- </array>
- <key>Path</key>
- <string>libs/Chipmunk/LICENSE.txt</string>
- <key>TargetIndices</key>
- <array/>
- </dict>
- <key>libs/Chipmunk/README.textile</key>
- <dict>
- <key>Group</key>
- <array>
- <string>libs</string>
- <string>Chipmunk</string>
- </array>
- <key>Path</key>
- <string>libs/Chipmunk/README.textile</string>
- </dict>
<key>libs/Chipmunk/src/chipmunk.c</key>
<dict>
<key>Group</key>
@@ -790,8 +768,6 @@
<string>libs/Chipmunk/include/chipmunk/cpSpace.h</string>
<string>libs/Chipmunk/include/chipmunk/cpSpatialIndex.h</string>
<string>libs/Chipmunk/include/chipmunk/cpVect.h</string>
- <string>libs/Chipmunk/LICENSE.txt</string>
- <string>libs/Chipmunk/README.textile</string>
<string>libs/Chipmunk/src/chipmunk.c</string>
<string>libs/Chipmunk/src/CMakeLists.txt</string>
<string>libs/Chipmunk/src/constraints/cpConstraint.c</string>
Please sign in to comment.
Something went wrong with that request. Please try again.