Commit Graph

5564 Commits

Author SHA1 Message Date
walzer f1b87ef0e9 fix bugs in CCDictionary::objectForKey(int/string) 2012-10-04 09:03:22 +08:00
walzer 16afe5b616 fix bugs in CCDictionary & platform/win32/CCImage.cpp::setFont, according to BitWave's codereview. 2012-10-02 22:30:27 +08:00
folecr abcb6b33a7 set -x in build script so that entire command line is available in the build log 2012-10-01 11:58:46 -07:00
folecr 2f5613595b Helper script to launch this application via ndk-gdb 2012-10-01 11:58:45 -07:00
minggo 9d9f69186e Update AUTHORS 2012-09-29 15:39:38 +08:00
minggo 6b9affae65 Merge pull request #1402 from Horcruxes/patch-1
Update cocos2dx/platform/ios/CCFileUtils.mm
2012-09-29 00:35:35 -07:00
minggo 936cb19684 Merge pull request #1405 from dualface/complete_delete_ccdirector
Complete delete CCDirector after called CCDirector::purgeDirector()
2012-09-28 19:20:36 -07:00
Walzer 586f5100de Merge pull request #1414 from walzer/gles20
fixed #1492, assert if user add an CCObject* into CCAutoreleasePool twice.
2012-09-28 03:23:17 -07:00
walzer 0cca568ffe fixed #1492, assert if user add an CCObject* into CCAutoreleasePool twice. 2012-09-28 18:22:00 +08:00
Walzer 3c7994b19f Merge pull request #1413 from walzer/gles20
add iOS 5.0, 6.0 build targets to jenkins_scripts
2012-09-27 21:00:54 -07:00
walzer 418fa5301a add iOS 5.0, 6.0 build targets to jenkins_scripts 2012-09-28 12:00:03 +08:00
Walzer f781931ee5 Merge pull request #1412 from walzer/gles20
update javascript/bindings/generated/ submodule revision pointer
2012-09-27 19:30:14 -07:00
walzer d6ba2b44c4 update javascript/bindings/generated/ submodule revision pointer 2012-09-28 10:29:21 +08:00
Walzer b4230648cd Merge pull request #1411 from walzer/gles20
update doxygen config for v2.0.3
2012-09-27 19:28:51 -07:00
walzer f4c8c3bf7a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-28 10:19:23 +08:00
minggo fc2ba4730f Merge pull request #1410 from folecr/jsbindings_audioengine
Add JavaScript bindings for CocosDenshion SimpleAudioEngine
2012-09-27 18:57:32 -07:00
folecr 5859260b25 Update to latest generated bindings 2012-09-27 13:39:49 -07:00
folecr f1aff597a2 Update makefile to include CocosDenshion 2012-09-27 13:39:49 -07:00
folecr d57842bec5 Generate bindings for CocosDenshion's SimpleAudioEngine
* Bindings configured to rename SimpleAudioEngine to AudioEngine
2012-09-27 13:39:49 -07:00
walzer 2f779a3a27 update doxygen config 2012-09-27 14:06:39 +08:00
Walzer c07f6ae272 Merge pull request #1403 from walzer/gles20
add landscape orientation setting to TestJavascript Xcode proj.
2012-09-26 19:59:55 -07:00
walzer dcbf450cb3 add landscape orientation setting to TestJavascript Xcode prom. 2012-09-27 10:58:48 +08:00
Horcruxes cb66f1673e Update cocos2dx/platform/ios/CCFileUtils.mm
fixing cannot read data using CCArray::createWithContentsOfFile
2012-09-27 12:31:53 +10:00
Walzer bfa71ebdf5 Merge pull request #1400 from walzer/gles20
fix compilation error in xcodebuild command line mode, which are caused by ios6 compatibility
2012-09-26 19:29:53 -07:00
walzer d18eecf247 UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets 2012-09-27 10:28:00 +08:00
minggo 216a47ab1b Merge pull request #1401 from folecr/gles20
Ignore userconf.ini when running from jenkins
2012-09-26 18:24:10 -07:00
folecr c8d108d350 Ignore userconf.ini when running from jenkins 2012-09-26 10:49:02 -07:00
walzer edaf22f14d fix xcode4 templates compilation error for xcodebuild command line mode, caused by ios6 compatibility. 2012-09-27 00:46:09 +08:00
walzer c9772c76ec fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums 2012-09-27 00:44:40 +08:00
Walzer 70e16a5835 Update AUTHORS 2012-09-26 19:31:01 +08:00
James Chen 7bb2e183da Merge pull request #1398 from dumganhar/gles20
Updated win32 template.
2012-09-26 02:57:17 -07:00
James Chen 6f6dd5daea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-26 17:55:44 +08:00
James Chen e4b428a875 Updated win32 template. 2012-09-26 17:55:18 +08:00
minggo 50cce4f399 Merge pull request #1397 from minggo/gles20
modify xcode project to include correct files
2012-09-26 02:13:53 -07:00
minggo f3e2a385e1 modify xcode project to include correct files 2012-09-26 17:12:57 +08:00
James Chen 16f77f6f53 Merge pull request #1396 from dumganhar/gles20
Reverted CCNotificationCenter.cpp.
2012-09-26 01:28:59 -07:00
James Chen 0d8e7deb10 Reverted CCNotificationCenter.cpp. 'object' and 'target' should not be retained. We must use weak reference, otherwise the life-cycle of target object will be delayed until the destruction of CCNotificationCenter. 2012-09-26 16:25:13 +08:00
minggo ff66536c30 Merge pull request #1395 from minggo/gles20
update AUTHORS and CHANGELOG
2012-09-26 01:05:44 -07:00
minggo 25d3f4215f update AUTHORS and CHANGELOG 2012-09-26 16:04:22 +08:00
James Chen 4add2e806a Merge pull request #1394 from dumganhar/gles20
A memory leak fix in CCNotificationCenter.
2012-09-26 00:52:41 -07:00
James Chen a4e04d70c9 A memory leak fix in CCNotificationCenter. 2012-09-26 15:51:14 +08:00
James Chen caf7b2a0e4 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-26 15:50:01 +08:00
James Chen 48a5ed22c8 Merge pull request #1379 from jzgenius/fix_CCNotificationObserver_performSelector
fixed #1485: [1] The parameters 'target' and 'object' in the constructor of CCNotificationObserver needs to be retained;
[2] perform m_object to performSelector target.
2012-09-26 00:47:28 -07:00
James Chen 28e1813353 Merge pull request #1393 from dumganhar/gles20
Fixed some compilation errors for linux platform.
2012-09-26 00:34:19 -07:00
minggo 5c026c5285 Merge pull request #1392 from minggo/gles20
update CHANGELOG
2012-09-26 00:33:16 -07:00
minggo 1e950ed445 update CHANGELOG 2012-09-26 15:31:32 +08:00
James Chen b48b329517 Removed js185-1.0.1.tar.gz. 2012-09-26 15:28:32 +08:00
James Chen 0ca7e00700 fixed some compilation errors for linux platform. 2012-09-26 15:23:10 +08:00
jzgenius 0517372557 add CC_SAFE_RETAIN into constructor of CCNotificationObserver. 2012-09-26 14:10:52 +08:00
James Chen 38eb0ad4fc Merge pull request #1390 from dumganhar/gles20
Updated samples/TestCpp/proj.linux/Makefile.
2012-09-25 23:07:56 -07:00