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

12765 Commits

Author SHA1 Message Date
2youyou2 2213e8118d fix armature hd crash 2013-09-14 23:31:33 +08:00
Huabing.Xu 9440aa7a99 issue #2808: refractor setFrameZoomFactor() access, change init() parameter (linux windows version) 2013-09-14 22:48:14 +08:00
zhangcheng 841ea4cfdd 1. change 480*320 to 960*640. 2013-09-14 20:52:35 +08:00
zhangcheng 95236e86d9 1. update scenetest version. 2013-09-14 20:49:02 +08:00
samuele3hu 95831eb70f issue #2768:Add a newline 2013-09-14 20:00:26 +08:00
yinkaile 5e1f91d396 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 
Conflicts:
	extensions/CocoStudio/Armature/CCArmature.h
	extensions/CocoStudio/Armature/CCBone.h
	extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
	extensions/CocoStudio/Armature/animation/CCProcessBase.h
	extensions/CocoStudio/Armature/animation/CCTween.h
	extensions/CocoStudio/Armature/datas/CCDatas.h
	extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
	extensions/CocoStudio/Armature/display/CCDisplayManager.h
	extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
	extensions/CocoStudio/Armature/physics/CCColliderDetector.h
	extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
	extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
	extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
 2013-09-14 19:54:49 +08:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
samuele3hu aa4c90e97a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	extensions/cocos-ext.h
 2013-09-14 19:29:36 +08:00
zhangcheng acf9754814 1. add supported for 480*320 on scenetest. 2013-09-14 19:03:15 +08:00
zhangcheng 0121943c11 1. Adds SceneEditorTest hd version 2013-09-14 16:34:26 +08:00
James Chen 1ed980d27c [dispatcher] Updating win32 TestCpp.vcxproj. 2013-09-14 10:32:37 +08:00
James Chen 997a5a36c1 [dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'. 2013-09-14 09:02:49 +08:00
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 2013-09-13 19:06:09 +08:00
James Chen 6b0d365d91 Merge pull request #3593 from CocosRobot/updategeneratedsubmodule_1379068245 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-13 03:53:35 -07:00
James Chen dd55822465 [dispatcher] Updating NewEventDispatcherTest.cpp. 2013-09-13 18:51:00 +08:00
minggo 438d041167 Merge pull request #3592 from Dhilan007/develop 
Add icon for IOS 7.
 2013-09-13 03:43:20 -07:00
CocosRobot 585f3b081e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-13 10:30:50 +00:00
minggo 4dac164ec8 Merge pull request #3591 from samuele3hu/doxygen 
issue #2784:Add js-binding and lua-binding document
 2013-09-13 03:24:07 -07:00
Huabing.Xu 0af0951c35 issue #2808: refractor setFrameZoomFactor() access, change init() parameter 2013-09-13 18:21:12 +08:00
Huabing.Xu 86306a842d issue #2808: 1. retina support 2. frameZoomFactor 2013-09-13 18:09:11 +08:00
James Chen ff24eac21a [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
yinkaile 74bd8b09d6 update armature 2013-09-13 18:07:37 +08:00
James Chen cf66992b51 [dispatcher] Updating HelloWorldScene.cpp, if you wish to using the same listener for different target, please invoke clone to create a new one. 2013-09-13 18:02:26 +08:00
James Chen 7729756d04 [dispatcher] Updating EventDispatcherTest.cpp. 2013-09-13 18:01:32 +08:00
James Chen 2fd655dc57 [dispatcher] Using cocos2d-x memory model instead of std::shared_ptr. It should be unified. 2013-09-13 18:00:56 +08:00
Dhilan007 ab21e84f2a Add icon for IOS 7. 2013-09-13 18:00:17 +08:00
minggo 9c259823e1 Merge pull request #3590 from Dhilan007/develop 
issue #2800:Can not hide status bar on iOS 7
 2013-09-13 02:12:30 -07:00
Huabing.Xu 5f1e5c505c issue #2808: when move window, set OpenGL viewport again 2013-09-13 17:11:35 +08:00
samuele3hu d8bd65b2e8 issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
James Chen 51548b9542 Adding NewEventDispatcher Test. 2013-09-13 16:38:21 +08:00
James Chen 40c410b78d file mode changed, cocos2d.h from 100755 -> 100644 2013-09-13 16:37:47 +08:00
James Chen 490c74fd99 Unneeded cast fix. 2013-09-13 16:37:19 +08:00
James Chen 1f0a883dbd [dispatcher] Checking whether the listener was registered. 2013-09-13 16:36:54 +08:00
James Chen 72c978f9fb [dispatcher] Adding clone method for listener class. 2013-09-13 16:36:25 +08:00
James Chen 838b059b45 [dispatcher] Adding (s|g)etCurrentTarget for Event. 2013-09-13 16:34:34 +08:00
Dhilan007 b827162113 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 16:18:58 +08:00
Dhilan007 18f2f831b4 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 16:07:02 +08:00
Dhilan007 5350b1ad06 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 15:54:58 +08:00
samuele3hu 1d4d1f251c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 
Conflicts:
	cocos2dx/label_nodes/CCLabel.h
 2013-09-13 14:04:22 +08:00
samuele3hu 5ddd9ae23c issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
minggo fd92708d16 Merge pull request #3588 from minggo/label-best-practice 
fixed #2793:best practice of New Label
 2013-09-12 22:29:56 -07:00
minggo c4cb2582cc fixed #2793:best practice of New Label 2013-09-13 11:46:46 +08:00
samuele3hu 3a334b7478 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 2013-09-13 11:42:04 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
minggo d74adcf5e4 Merge pull request #3587 from Dhilan007/develop 
Fix not hide status on ios7
 2013-09-12 19:31:42 -07:00
LinWenhai 368d668e7b Update RootViewController.mm 
fix not hide status on ios7
 2013-09-13 09:42:26 +08:00
LinWenhai 644c3ebff5 Update RootViewController.h 
Fix not hide status bar on iOS 7
 2013-09-13 09:40:43 +08:00
James Chen 9e144f32fa Merge pull request #3580 from seemk/vc12_fix 
Fixed compilation on VC12 (VS2013 RC)
 2013-09-12 07:19:13 -07:00
James Chen c948a67243 [dispatcher] Updating SimpleGame. 2013-09-12 22:12:58 +08:00
James Chen cb7d090992 [dispatcher] Updating CCDevice.cpp for linux. 2013-09-12 21:39:47 +08:00