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 |
jianglong0156
|
5d281d45ef
|
recover the physics3DShape initHeightfield api
|
2015-08-01 18:29:48 +08:00 |
jianglong0156
|
bcec599993
|
Merge branch 'v3' into constructedWith3D_3#12404
|
2015-08-01 15:38:26 +08:00 |
pandamicro
|
d52a5da1d8
|
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
Constructed with3d
|
2015-08-01 10:09:08 +08:00 |
jianglong0156
|
80e812e5a0
|
add Physics3DShape support constructor
|
2015-07-31 18:17:35 +08:00 |
jianglong0156
|
113233b8df
|
add Camera support constructor
|
2015-07-30 18:00:51 +08:00 |
pandamicro
|
507a094653
|
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
improve jsval_to_physics3DRigidBodyDes
|
2015-07-30 17:58:16 +08:00 |
jianglong0156
|
52ed2e8d4e
|
add conversion function declare, use to the physics3d auto conversion the data
|
2015-07-30 14:56:24 +08:00 |
jianglong0156
|
a1a9e281a3
|
add conversion cpp file into iOS project (reverted from commit 439bc8a99f )
|
2015-07-30 14:37:58 +08:00 |
Ricardo Quesada
|
642ccac5dc
|
Merge pull request #12927 from ricardoquesada/spine-2.3
Adds support for Spine runtime 2.3
|
2015-07-29 13:33:15 -07:00 |
jianglong0156
|
f71f9b2b15
|
improve the code
|
2015-07-28 16:32:56 +08:00 |
pandamicro
|
3fa9463ec7
|
Fix manual bindings for changed API in spine
|
2015-07-28 15:11:20 +08:00 |
jianglong0156
|
ec4d53fcf7
|
add 3d conversion
|
2015-07-28 10:08:58 +08:00 |
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
pandamicro
|
29b9ed685f
|
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 15:48:34 +08:00 |
pandamicro
|
6110700615
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
|
2015-07-23 15:25:33 +08:00 |
pandamicro
|
85d4ce0d5a
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
|
2015-07-21 11:39:24 +08:00 |
pandamicro
|
e2068ab84a
|
Update versions and docs for v3.7
|
2015-07-16 16:53:43 +08:00 |
pandamicro
|
949eca2846
|
Improve some manual binding code
|
2015-07-16 14:34:14 +08:00 |
pandamicro
|
490d5a3747
|
Remove cleanup from auto bindings add made it support override in JS
|
2015-07-16 14:09:26 +08:00 |
pandamicro
|
436564f922
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
docs/RELEASE_NOTES.md
web
|
2015-07-15 14:39:40 +08:00 |
pandamicro
|
c126aac35f
|
v3.7 rc1 release doc
|
2015-07-14 23:21:34 +08:00 |
pandamicro
|
efffea5b91
|
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 15:35:29 +08:00 |
andyque
|
91dfb07a8c
|
add more descriptive message to ASSET macro.
|
2015-07-14 15:28:36 +08:00 |
pandamicro
|
69cdaca306
|
Auto add extend to jsb need to extend classes
|
2015-07-10 09:49:39 +08:00 |
andyque
|
6238ddebf3
|
Merge remote-tracking branch 'upstream/v3.7-release' into v3
|
2015-07-07 10:18:43 +08:00 |
pandamicro
|
1f48beee1e
|
Reorganize code
|
2015-07-03 12:55:55 +08:00 |
pandamicro
|
155b9b918c
|
Add retain/release for XMLHTTPReqest in JSB
|
2015-07-03 11:01:43 +08:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
Shin Hirota
|
221d33a431
|
Fixed iOS/JS-Bind callStaticMethod() with bool arg
|
2015-06-30 14:00:28 +09:00 |
pandamicro
|
15c763d84a
|
Update engine version
|
2015-06-29 18:21:06 +08:00 |
江龙
|
7ff383e4d2
|
add the return value
|
2015-06-23 20:27:30 +08:00 |
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +08:00 |
pandamicro
|
c6d4f283bb
|
Fix compilation issue in navmesh conversion
|
2015-06-19 08:11:45 +08:00 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +08:00 |
江龙
|
61db9ef103
|
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
|
2015-06-18 23:21:53 +08:00 |
pandamicro
|
b757837239
|
Move NavMesh to jsb namespace
|
2015-06-18 22:57:41 +08:00 |
pandamicro
|
10a8adad53
|
Change physics3d api to jsb namespace
|
2015-06-18 20:39:40 +08:00 |
jianglong0156
|
4fe1542d17
|
add navmesh tests
|
2015-06-18 19:22:27 +08:00 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
pandamicro
|
3ffc0e6be6
|
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
|
2015-06-18 09:20:37 +08:00 |
pandamicro
|
a94b49bdef
|
Add nav mesh bindings
|
2015-06-17 23:41:12 +08:00 |
pandamicro
|
85e8a407b1
|
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
|
2015-06-17 19:58:24 +08:00 |
samuele3hu
|
683812d817
|
Update Physics3D test for js.
|
2015-06-17 18:50:55 +08:00 |
jianglong0156
|
b265033a41
|
add testcase and manual bindings
|
2015-06-17 18:38:18 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
Hao Wu
|
b4ca8c1489
|
Merge pull request #15 from pandamicro/spritepolygon
Add SpritePolygon JSB bindingsJSB bindings
|
2015-06-15 15:47:02 +08:00 |
pandamicro
|
852b9b42b9
|
Remove jsb_cocos2dx_experimental_manual
|
2015-06-15 10:46:57 +08:00 |
pandamicro
|
032f231ed4
|
Add bindings for AutoPolygon and PolygonInfo
|
2015-06-13 11:14:57 +08:00 |