Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,366 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

9366 Commits

Author SHA1 Message Date
James Chen 3e3932077a Merge pull request #2782 from natural-law/develop 
Update the flurry SDK version.
 2013-06-06 00:10:16 -07:00
James Chen 3a3db53894 Merge pull request #2785 from dumganhar/develop 
Sync some fixes from master branch
 2013-06-06 00:09:21 -07:00
James Chen d32eaedd59 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 
Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
 2013-06-06 15:05:54 +08:00
James Chen a539f69d63 [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x. 2013-06-06 15:02:57 +08:00
James Chen 1a5e9f3717 Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite. 2013-06-06 15:02:57 +08:00
James Chen 5c592943db [Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp. 2013-06-06 15:02:57 +08:00
James Chen cb08479b7e Log error instead of triggering an assert for shadow and stroke. 2013-06-06 15:02:57 +08:00
James Chen 9a26376b1f Adding libwebsockets license in WebSocket.h/.cpp. 2013-06-06 15:02:57 +08:00
James Chen a8ed579f9e Merge pull request #2778 from ricardoquesada/dealloc_log_fixed 
on dealloc, log "this" with %p, not %x.
 2013-06-05 22:00:16 -07:00
zhangbin 8ee57d551f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-06 11:29:30 +08:00
zhangbin 9e7765477b Update the flurry SDK version. 2013-06-06 11:28:45 +08:00
James Chen 42c9abd69e Merge pull request #2779 from dumganhar/develop 
[Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey.
 2013-06-05 19:17:31 -07:00
James Chen 3c69a17752 [Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey. 2013-06-06 10:12:44 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x. 
Also adds %p where it was missing.
And make a few fixes on the iOS project
 2013-06-05 18:21:05 -07:00
Ricardo Quesada 3441ca5563 MenuItemToggle is fixed 
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
 2013-06-05 17:51:40 -07:00
James Chen 8a54af1699 Merge pull request #2775 from CocosRobot/updategeneratedsubmodule_1370437282 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-05 06:04:59 -07:00
CocosRobot 8c6d6e9ef8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-05 13:01:25 +00:00
James Chen 5c1e5c871a Merge pull request #2773 from dumganhar/ricardoquesada-menuitem_function_callback 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/2756
 2013-06-05 05:56:32 -07:00
James Chen a5263673fb Fixing compilation errors on Android. 2013-06-05 19:56:23 +08:00
James Chen 1bb73e50df Fixing a warning in Bug-458.cpp 2013-06-05 18:18:59 +08:00
James Chen 2d81a66444 [Linux] Don't treat the warning of deprecated-declarations as error. 2013-06-05 17:48:04 +08:00
James Chen cda02af1e7 Using CC_DEPRECATED_ATTRIBUTE to mark functions as deprecated. Don't bind CCMenuItem::setCallback automatically. 2013-06-05 17:35:19 +08:00
James Chen dc8cfeb648 Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback 2013-06-05 16:40:25 +08:00
James Chen 7c2ce0da64 Merge pull request #2766 from dumganhar/jsb-delegate-crash-develop 
fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
 2013-06-04 23:58:56 -07:00
James Chen e4a8cad3c2 Updating cocos2dx_extension.ini 2013-06-05 14:56:06 +08:00
James Chen 5d92a98287 fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash. 2013-06-05 14:55:13 +08:00
James Chen 47c8205e39 issue #2143: Adding CCEditBox::getDelegate. 2013-06-05 14:55:13 +08:00
James Chen 3acdb327fb Merge pull request #2760 from natural-law/develop 
Add plugin weibo for iOS on branch develop
 2013-06-04 20:23:26 -07:00
zhangbin 457942f05b Update the license in the sample code. 2013-06-05 11:19:54 +08:00
zhangbin d947da8dce Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-05 10:32:44 +08:00
zhangbin 828158d009 Update the JS binding code of plugin. 2013-06-05 10:30:44 +08:00
zhangbin b2ef2ac916 fixed #2254 : Add sample code for plugin weibo on iOS. 2013-06-05 10:30:44 +08:00
zhangbin 7b00055d9e issue #2254 : Add plugin weibo for iOS. 2013-06-05 10:30:43 +08:00
James Chen 669c4d22b6 Merge pull request #2758 from dumganhar/ricardoquesada-configuration_set_value-develop 
Merge PR #2728 and minor fix.[develop]
 2013-06-04 19:20:03 -07:00
James Chen 993070b27e Minor fix in CCConfiguration. 2013-06-05 09:47:29 +08:00
Ricardo Quesada d27da88c06 Adds setObject to CCConfiguration 
also adds the test

Conflicts:
	scripting/javascript/bindings/generated
 2013-06-05 09:46:56 +08:00
minggo 823cffb1d2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-05 09:30:08 +08:00
Ricardo Quesada 609801e900 compiles on linux and other machines without C99 support 2013-06-05 09:29:27 +08:00
Ricardo Quesada 4b37ec252a Adds C++11 std::function<> support to MenuItem 
Updates some of the tests
 2013-06-04 18:29:26 -07:00
Ricardo Quesada 9b305a60d1 cc_timeval works on 64bit machines, like OS X 2013-06-05 09:29:12 +08:00
James Chen 0c76516a1a Merge pull request #2744 from ricardoquesada/testmenu_sorted 
Testmenu sorted
 2013-06-04 18:27:08 -07:00
Ricardo Quesada 337f966d0f It was using an clang extension for tuples<> 
Instead of converting it to pairs<>, which is compatible with gcc,
I converted it to C structs.
 2013-06-04 10:03:32 -07:00
Ricardo Quesada f22092c7fc Merge branch 'develop' into testmenu_sorted 2013-06-04 09:53:49 -07:00
James Chen 2ee96f81e1 Merge pull request #2752 from dumganhar/template-fix-develop 
Updating multi-platform-xxx template for iOS and Mac. [develop]
 2013-06-04 05:57:38 -07:00
James Chen bb635c280c Updating multi-platform-xxx template for iOS and Android after enabling c++ 11. 2013-06-04 20:52:29 +08:00
James Chen b88a222fc5 Updating multi-platform-xxx template for iOS and Mac. 2013-06-04 20:37:24 +08:00
James Chen c678664085 Update AUTHORS [ci skip] 2013-06-04 17:12:13 +08:00
James Chen 7b98808aa7 Merge pull request #2640 from sunxiaoyu/patch-1 
fixed #2253: Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
 2013-06-04 02:08:42 -07:00
James Chen b27524adfe Merge pull request #2745 from dumganhar/update-spine-runtime-develop 
fixed #2252: Updating spine-runtime to the latest version. [develop]
 2013-06-04 00:39:49 -07:00
minggo d63a7d9b30 Merge pull request #2644 from longlene/develop 
correct the library path
 2013-06-04 00:14:12 -07:00