Commit Graph

4907 Commits

Author SHA1 Message Date
signmotion 5dffb1b44e Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
minggo 0fe28b7410 Merge pull request #3617 from boyu0/bug2745_after_PerformanceTextureTest_render_error
closed #2745: fix bug: _dataLen not set at Image::initWithString() and I...
2013-09-16 03:08:40 -07:00
minggo 061004901d Merge pull request #3619 from minggo/develop
[ci skip]set default projection to 3d
2013-09-16 03:03:01 -07:00
minggo 4d4933728e Merge pull request #3615 from boyu0/bug2815_Texture2DTest_crash
closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it d...
2013-09-16 03:02:04 -07:00
minggo 13f83a084e set default projection to 3d 2013-09-16 18:01:16 +08:00
boyu0 c726765b4a closed #2745: fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke() 2013-09-16 17:13:44 +08:00
CaiWenzhi 4843046d17 Merge GUI to develop step 1; 2013-09-16 17:12:15 +08:00
James Chen 0121d3033b Merge pull request #3614 from dumganhar/iss2087-new-event-dispatcher
issue #2087: [EventDispatcher] Comment fixes. Adding a new test. Event priority fix, the lower value, the higher priority.
2013-09-16 01:52:16 -07:00
James Chen 501ed32973 issue #2087: [dispatcher] Fix of the listener of specified type is null. 2013-09-16 16:40:47 +08:00
James Chen abf834731a issue #2087: [dispatcher] Making Node::updateEventPriorityIndex to inline function. 2013-09-16 16:39:59 +08:00
boyu0 8d7d653031 closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it doesn't copy the previous unpacked data into new memory when malloced memory is not enough. 2013-09-16 16:22:52 +08:00
James Chen 60645a6702 issue #2087: [dispatcher] Changes event priority. The lower value is, the higher priority will be gotten. 2013-09-16 15:45:56 +08:00
minggo 27381fc83f Merge pull request #3562 from bassarisse/develop
Win32 icons on template
2013-09-15 23:44:11 -07:00
James Chen 16b13ce522 issue #2087: [dispatcher] Updating some comments for new event dispatcher. 2013-09-16 14:43:57 +08:00
James Chen 050de08b8f issue #2087: [dispatcher] Node::getEventPriority is a private method now. 2013-09-16 14:43:07 +08:00
minggo 2a315e53b8 Merge pull request #3402 from j4m3z0r/develop-emscripten
Port my variant of font-rendering over to dev branch -- adds correct ali...
2013-09-15 22:52:33 -07:00
minggo f47ce3f5bc Merge pull request #3607 from samuele3hu/developTest
Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions
2013-09-15 22:45:32 -07:00
minggo e4f8929898 Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement
Issue 2808 glfw bug enhancement
2013-09-15 20:18:02 -07:00
minggo 81a26d44f6 Merge pull request #3596 from dumganhar/new-event-dispatcher-rename
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
2013-09-15 20:13:51 -07:00
samuele3hu faed7a3d36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-16 10:54:55 +08:00
samuele3hu a3a915ead2 Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions 2013-09-16 10:54:12 +08:00
James Chen 3b798317d4 [dispatcher] Some performance improves. Using std::for_each and range loop, and removing unneeded std::map::find. 2013-09-16 10:44:24 +08:00
James Chen 3e01dd5edf [dispatcher] Using std::vector instead of std::list for EventListenerItem container. 2013-09-15 21:58:54 +08:00
James Chen bfdc2a0efe [dispatcher] Adding argument for whether to sort listeners when dispatching events. 2013-09-15 18:25:44 +08:00
James Chen 23e80857fa [dispatcher] Defines TOUCH_PERF_DEBUG to enable setting touches in TouchEvent. 2013-09-15 17:49:09 +08:00
James Chen 499e8caf7a [dispatcher] Updating the declare of event listeners in Layer. Using more specified type. 2013-09-15 17:48:29 +08:00
James Chen d940e01bc1 [dispatcher] Supporting changing priority from fixed value to node or from node to fixed value. 2013-09-15 12:17:01 +08:00
James Chen 1b9658f5ad [dispatcher] Adding Node::dissociateEventListener method. 2013-09-15 12:14:48 +08:00
Keita Obo e0b13e8836 Disable log output on release build 2013-09-15 13:07:58 +09:00
James Chen 8102272b15 [dispatcher] Updating comments of EventDispatcher, renaming some functions and some performance improves when dispatching event. 2013-09-15 11:07:27 +08:00
Huabing.Xu 9440aa7a99 issue #2808: refractor setFrameZoomFactor() access, change init() parameter (linux windows version) 2013-09-14 22:48:14 +08:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +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
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 2fd655dc57 [dispatcher] Using cocos2d-x memory model instead of std::shared_ptr. It should be unified. 2013-09-13 18:00:56 +08: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 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
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
James Chen cb7d090992 [dispatcher] Updating CCDevice.cpp for linux. 2013-09-12 21:39:47 +08:00
James Chen 57b0a66bda [dispatcher] Removing Layer::setTouchPriority since it's not needed. 2013-09-12 21:11:47 +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 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 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
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
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 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
boyu0 bd10d92460 issue #2771: Add macros to control use physics engine or not 2013-09-10 14:15:19 +08:00
chengstory 669de88e73 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
boyu0 862a3bd6a4 issue #2771: Fix CI compile errors. 2013-09-10 10:06:51 +08:00
boyu0 0806c5fe15 issue #2771: Fix CI compile errors. 2013-09-09 17:13:59 +08:00
boyu0 6585fd2162 issue #2771: Fix CI compile errors. 2013-09-09 16:58:55 +08:00
boyu0 cb08f2baf2 issue #2771: Change _physicsBody from node to sprite. Reimplement Scene::addChild. Adjust some API. 2013-09-09 16:36:19 +08:00
minggo c5b113c35e Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements
Fileutils perf improvements
2013-09-08 19:50:12 -07:00
boyu0 dce205f688 issue #2771: add new line to the end of line. 2013-09-09 10:40:31 +08:00
boyu0 a6f9533a94 issue #2771: add Node::_physicsBody to Node init list 2013-09-09 10:34:03 +08:00
boyu0 1d47737f45 issue #2771: add physics files and entries. 2013-09-09 10:29:02 +08:00
James Chen b8c82ae5a9 [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
Ricardo Quesada 487f65af2e Replaces `Dictionary` with `std::unordered_map`
I did some performance tests, and `std::unordered_map` is more performant than `Dictionary`.

I need to do more tests, but so far, the results are good.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:55:11 -07:00
Ricardo Quesada 7d8261c722 Optimization + standardization in FileUtils
Since `FileUtils` was using `std::string` internally, it is more efficient to accept `const std::string &` as parameter than `char *` to avoid the creation of unneeded strings.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:54:08 -07:00
Ricardo Quesada 028deae846 Adds const in FileUtils
`const` was missing in some getters

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:52:55 -07:00
Ricardo Quesada 2d2e15d275 Key should start with '/' to gain performance
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:51:47 -07:00
Ricardo Quesada 3a0e957e9e compatible with cocos2d c++ guidelines 2013-09-06 19:02:24 -07:00
Ricardo Quesada bf6750067f little optimization.
string is created when needed
2013-09-06 19:00:12 -07:00
Ricardo Quesada b2a81b5b86 Removes some Hungarion notation...
...and improves performance in FileUtils: String is not created
2013-09-06 18:46:33 -07:00
Ricardo Quesada ef622b23bd lazy alloc component container
faster and less memory
2013-09-06 16:00:24 -07:00
Ricardo Quesada b78382d5e5 Performance improvements in FileUtils / TextureCache
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
2013-09-06 15:33:28 -07:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
samuele3hu 32d056df18 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView 2013-09-04 14:03:21 +08:00
samuele3hu 6815e01f84 issue #2764:Add TableView lua binding and releated test sample 2013-09-04 14:02:22 +08:00
minggo 9dedb072e6 Merge pull request #3528 from natural-law/ForPlugin
Modify the method cocos_android_app_init()
2013-09-03 22:50:40 -07:00
Ricardo Quesada ee638b9c8b removes 'private' section from SpriteBatchNode 2013-09-02 16:56:14 -07:00
Ricardo Quesada 088a11ad0d Little performance improvements in SpriteBatchNode
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
2013-09-02 16:44:25 -07:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
Huabing.Xu bc5ae78423 issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00