Ricardo Quesada
|
292987d393
|
Merge pull request #12987 from MSOpenTech/v3-win10-fix
V3 win10 fix
|
2015-07-23 13:54:03 -07:00 |
Dale Stammen
|
72427a0a64
|
updated version to 3.8
|
2015-07-23 12:46:47 -07:00 |
Dale Stammen
|
f91e812924
|
updated version to 3.8
|
2015-07-23 12:40:36 -07:00 |
Dale Stammen
|
6669fec648
|
added missing bug test
|
2015-07-23 12:34:37 -07:00 |
pandamicro
|
a78d55a897
|
Merge pull request #12980 from CocosRobot/update_cocosfiles_1437646359
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-23 18:48:42 +08:00 |
CocosRobot
|
cbf830196b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-23 10:12:40 +00:00 |
pandamicro
|
5f57fa942f
|
Merge pull request #12802 from ZhangMenghe/pageTurnDown
Page turn down
|
2015-07-23 18:10:53 +08:00 |
pandamicro
|
8be726211c
|
Merge pull request #12974 from pandamicro/autoExtend
Auto add extend to jsb need to extend classes
|
2015-07-23 18:04:03 +08:00 |
pandamicro
|
f96d26c46a
|
Merge pull request #12975 from CocosRobot/update_cocosfiles_1437636951
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-23 15:39:34 +08:00 |
pandamicro
|
bd1f5b4a39
|
Merge pull request #12911 from natural-law/portrait-support
Fixed #12252 : Support new portrait projects from templates.
|
2015-07-23 15:38:32 +08:00 |
CocosRobot
|
7241f72f47
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-23 07:35:52 +00:00 |
pandamicro
|
88df2137a5
|
Merge pull request #12959 from martell/makepkg
fix building with system prebuilt libs
|
2015-07-23 15:33:58 +08:00 |
pandamicro
|
6110700615
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
|
2015-07-23 15:25:33 +08:00 |
Vincent Yang
|
57943b41b1
|
Fixed #12145 : formarRenderers in RichText doesn’t update container size.
|
2015-07-23 14:59:24 +08:00 |
pandamicro
|
3c3a5a6057
|
Merge pull request #12971 from yangws/issue_12918
[ci skip] Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have…
|
2015-07-23 11:22:57 +08:00 |
Vincent Yang
|
19c8f337da
|
Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors
|
2015-07-23 11:01:51 +08:00 |
Ricardo Quesada
|
d6dc1e3e7a
|
Merge pull request #12964 from ricardoquesada/bug12847_improved
improves the test to reproduce bug 12847
|
2015-07-22 16:26:08 -07:00 |
Ricardo Quesada
|
b2b9bad83d
|
improves the test to reproduce bug 12847
|
2015-07-22 15:08:36 -07:00 |
pandamicro
|
eb7d991fad
|
Merge pull request #12957 from CocosRobot/update_cocosfiles_1437553156
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-22 22:24:23 +08:00 |
Martell Malone
|
9d7598dad2
|
fix building with system prebuilt libs
|
2015-07-22 14:19:22 +01:00 |
CocosRobot
|
ac9d65f3f7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-22 08:19:17 +00:00 |
pandamicro
|
6029ca3edd
|
Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 16:17:14 +08:00 |
pandamicro
|
741163db40
|
Merge pull request #12938 from WenhaiLin/v3.8-deps70
Update deps for support FullType.
|
2015-07-22 15:42:13 +08:00 |
子龙山人
|
bb9500769f
|
Merge pull request #12885 from zilongshanren/add-jumpToPage-api
Fix PageView scrollToPage bug and the curPageIndex bug
|
2015-07-22 15:01:57 +08:00 |
pandamicro
|
dbaf00bca6
|
Merge pull request #12950 from fusijie/add_texturecoord_bug_test
add sprite frame flash line bug test case.
|
2015-07-22 14:32:26 +08:00 |
fusijie
|
92e68cd9dc
|
add sprite frame flash line bug test case.
|
2015-07-22 13:42:10 +08:00 |
pandamicro
|
e5b4d80911
|
Merge pull request #12937 from ZhangMenghe/setClearColor
[ci skip]Re-pull setClearColor Testcase #12797
|
2015-07-22 12:39:29 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
ZhangMenghe
|
8689025c5d
|
Modify background in index of js-template-runtime
|
2015-07-22 11:44:22 +08:00 |
ZhangMenghe
|
b6c566d87e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor
|
2015-07-22 11:40:30 +08:00 |
子龙山人
|
8a8a089ad6
|
Merge pull request #12947 from zilongshanren/updateCcs-res-submodule
[ci skip]update ccs-res submodule
|
2015-07-22 10:46:02 +08:00 |
pandamicro
|
f0962669a9
|
Merge pull request #12946 from pandamicro/v3
[ci skip] Gen bindings for v3.7.1 branch
|
2015-07-22 10:45:23 +08:00 |
andyque
|
fbfb3a9dac
|
update ccs-res submodule
|
2015-07-22 10:45:18 +08:00 |
pandamicro
|
9b11e32252
|
Gen bindings for v3.7.1 branch
|
2015-07-22 10:41:04 +08:00 |
pandamicro
|
c260783fd0
|
[JS] Revert const to var to avoid issues on web compilation
|
2015-07-21 18:23:57 +08:00 |
WenhaiLin
|
979a9be1f5
|
Add test case for test font supported by FullType.
|
2015-07-21 17:09:27 +08:00 |
WenhaiLin
|
d0d481fd67
|
updated version to v3-deps-70
|
2015-07-21 16:43:47 +08:00 |
pandamicro
|
4153806c26
|
Merge pull request #12934 from CocosRobot/update_lua_bindings_1437453283
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 16:22:36 +08:00 |
ZhangMenghe
|
2e72179b91
|
Remove a space
|
2015-07-21 15:22:03 +08:00 |
ZhangMenghe
|
94aa382669
|
Add testCase for setClearColor
|
2015-07-21 15:18:19 +08:00 |
ZhangMenghe
|
61e36463cc
|
Modify a space
|
2015-07-21 14:00:59 +08:00 |
ZhangMenghe
|
3c2d68e25c
|
Modify the testcase with coding standards
|
2015-07-21 13:48:08 +08:00 |
pandamicro
|
d478c5f8a8
|
Merge pull request #12923 from ZhangMenghe/ModifytestCase
Modify testCase for UITextFieldTest
|
2015-07-21 12:53:26 +08:00 |
CocosRobot
|
6630157377
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 04:40:43 +00:00 |
pandamicro
|
8412d19a8b
|
Merge pull request #12933 from pandamicro/v3
Sync Cocos2d-x v3.7
|
2015-07-21 12:31:03 +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
|
31bd25a5e9
|
Merge pull request #12762 from yangws/issue_10759
Fix bug: Clipping node doesn't work on Android 5.0.
|
2015-07-21 10:47:55 +08:00 |
子龙山人
|
241dd54424
|
Merge pull request #12921 from yangws/issue_9382
Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range.
|
2015-07-21 10:27:39 +08:00 |
pandamicro
|
55840b4561
|
Merge pull request #12930 from pandamicro/v3.7-release
[ci skip] Update release docs for v3.7
|
2015-07-21 09:50:32 +08:00 |
pandamicro
|
f98e9495fe
|
Update release docs for v3.7
|
2015-07-21 09:49:41 +08:00 |