Commit Graph

34 Commits

Author SHA1 Message Date
boyu0 0a53a12f51 issue #2771: update project setting 2013-09-17 14:31:43 +08:00
boyu0 9f7bf4349c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-17 11:19:47 +08:00
boyu0 f96bc2355a issue #2771: update android.mk 2013-09-16 22:56:20 +08:00
CaiWenzhi d276bfc885 modify mk files 2013-09-16 22:15:29 +08:00
James Chen ff24eac21a [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08: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
chengstory e04a47b807 1. update mkfile. 2013-09-10 13:08:05 +08:00
Huabing.Xu f2fc710f86 issue #2782: shadertestSprite android make file 2013-09-10 09:32:03 +08:00
minggo 0131ecf705 add PerformanceAllocTest.cpp/h to Android.mk and linux project setting 2013-09-06 11:44:10 +08:00
boyu0 9e34aae075 closed #2434: Use the origin android.mk files instead use templates 2013-08-22 16:45:40 +08:00
boyu0 83f7835708 issue #2434: Delete unused method dirs and find_files in Android.mk template 2013-08-22 14:03:25 +08:00
boyu0 da566a3c16 issue #2434: add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
minggo 456b5af872 closed #2434:fixed path 2013-08-03 23:12:10 +08:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08: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
James Chen 1527c1b4c3 issue #2395: Updating TestCpp/Android.mk 2013-07-11 15:09:13 +08:00
James Chen 9946bc4f00 issue #2395: Adding Scale9SpriteTest for other platforms. 2013-07-11 14:13:01 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 522a091d72 Adding BaseTest in TestCpp for Android, emscripten, linux, nacl and marmalade. 2013-06-07 14:37:06 +08:00
yinkaile 10ed7ebdf4 merge newest version 2013-06-06 16:22:58 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB.
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-02 18:55:57 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
James Chen 731b3c2324 fixed #2215: Updating project configuration for other platforms after adding ConfigurationTest. 2013-05-23 10:09:35 +08:00
James Chen 42427634f2 fixed #2142: Adding datavisitor support for other platforms except win32. 2013-05-10 15:37:40 +08:00
minggo 806c728a2d add TexturePackerEncryptionTest into android, mac, linux, native client, marmalade project 2013-05-08 10:53:24 +08:00
minggo d40fdd24b7 fixed #2075:add SpiteTest into Android.mk 2013-04-26 14:02:13 +08:00
James Chen ef98d95e75 Updating project configuration of TestCpp for Android, Linux, Mac and nacl. 2013-03-19 16:59:39 +08:00
James Chen e736ed487f issue #1683: Adding default search path if developer didn't pass it. 2013-01-28 17:44:53 +08:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00