pandamicro
|
6ee33499b4
|
Update changelog and versions for v3.8 rc0
|
2015-08-22 11:56:25 +08:00 |
|
江龙
|
06ab98b0ac
|
improve the comment
|
2015-08-15 17:04:32 +08:00 |
|
jianglong0156
|
ae8332eb85
|
add NodeGrid bind
|
2015-08-14 17:46:34 +08:00 |
|
pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
|
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
|
pandamicro
|
6110700615
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
|
2015-07-23 15:25:33 +08:00 |
|
VisualSj
|
1496224c6d
|
Add cc.affineTransformConcatIn
|
2015-07-22 15:21:13 +08:00 |
|
pandamicro
|
e2068ab84a
|
Update versions and docs for v3.7
|
2015-07-16 16:53:43 +08:00 |
|
pandamicro
|
c126aac35f
|
v3.7 rc1 release doc
|
2015-07-14 23:21:34 +08:00 |
|
pandamicro
|
69cdaca306
|
Auto add extend to jsb need to extend classes
|
2015-07-10 09:49:39 +08:00 |
|
pandamicro
|
15c763d84a
|
Update engine version
|
2015-06-29 18:21:06 +08:00 |
|
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +08:00 |
|
Mykyta Usikov
|
355381e0d8
|
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
|
2015-05-27 11:25:04 +03:00 |
|
pandamicro
|
ef0854545b
|
Fix cc.EventMouse constants issue
|
2015-05-12 18:02:36 +08:00 |
|
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |