Ricardo Quesada
|
d589e44b0a
|
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
Load anchor points from plist files
|
2016-01-13 15:58:02 -08:00 |
CocosRobot
|
b5141a28bd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-18 13:28:14 +00:00 |
Joachim Grill
|
98079b49e8
|
updated javascript bindings
|
2015-12-15 11:18:32 +01:00 |
CocosRobot
|
8cb2ec6187
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-15 04:31:50 +00:00 |
CocosRobot
|
71f9ead981
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-11 17:52:29 +00:00 |
Ricardo Quesada
|
aebfefd7a8
|
Merge branch 'v3' into js_more_conversions
|
2015-12-04 19:01:20 -08:00 |
Ricardo Quesada
|
cd8631ef09
|
sfunction "create" uses new optimized code
...although this code should never be called
|
2015-12-04 18:42:31 -08:00 |
CocosRobot
|
d5e54bdb81
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-04 09:48:13 +00:00 |
CocosRobot
|
d09eae92f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-04 07:13:02 +00:00 |
CocosRobot
|
3edadc035b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-03 21:34:13 +00:00 |
CocosRobot
|
b1fd2277d8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-03 07:53:26 +00:00 |
CocosRobot
|
0c67171b9d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-02 02:05:32 +00:00 |
CocosRobot
|
e891b03eee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-01 04:32:19 +00:00 |
CocosRobot
|
5c9084fd7d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-27 09:41:59 +00:00 |
CocosRobot
|
4ccc6ce5de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-11 06:53:45 +00:00 |
CocosRobot
|
09cbc2145d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-28 03:29:16 +00:00 |
CocosRobot
|
35f7f3cb2f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-27 09:29:42 +00:00 |
CocosRobot
|
6a0e1b323f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-20 02:42:17 +00:00 |
CocosRobot
|
b082620d85
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-27 15:24:49 +00:00 |
CocosRobot
|
0af77fca90
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-21 08:35:18 +00:00 |
CocosRobot
|
37cb9afb3f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 14:04:49 +00:00 |
CocosRobot
|
79a7878687
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 07:41:46 +00:00 |
CocosRobot
|
19561ca84b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-15 06:32:52 +00:00 |
CocosRobot
|
cfe0be269b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-10 10:14:45 +00:00 |
CocosRobot
|
a78f5e3dcc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 02:23:01 +00:00 |
CocosRobot
|
6b6c6b242c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-21 06:44:25 +00:00 |
CocosRobot
|
9a6c779580
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-21 03:59:12 +00:00 |
CocosRobot
|
9b003c9cfc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-14 03:34:30 +00:00 |
CocosRobot
|
ef41cb27ca
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-11 08:02:58 +00: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 |
CocosRobot
|
c0d6ec1946
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 16:30:01 +00:00 |
CocosRobot
|
56b58a5839
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:50:00 +00:00 |
CocosRobot
|
ef7318cf00
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 09:23:06 +00:00 |
CocosRobot
|
7a73c65208
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 05:53:20 +00:00 |
CocosRobot
|
c8f2514758
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 09:21:06 +00: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 |
CocosRobot
|
0a23e4a305
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-20 07:08:12 +00:00 |
CocosRobot
|
f2567f498c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 08:22:58 +00:00 |
CocosRobot
|
9e60713322
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 14:41:58 +00:00 |
CocosRobot
|
300da3e3fc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 12:57:03 +00:00 |
CocosRobot
|
0e8a3f14f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-10 09:11:50 +00:00 |
CocosRobot
|
2065e5b4a7
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 07:45:43 +00:00 |
CocosRobot
|
9638ae628a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-08 05:48:55 +00:00 |
CocosRobot
|
ae860bd6ee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 08:29:03 +00:00 |
CocosRobot
|
91dc2d22de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 10:37:33 +00:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
CocosRobot
|
55c7de75e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 06:48:41 +00:00 |
CocosRobot
|
8ec924c206
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-15 05:46:51 +00:00 |
CocosRobot
|
94a47fabcf
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-11 06:16:36 +00:00 |
CocosRobot
|
835e56e80a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 23:13:03 +00:00 |