江战
eab43d947b
[3dgfx] sync #1921 websocket server impl ( #2859 )
...
* support websocket server (#1921 )
* add websocket server
* disable websocket server
2020-09-29 11:06:11 +08:00
江战
316558908e
reduce poll time ( #2353 ) ( #2853 )
2020-09-28 14:58:32 +08:00
江战
8f15489435
fix crash ( #2338 ) ( #2851 )
2020-09-28 14:53:51 +08:00
江战
382f0859f2
[bugfix] fix websocket crash on android 64 ( #2844 )
...
ASAN report error on android 64 devices
2020-09-28 10:35:09 +08:00
minggo
b08407c501
remove CC/cc prefix for file names ( #2728 )
2020-08-28 15:23:29 +08:00
minggo
4d889c7ae7
use CC_DEBUG instead ( #2718 )
2020-08-25 11:58:13 +08:00
minggo
7efee066fd
Remove duplicate ( #2597 )
2020-06-19 11:07:21 +08:00
minggo
d381a16142
change namespace from cocos2d to cc ( #2572 )
2020-06-16 14:34:46 +08:00
江战
4c2b647bba
remove CCPlatformConfig.h / 3d-gfx ( #2555 )
2020-06-12 11:17:37 +08:00
Arnold
ce1cd53386
[gfx] win32 adaptation ( #2270 )
...
* update for windows
* update ref location
* update external
* revert debug info
* fix include order
* fix template
* fix buffer
* remove CCStdC-win32*
2020-03-18 11:35:40 +08:00
minggo
e2728a7faa
Android issue ( #2209 )
...
* fix android compile error
* fix android crash
2020-02-28 10:53:11 +08:00
minggo
fb9c122827
Remove unneeded code ( #2193 )
...
* rmove unneeded codes
* fix compiling error
* remove unneeded file
* remove CCStdc related files
2020-02-26 16:11:32 +08:00
minggo
7ac05e123f
remove unneed codes ( #2180 )
2020-02-25 16:04:18 +08:00
minggo
adb387ada5
remove unneeded codes and fix jni implementation ( #2154 )
2020-02-20 12:03:14 +08:00
minggo
1bb0c717d0
fix macro redefine warning of platform defination ( #2099 )
2020-01-20 15:12:49 +08:00
Arnold
5502000bc6
prevent downloader callbacks when app exits ( #1763 )
2019-06-04 02:21:04 -07:00
Arnold
d88d4ffead
Use smart pointers to hold references of global Application::_scheduler ( #1732 )
...
* use std::weak_ptr
* revert build/libcocos2d.vcxproj
* fix mac & ios & android
* declare variable in if block
* revert build/libcocos2d.vcxproj
2019-04-25 18:43:01 +08:00
id-ilych
9303638190
WsThreadHelper::__defaultProtocols are not zeroed properly (#1723 )
2019-04-19 10:54:27 +08:00
吴智明
2f6b44a2fc
Change network module ( #1655 )
...
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for ios platform
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
Arnold
951869f9b9
[jsb] XMLHttpRequest & WebSocket API standardize ( #1557 )
...
* xmlhttprequest statusText exclude numeric code
* websocket bufferedBytes
* websocket extensions attribute
* add websocket close arguments
* responseXML
* fix ios compile
* responseType document
* getExtensions
* rollback change for responseXML
* fix arg 1005
* use const_cast instead of create tmp value
2018-10-23 11:57:23 +08:00
Jare Guo
caee68b1ff
Merge pull request #1490 from cocos-creator/v2.0-release
...
sync branch
2018-08-30 15:09:48 +08:00
W-MTZing
935a759cf4
rename c++ call java function by macro ( #1468 )
2018-08-22 14:07:17 +08:00
W-MTZing
e284a0efd1
rename jni function by macro ( #1467 )
...
* rename jni function by macro
* modify JNI macro name
2018-08-22 09:21:35 +08:00
Jare Guo
548ae4380d
Merge branch 'v2.0-release' into next
2018-08-16 14:05:09 +08:00
leda
19ab61b252
refine TODO & FIXME flag ( #1450 )
...
* change TODO to REFINE
* change REFINE:cjh to REFINE
* change FIXME to IDEA
* improve format
2018-08-10 12:52:00 +08:00
leda
55ea7b15e7
not output info level log when using NSLog ( #1438 )
2018-08-07 10:26:34 +08:00
Arnold
02813149b0
fix socket.io version detect error ( #1384 )
2018-07-24 17:42:25 +08:00
Arnold
ee19b6bcb5
Fix 7817
2018-07-13 18:09:31 +08:00
leda
723f52a472
win32 link/default template compile and link pass, but not works when run ( #1321 )
...
* modify file changes on project config
* correct libcocos2d compile
* add win32 props back
* Revert "fix windows link template (#1138 )"
This reverts commit 332d95e5b8 .
* correct compile error
* many link errors need to be solved
* added part lack methods
* add empty impl for canvas rendering context 2d
* update main.cpp
* correct audio/network compile and link error
* sync win32 application logic with mac
* remove wrong change on application-win32
* correct win32 default-template compile and link error
* win32 simulator part compile error fixed
* editbox define changes
2018-06-22 10:19:31 +08:00
Vincent Yang
8f6e9adbe1
[feature] CCDownloader add header and abort support. ( #1291 )
...
* [feature] android implement recieve http header param, handle it in android http request (#2 )
* [feature] Recieve http header param, handle it in android http request
* [feature] implement abort and header api
* /2.0 -> /2
* remove task when abort
* [feature] Implement ios and mac downloader abort api (#3 )
* [feature] Implement ios and mac downloader abort api
* use DLLOG to show log
* judge NSURLSessionTask state with NSURLErrorCancelled
* [adjust] Modify downloader from auto bind to manually (#4 )
* [adjust] Modify Downloader createDownloadFileTask api from auto bind to manually
* Modify ini file
* [bug] fix Cocos2dxDownloader.java syntax error
* [bug] CCDownloader-android creatCoTask don't deleteLocalRef header str
2018-06-07 22:19:03 +08:00
James Chen
a95dc1b889
jsb.loadImage supports to parse http URL and CCDownloader-android.cpp fix. ( #1269 )
...
* jsb.loadImage supports to parse http URL.
* CCDownloader-android.cpp fix.
2018-05-28 14:56:42 +08:00
minggo
0d483a9b07
add back network ( #1141 )
...
* add back network
* add network back on windows
2018-03-09 16:20:48 +08:00
minggo
c4c24c9d54
windows works with new renderer ( #1137 )
2018-03-07 14:31:46 +08:00
Jare Guo
d9bd3d763c
update license ( #1089 )
...
* updating license
* update license
2018-02-01 15:20:01 +08:00
James Chen
412f71a89b
[android] Fixes wrong timeout value is used. Should use timeout parameter per requrest instead of per client instance. ( #1014 )
2017-11-28 13:42:01 +08:00
James Chen
f8b9f8134c
bug fixs from #959 but except changes in CCSpriteBatchNode.cpp. ( #991 )
...
* bug fixs
* Reverts changes in CCSpriteBatchNode.cpp
2017-11-16 14:00:11 +08:00
James Chen
d904232f95
Uses shorter module name (cocos2dx_internal_static -> cis) to avoid compilation errors on Windows system which has a limitation of 260 bytes for build path. ( #979 )
...
Yep, probably, we could define `buildDir` variable in build.gradle, but let's investigate later.
2017-11-12 09:16:54 +08:00
James Chen
08b38745a0
. -> ,
2017-10-11 16:35:18 +08:00
James Chen
1764e440cd
Comments code of listening EVENT_RESET in WebSocket-libwebsockets.cpp since it isn't needed for JSB.
...
Minior fix: CCLOG -> LOGD in jsb_xmlhttprequest.cpp.
2017-10-11 16:33:02 +08:00
James Chen
8230176ccb
Fixes crash while click restart button in network test. ( #829 )
...
* Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921 ): remove "system" usage which is removed from iOS11.
* Fixes crash while click `restart` button in network test.
* printf -> LOGD
* Memory leak fix in XMLHttpRequest binding code.
2017-09-20 01:48:15 -05:00
James Chen
53e07c1da7
Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
2017-09-07 18:32:24 +08:00
James Chen
703e857352
Synchronize network changes from cocos2d-x.
2017-08-30 13:56:41 +08:00
James Chen
dc6ebc164a
websocket-apple.mm needs to be compiled as ARC enabled.
2017-08-28 11:17:45 +08:00
James Chen
7653cb453f
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/Android.mk
# cocos/editor-support/creator/CCCameraNode.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h
# cocos/network/SocketIO.cpp
# cocos/network/WebSocket-libwebsockets.cpp
# cocos/renderer/CCTextureCache.cpp
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp
# cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h
# cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp
# cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp
# cocos/scripting/js-bindings/manual/js_bindings_config.h
# cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.h
# cocos/scripting/js-bindings/manual/js_module_register.cpp
# cocos/scripting/js-bindings/manual/js_module_register.h
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h
# cocos/scripting/js-bindings/manual/jsb_helper.h
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.h
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.h
# cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.h
# cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp
# cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h
# cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
# cocos/scripting/js-bindings/proj.android/Android.mk
# cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
# cocos/scripting/js-bindings/script/jsb_boot.js
# tools/bindings-generator
# tools/tojs/cocos2dx.ini
# tools/tojs/genbindings.py
2017-08-10 18:04:24 +08:00
James Chen
675df73533
update HttpClient-android.cpp
2017-08-10 16:55:12 +08:00
James Chen
e86ed76abf
jsb2.0 windows works on v8.
2017-08-09 18:06:33 +08:00
James Chen
1a26f52b4c
cleanup.
2017-08-08 16:18:48 +08:00
James Chen
b398292431
Removes deprecated api for httprequest. cleanup xmlhttprequest.
2017-08-07 15:00:29 +08:00
James Chen
bff5521359
cleanup for android.
2017-07-21 17:53:01 +08:00
James Chen
900d04d5af
SocketIO memory leak while connecting to an invalid server url.
2017-07-21 11:50:29 +08:00