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 |
|
2youyouo2
|
bc8c5c1bee
|
add xxtea support
|
2017-09-27 16:03:07 +08:00 |
|
Jare Guo
|
1ea2fc1715
|
revert TextureCache, use ThreadPool instead
|
2017-09-26 10:18:01 +08:00 |
|
James Chen
|
101b763c0f
|
Fixes compilation errors after merging develop branch.
|
2017-08-11 09:29:39 +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
|
e719caa583
|
updates android.mk
|
2017-08-10 16:55:40 +08:00 |
|
pandamicro
|
7194ea7611
|
Fix android gen libs issue
|
2017-07-06 16:01:35 +08:00 |
|
pandamicro
|
450ad5b4d5
|
Add cocos ui static dependency
|
2017-07-05 11:34:53 +08:00 |
|
pandamicro
|
99206af737
|
Remove useless module and preprocess macros
|
2017-07-04 16:35:17 +08:00 |
|
James Chen
|
05a893a08b
|
printf -> LOGD
|
2017-06-23 13:44:18 +08:00 |
|
2youyouo2
|
d6ab74a55e
|
support physics on android
|
2017-03-10 10:01:36 +08:00 |
|
zhangbin
|
4a1ecf17ac
|
Solve the error when building android platform.
|
2017-01-09 13:33:47 +08:00 |
|
zhangbin
|
ed591faa19
|
Merge branch 'develop' into dragonbones
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# external/config.json
|
2016-09-08 09:52:09 +08:00 |
|
pandamicro
|
86ae89f85f
|
Fix win32 compilation issues
|
2016-09-01 10:38:54 +08:00 |
|
zhangbin
|
1f9d49dbfe
|
Update the project files for dragon bones.
|
2016-08-30 14:22:50 +08:00 |
|
pandamicro
|
1c01a9df2c
|
Fix android compilation issuse
|
2016-08-26 19:01:13 +08:00 |
|
pandamicro
|
6713fd2d11
|
Fix js-bindings project compilation issues
|
2016-08-15 19:08:58 +08:00 |
|
pandamicro
|
1dd701936b
|
Fix compilation issues on Mac
|
2016-08-11 13:57:51 +08:00 |
|
zhangbin
|
e9d4652c31
|
Add TiledMap for the HEX orientation maps.
|
2016-07-11 17:53:52 +08:00 |
|
Wenhai Lin
|
43e89ca5fa
|
Fixed warns
|
2016-04-27 13:55:14 +08:00 |
|
2youyouo2
|
ce4f78f312
|
add creator files
|
2016-04-13 15:35:27 +08:00 |
|
Wenhai Lin
|
a6dbf31dcf
|
cocos 2d lite version
|
2016-03-29 17:55:48 +08:00 |
|