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
|
29208156d9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-01 13:23:21 +00:00 |
CocosRobot
|
90d578c6e5
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-01 02:16:33 +00:00 |
CocosRobot
|
0851363532
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-31 02:06:41 +00:00 |
CocosRobot
|
b167d29a80
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:27:28 +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
|
f1adc2ffd2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 03:39:17 +00:00 |
CocosRobot
|
bd867311f1
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-29 20:42:46 +00:00 |
CocosRobot
|
8c642d966f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-29 07:45:19 +00:00 |
CocosRobot
|
ac7729332a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 10:39:16 +00:00 |
CocosRobot
|
c8f2514758
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 09:21:06 +00:00 |
CocosRobot
|
d9b5ce8d28
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:17:29 +00:00 |
CocosRobot
|
e986aac617
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:14:03 +00:00 |
dualface
|
bd39247192
|
Add Luabinding conversions for std::map<std::string, std::string>
|
2015-07-26 07:40:34 +08:00 |
CocosRobot
|
f7fced7b70
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 05:40:05 +00:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
Ricardo Quesada
|
2deb492d36
|
compiles and runs on Xcode 7
|
2015-07-23 14:28:23 -07:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
CocosRobot
|
6630157377
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 04:40:43 +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
|
8442fe5f89
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 06:04:17 +00:00 |
CocosRobot
|
be71b6d563
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-15 08:23:23 +00:00 |
CocosRobot
|
4b418fe823
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-15 05:46:42 +00:00 |
CocosRobot
|
6b9a5b8264
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-14 05:41:48 +00:00 |
子龙山人
|
e1ae3631fc
|
Merge pull request #12818 from zilongshanren/v3
merge v3.7 back to v3
|
2015-07-14 13:32:56 +08:00 |
andyque
|
ef5d4ddf86
|
Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-07-14 11:24:38 +08:00 |
Vincent Yang
|
0a6933cc8c
|
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
|
2015-07-14 10:46:17 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08: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
|
8b50c307e5
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 09:35:35 +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
|
bfe6db174e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 01:07:59 +00:00 |
CocosRobot
|
9638ae628a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-08 05:48:55 +00:00 |
pandamicro
|
8f0cf8c3e6
|
Merge pull request #12575 from ywxzm/v3
fix onTouch begin don't return value
|
2015-07-07 14:57:13 +08:00 |
CocosRobot
|
4a486077c0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 06:05:39 +00:00 |
CocosRobot
|
4c88db3fb2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 00:44:47 +00:00 |
CocosRobot
|
a4bce56cca
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 10:37:24 +00:00 |
CocosRobot
|
ae860bd6ee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 08:29:03 +00:00 |
CocosRobot
|
fbf98adc7a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 14:48:11 +00:00 |
CocosRobot
|
91dc2d22de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 10:37:33 +00: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 |
CocosRobot
|
bf3c970534
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-01 14:12:18 +00:00 |
zhang
|
48c3466774
|
Update LayerEx.lua
|
2015-07-01 20:25:45 +08:00 |
Bin Zhang
|
bb77101f0b
|
Solve the error when building simulator for android.
|
2015-06-30 16:45:13 +08:00 |
zhang
|
43ea04da3c
|
fix onTouch begin don't return value
fix only receive "begin" envent,can't receive "moved" "ended"
|
2015-06-28 13:18:33 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |