Commit Graph

11661 Commits

Author SHA1 Message Date
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
Chris Hannon 126ebb888c Implements a socket.io client extension, adds a test case and updates the android makefiles.
Contains the following tasks:
-initial socket.io extension commit
-sioclientimpl subclasses websocket:delegate to respond to websocket events
-implement static connect methods and basic client creation
-move SocketIO class files into correct extension folder (network)
-create SocketIO test in TestCpp
-update project references
-add missing static modifier to connect method
-implement basic test methods
-update extensions tests with SocketIO test entry
-implement basic handshake and opensocket methods for SocketIO
-add Delegate class to handle callbacks, implement virtual Delegate methods in test
-implement socket and client registries for lookup when connecting to hosts and endpoints
-connect delegate onOpen method by separating impl creation from connection
-update test to demonstrate onOpen callback
-create send and emit methods, move SIOClient into header file, add send and emit methods to test
-implement basic socket.io message parsing
-improve logging for events and messages
-add logic to pull event name from payload
-schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety
-add onConnect handler to to catch socket.io onconnect vs websocket onopen
-add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects
-modify SIOClientImpl to track _uri for easier lookup in registries
-connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code
-create SIOEvent callback type, implement event registry in clients, add test for event registration and callback
-update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed
-check for connect before sending or emitting in the client, cleanup some codes
-change connect logic to reuse existing socket connections instead of opening a new one
-implements get and set Tag methods for clients for easy reference
-improve endpoint handling, add endpoint tests to test layer
-additional error handling within socket disconnect error and failure to open connection
-fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method
-add disconnect and onClose handlers to client so that onClose is called in the delegate
-add disconnect test methods to test layers
-change c-style casts to static_casts when using a CCDICT_FOREACH
-remove some unneeded namespace completion
-add usage documentation
-add handling for disconnect from server, cleanup some codes
-update comments and documentation in the socketiotest
-update includes so the NDK doesn't complain when compiling with c++11
-add socketio.cpp and test.cpp to the android makefiles
-update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2013-07-11 17:41:42 -04:00
carlo morgantini 002ae77698 new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
James Chen cfc12d780c Update AUTHORS [ci skip] 2013-07-11 17:11:18 +08:00
James Chen d4a683aeb5 Merge pull request #3133 from dumganhar/pktangyue-patch1
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3097
2013-07-11 02:09:37 -07:00
James Chen 3c64bc8972 issue #2396: Updating Scale9SpriteTest.cpp. 2013-07-11 17:08:09 +08:00
James Chen 093d9a507c closed #2396: indentation fix. 2013-07-11 17:07:41 +08:00
samuele3hu ea0a19e7a2 issue #2377:Adjust tab and space 2013-07-11 16:49:29 +08:00
samuele3hu c4de89870a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-11 16:43:25 +08:00
samuele3hu 81ad976eed issue #2377:Remove registerNotificationHandler function 2013-07-11 16:42:11 +08:00
minggo c37af8fa77 issue #2393:mark functions in CCPointExtensions deprecated 2013-07-11 16:38:58 +08:00
James Chen 285c2440b7 Merge branch 'patch1' of https://github.com/pktangyue/cocos2d-x into pktangyue-patch1 2013-07-11 16:18:59 +08:00
pktangyue 5e8de73061 add S9FrameNameSpriteSheetRotatedSetCapInsetLater test 2013-07-11 16:09:07 +08:00
pktangyue 8f7d9093c9 Merge remote-tracking branch 'origin/develop' into patch1 2013-07-11 16:08:46 +08:00
James Chen 886a0b2b81 Merge pull request #3126 from natural-law/develop
Resolve the bug in plugin tools
2013-07-11 00:54:25 -07:00
James Chen e4286fd98e Merge pull request #3131 from dumganhar/develop
Minor fix in BezierTo::initWithDuration and BezierTo::clone.
2013-07-11 00:47:28 -07:00
James Chen a5470aaa45 Minor fix in BezierTo::initWithDuration and BezierTo::clone. 2013-07-11 15:41:05 +08:00
James Chen f7b6e692ca Merge pull request #3130 from dumganhar/develop
Minor fix of PR 3128.
2013-07-11 00:37:38 -07:00
James Chen f414803e92 Minor fix of PR 3128. 2013-07-11 15:36:00 +08:00
James Chen 103b184be0 Merge pull request #3129 from dumganhar/iss2395-s9sprite-test
closed 2395: Adding Scale9SpriteTest for TestCpp
2013-07-11 00:30:20 -07:00
James Chen 227afc37b9 Merge branch 'iss2395-s9sprite-test' of https://github.com/dumganhar/cocos2d-x into iss2395-s9sprite-test 2013-07-11 15:10:27 +08:00
James Chen 1527c1b4c3 issue #2395: Updating TestCpp/Android.mk 2013-07-11 15:09:13 +08:00
James Chen ab4e9749b6 issue #2395: [Win32] Updating TestCpp project configuration 2013-07-11 14:17:43 +08:00
James Chen 9946bc4f00 issue #2395: Adding Scale9SpriteTest for other platforms. 2013-07-11 14:13:01 +08:00
James Chen ad95ba4894 closed #2395: Adding Scale9SpriteTest for TestCpp 2013-07-11 14:07:14 +08:00
James Chen 2e9d727466 issue #2395: Removing unused codes in ActionTest.h. 2013-07-11 14:00:26 +08:00
James Chen 5727d7099b issue #2395: Scale9Sprite's default anchor point is center now. 2013-07-11 13:59:57 +08:00
samuele3hu ff29d2b5d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-11 13:40:16 +08:00
samuele3hu 9007b9feee issue #2377:Replace the CallFunc script Handler and repair Testlua Bug 2013-07-11 13:38:25 +08:00
James Chen b2c0d17aeb Merge pull request #3122 from dumganhar/iss2389-http-cookie
closed 2389: Adding cookie support for HttpClient
2013-07-10 18:37:29 -07:00
minggo 4a8f45bb83 Merge pull request #3128 from ricardoquesada/copy_deprecated
re adds copy() as a deprecated method
2013-07-10 18:36:20 -07:00
Ricardo Quesada 48b1ed9f8f re adds copy() as a deprecated method
...in order to make easier the port to v3.0
2013-07-10 18:11:37 -07:00
carlo morgantini 9264b3de1d more clean up 2013-07-10 11:59:05 -07:00
zhangbin ae9dbd26ce issue #2390, Resolve the bug in file plugin/tools/toolsForGame/modifyClassPath.py. 2013-07-10 16:21:16 +08:00
minggo 9262af69f2 [ci skip] 2013-07-10 16:01:39 +08:00
minggo bbaa938cf7 Merge pull request #3121 from tks2shimizu/develop
Add append function for String class.
2013-07-10 00:58:43 -07:00
minggo df53e5235c Merge pull request #3125 from dabingnn/Iss2386-ClippingNode-AsChild-Bug
closed issue #2386 : ClippingNode works wrongly when being set as a child
2013-07-10 00:54:44 -07:00
minggo 630937aa3d Merge pull request #3124 from dumganhar/rename-method
issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime).
2013-07-10 00:49:58 -07:00
James Chen 3af6f6fe58 enableCookies is static method now 2013-07-10 15:46:01 +08:00
zhangbin 80e6480dc7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-10 15:35:36 +08:00
James Chen 9b887e64a8 Update .travis.yml 2013-07-10 15:34:29 +08:00
zhangbin 54995745cf closed #2390, Resolve the bug plugin/tools/config.sh. 2013-07-10 15:34:29 +08:00
Huabing.Xu 010a33c009 closed issue #2386 : Fix bug : add a new method to clear the stencil buffer bit used by ClippingNode 2013-07-10 15:33:43 +08:00
James Chen 146914b288 Merge pull request #3123 from pyrasis/tizen_2.2
Support Tizen 2.2 SDK
2013-07-10 00:15:31 -07:00
samuele3hu 31d0e492c2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-10 15:05:02 +08:00
samuele3hu cf1cbe1bd6 issue #2377:add scriptHandlerMgr and modify ActionManager.lua 2013-07-10 15:04:00 +08:00
James Chen d830bb5f96 'tile' --> 'getTile', 'orignalTile' --> 'getOrignalTile' 2013-07-10 14:17:42 +08:00
James Chen a6db6db334 issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime). 2013-07-10 14:16:42 +08:00
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK.
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
minggo 91fc0b2a45 Merge pull request #3114 from dumganhar/iss2388-default-texture
closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked.
2013-07-09 21:03:20 -07:00