Arnold
81b1e904cd
SocketIO#emit/send support multiple parameters ( #18944 )
2018-07-18 13:41:12 +08:00
leeda
18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
James Chen
5c0c6d2e1e
More powerful Uri class, adds unit test for Uri class. Refactors some code in SocketIO & Websocket. ( #17472 )
...
* More powerful Uri class, adds unit test for Uri class. Refactores some code in SocketIO & Websocket.
* Adds missing header file stdint.h
* Exports Uri class
* Uri belongs to network group
* Updates the location of group comment
* Removes an unused include.
* Updates Uri comment.
2017-03-09 10:14:39 +08:00
James Chen
1c0e56efef
fixed #17416 : Wrong default port of SocketIO connection. ( #17459 )
...
Supports SSL connection for SocketIO.
Avoid memory corruption while disconnecting SocketIO, _ws->close() has to be at the end of ‘SIOClientImpl::disconnect()’.
2017-03-07 15:49:38 +08:00
CocosRobot
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
Wilson E. Alvarez
b672b94edc
Removed unnecessary assignments ( #17328 )
2017-02-09 10:57:01 +08:00
minggo
92704517bc
remove unneeded assignment ( #17320 )
2017-02-08 13:58:11 +08:00
mogemimi
aa9ce3ccb3
Fix implicit conversion warnings ( #17254 )
2017-02-04 10:38:22 +08:00
Wilson E. Alvarez
ca28af0113
Fixed variable order in initializer lists ( #17274 )
2017-02-04 10:33:58 +08:00
Wilson E. Alvarez
3056269531
Various small performance tweaks ( #16881 )
...
* These variables can be accessed by reference
* Assign values in initialization list
* _range can also be in initialization list
* Prefixed ++ and added 'auto' to loops
Also removed extra whitespace
* Prefixed ++/--, and changed for-loop implementation to use 'auto' on some loops
2016-11-22 09:54:04 +08:00
pyrosphere
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
James Chen
7e14812240
fixed #16492 : RapidJSON Crashes in Release mode on Android. ( #16792 )
...
* fixed #16492 : RapidJSON Crashes in Release mode on Android.
* Updates external/config.json
* json/filestream.h -> json/filereadstream.h
2016-11-04 09:36:59 +08:00
Wilson E. Alvarez
c0e1e91373
Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. ( #16716 )
...
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.
Other minor trivial changes were applied.
* Fixed Android compilation error
* Fixed windows-universal compilation error
2016-10-27 15:10:24 +08:00
Rubonnek
91efab2ba7
Fix memory leak caused by packetOut in SocketIO.cpp ( #16451 )
2016-08-29 19:22:38 -07:00
minggo
4c2234fe20
get correct control code
2016-07-22 14:30:06 +08:00
pandamicro
ea6a6a8586
Reverse include path in network module and update web engine
2016-05-25 23:58:11 +08:00
pandamicro
8692ee176c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/network/HttpAsynConnection-apple.m
cocos/network/HttpClient-android.cpp
cocos/network/HttpClient.cpp
cocos/network/HttpCookie.h
cocos/network/HttpRequest.h
cocos/network/HttpResponse.h
cocos/network/SocketIO.cpp
cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
pandamicro
a03c45ce62
Update network licenses and reformat
2016-05-18 14:29:54 +08:00
mogemimi
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
minggo
949112fdc2
Merge pull request #14321 from pandemosth/socketIO_issue_14287
...
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
Xpol Wan
dc0f7bf903
Fixes format warnings.
2016-04-18 17:52:58 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
mogemimi
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
Wenhai Lin
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
Pan Demosthenous
a4c4c64069
cleanup SIOClientImpl when an unexpected close happens
2015-11-05 13:08:33 +11:00
ZeroHackeR
4cfe139991
Fixing SocketIO - Connect failed after Disconnected
...
Fixes for issue: https://github.com/cocos2d/cocos2d-x/issues/14077
2015-10-06 13:21:22 +06:30
Chris Hannon
bd7f90f993
adds initializing value and corrects spelling of variable _endpointseparator
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:47:54 -04:00
Chris Hannon
e7c2436d85
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:31:48 -04:00
minggo
bbe5861367
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
2015-09-08 10:26:37 +08:00
andyque
7243f2cff5
add const & to string arguments
2015-07-09 11:23:20 +08:00
andyque
d4066a5ff8
improve coding style of Socket.IO
2015-07-08 17:23:48 +08:00
Chris Hannon
574cfb4ade
Merge branch 'v3-update-sio' of https://github.com/hannon235/cocos2d-x into merge-up
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
Conflicts:
cocos/network/SocketIO.cpp
2015-06-02 21:11:43 -04:00
Chris Hannon
fe6275adf5
[v3-update-sio] fixes nested switch brackets - best practice would be to replace these with functions in the future
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
Chris Hannon
6bcf325630
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
Chris Hannon
5af28838d2
[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:33 -04:00
WenhaiLin
461241839d
Fixed compile error on visual studio 2015.
2015-05-12 17:04:56 +08:00
Chris Hannon
da74d1be93
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-04-24 00:17:43 -04:00
Chris Hannon
e1923f3dbf
[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-04-24 00:17:43 -04:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
Jason Xu
42c374157d
CC_CALLBACK_2 not std::bind directly
2014-04-25 17:32:21 +08:00
Jason Xu
5cc483276b
use new ccHttpRequestCallback.
2014-04-25 17:15:57 +08:00
James Chen
ae2027ea53
Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
2014-03-24 17:59:44 +08:00
James Chen
e075b82dfe
tab -> 4 spaces, whitespace cleanup.
2014-03-24 17:58:35 +08:00
Chris Hannon
ba37c07053
[add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code
...
-update static connect method to match JS API, kept original method but marked deprecated
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2014-03-21 11:45:14 -04:00
James Chen
757425c54b
issue #4165 : Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.
2014-03-03 11:00:30 +08:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00