Commit Graph

13529 Commits

Author SHA1 Message Date
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
James Chen b02d2f1274 [dispatcher] Comments keypad event for lua bindings. Need to be fixed. 2013-09-12 21:12:46 +08:00
James Chen 3605fce2e3 [dispatcher] Comments self->setTouchPriority. Need to be fixed. 2013-09-12 21:12:20 +08:00
James Chen 57b0a66bda [dispatcher] Removing Layer::setTouchPriority since it's not needed. 2013-09-12 21:11:47 +08:00
James Chen c90291e01d ScrollView::_touches is std::vector now, so it should not be inited by NULL pointer. 2013-09-12 21:02:30 +08:00
James Chen 1702cbd7b2 [dispatcher] Other platforms update. 2013-09-12 20:56:57 +08:00
James Chen dd57d6321b [dispatcher] Updating Makefile. 2013-09-12 20:51:44 +08:00
James Chen 6f37529236 [dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private. 2013-09-12 20:47:15 +08:00
James Chen 06bc92ff19 [dispatcher] Removing unused listeners after dispatching event. 2013-09-12 20:45:35 +08:00
James Chen fb12c90238 [dispatcher] Using temporary std::vector in handleTouchXXXX. 2013-09-12 20:43:09 +08:00
James Chen ea74c30895 [Dispatcher] Updating ios/CCDevice.mm. 2013-09-12 20:41:59 +08:00
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
James Chen f6faf58f2e [Dispatcher] Updating Log message in CCAccelerationEventListener.cpp. 2013-09-12 16:03:30 +08:00
James Chen 6a2536b5bd [Dispatcher] Fixing logic errors in CCScrollView after using EventDispatcher. 2013-09-12 16:03:03 +08:00
James Chen b77cac8731 [Dispatcher] Fixing touch bindings for JSB. 2013-09-12 16:02:16 +08:00
James Chen 891bcba459 [Dispatcher] Reverting Touch, it should be inherited from Object for JSB. 2013-09-12 16:01:49 +08:00
James Chen 1c7287dd59 [Dispatcher] Updating license of CCEventListener.cpp. 2013-09-12 16:01:14 +08:00
James Chen ce52997fc2 [Dispatcher] Updating tools/tojs/.ini 2013-09-12 15:34:14 +08:00
James Chen 5d95711865 [EventDispatcher] Fixing compilation error after changing of Touch(It doesn't inherit from Object). 2013-09-12 14:42:56 +08:00
James Chen 6623879f6d [EventDispatcher] Refactoring Touch, Touch doesn't inherit from Object now. Using std::vector<Touch*> to dispatch event and a little performance improved. 2013-09-12 14:26:39 +08:00
James Chen 7071240e30 [EventDispatcher] Remove unused file(CCTouchDispatcher) reference in CCEGLView.mm. 2013-09-12 14:24:30 +08:00
Huabing.Xu b1b192ce70 closed #2782: shadertestSprite remove blank line 2013-09-12 10:31:14 +08:00
Huabing.Xu 53ffedc558 issue #2782: shadertestSprite add lensFlare Sprite Test Case 2013-09-12 10:25:55 +08:00
Bruno Assarisse 636c3d1dfc TMX map polyline parse 2013-09-11 20:36:53 -03:00
Siim Kallas 4e1e69e873 Fixed compilation on VC12 (VS2013 RC), std::min and std::max require <algorithm> 2013-09-11 19:00:48 +03:00
James Chen b798535f14 [win32] Removing CCAccelerometer.cpp. 2013-09-11 22:31:17 +08:00
James Chen da1101beeb [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
James Chen a0db624e66 Merge pull request #3576 from CocosRobot/updategeneratedsubmodule_1378893493
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
2013-09-11 02:58:54 -07:00
CocosRobot a812aa9cb2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-11 09:58:16 +00:00
James Chen 2603e4acf4 Merge pull request #3540 from samuele3hu/TableView
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
2013-09-11 02:52:38 -07:00
samuele3hu 7c62509b02 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-11 09:50:31 +08:00
samuele3hu 29f0909714 issue #2768:Add LuaObjectBridge and LuaJavaBridge 2013-09-11 09:48:24 +08:00
boyu0 d161c6a576 issue #2771: Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest() 2013-09-10 17:41:06 +08:00
boyu0 7bba5f1b01 issue #2771: Add method Scene::createWithPhysics() end Scene::initWithPhysics() 2013-09-10 17:38:47 +08:00
boyu0 bcab90ddc4 issue #2771: Change CC_USE_PHYSICS_ENGINE to CC_USE_PHYSICS. Add some implements. 2013-09-10 17:36:49 +08:00
minggo c07556fdfb Merge pull request #3570 from chengstory/#4551
#4551
2013-09-10 01:55:52 -07:00
chengstory bdfde89ef8 Merge branch '#develop' into #4551
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-09-10 16:25:31 +08:00