Commit Graph

31318 Commits

Author SHA1 Message Date
pandamicro d768df51ed Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-14 23:22:54 +08:00
pandamicro c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08:00
Mazyad Alabduljaleel 008a5ef89c replaced tabs with whitespace 2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel 6f8bc04934 First commit for improving iOS EditBox
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
2015-07-14 16:18:03 +03:00
pandamicro b49054876c Merge pull request #12846 from VisualSJ/v3.7-release-parser
[ci skip] update we index
2015-07-14 18:23:29 +08:00
VisualSj 909ff57231 update we index 2015-07-14 18:21:03 +08:00
pandamicro 373ab0e5b8 Merge pull request #12844 from CocosRobot/update_cocosfiles_1436868917
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-14 18:16:35 +08:00
CocosRobot 3ba4d7230e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-14 10:15:18 +00:00
pandamicro b6c02cb0ea Merge pull request #12843 from natural-law/v3.7-release
[ci skip] Update the JS templates to keep the directory structure is same with before.
2015-07-14 18:13:46 +08:00
Bin Zhang 55890f6206 Update the JS templates to keep the directory structure is same with before. 2015-07-14 18:07:17 +08:00
pandamicro eb56ad6d60 Merge pull request #12836 from pandamicro/v3.7-release
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 17:37:00 +08:00
pandamicro a90a8b12c6 Merge pull request #12840 from pandamicro/path
[ci skip] Add cc.path.mainFileName
2015-07-14 16:41:16 +08:00
子龙山人 49b47f576d Merge pull request #12828 from WenhaiLin/v3-label-readability
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
子龙山人 7e4e82da2c Merge pull request #12835 from zilongshanren/improve-coding-style
add more descriptive message to ASSET macro.
2015-07-14 16:36:59 +08:00
子龙山人 af4442d0d6 Merge pull request #12833 from fusijie/v3
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
pandamicro 41778f35fb Add cc.path.mainFileName 2015-07-14 16:33:38 +08:00
子龙山人 8dad9cdbbd Merge pull request #12839 from zilongshanren/v3
[ci skip]add cocos framework android  build on linux platform.
2015-07-14 16:32:38 +08:00
andyque 97168fa139 add cocos framework build on linux platform. 2015-07-14 16:25:54 +08:00
pandamicro 658fe74141 Merge pull request #12838 from VisualSJ/v3.7-release-parser
[ci skip] Remove getRes (parser)
2015-07-14 16:20:42 +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
VisualSj a9deb6dda5 Remove getRes (parser) 2015-07-14 15:26:13 +08:00
pandamicro 48376db17a Merge pull request #12832 from pandamicro/jsb_loader_fix
Fix jsb loader
2015-07-14 15:25:24 +08:00
Jacky ea773cac20 Fixed setAnimationInterval JNI bug. 2015-07-14 15:11:35 +08:00
pandamicro 09775d6f2a Ensure backward compatibility 2015-07-14 14:14:36 +08:00
WenhaiLin b701fd9e73 Fixed compile error 2015-07-14 13:47:35 +08:00
子龙山人 e6ccad3fe4 Merge pull request #12831 from CocosRobot/update_lua_bindings_1436852228
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-14 13:44:49 +08:00
WenhaiLin 964713355b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail 2015-07-14 13:43:43 +08:00
CocosRobot 6b9a5b8264 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-14 05:41:48 +00:00
pandamicro 43a5b6f020 Fix jsb loaders issues 2015-07-14 13:40:09 +08:00
子龙山人 616efbf0c3 Merge pull request #12812 from neokim/refactor_scroll_view_bar
Refactor scroll view bar
2015-07-14 13:34:07 +08:00
子龙山人 e1ae3631fc Merge pull request #12818 from zilongshanren/v3
merge v3.7 back to v3
2015-07-14 13:32:56 +08:00
pandamicro 69a70010cf Merge pull request #12827 from yangws/issue_12668
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have…
2015-07-14 12:05:29 +08:00
WenhaiLin d4f62a8063 Label:improving the code readability. 2015-07-14 11:30: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
pandamicro 62ee9d32a6 Merge pull request #12825 from yangws/issue_12621
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 11:03:13 +08:00
Neo Kim 7882a534c1 Correct the wrong boolean statement and make it easy to read 2015-07-14 11:58:44 +09:00
Vincent Yang 0a6933cc8c Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak. 2015-07-14 10:46:17 +08:00
andyque ac1bf36208 update submodule 2015-07-14 10:10:20 +08:00
pandamicro 365c51cfab Merge pull request #12824 from darkdukey/v3.7-release
update release notes for sdkbox
2015-07-14 09:46:06 +08:00
Vincent Yang 0589c14302 Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
pandamicro 5dc0cab4a5 Merge pull request #12823 from natural-law/v3.7-release
[ci skip] Update the reference of submodule cocos2d-console.
2015-07-14 09:42:50 +08:00
Nite Luo 55037345a4 update release notes for sdkbox 2015-07-13 18:42:35 -07:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00
Vincent Yang 06bf6ffa90 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-14 09:35:01 +08:00
pandamicro cfd9e9cbdf Merge pull request #12817 from CocosRobot/update_lua_bindings_1436798257
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-14 09:28:47 +08:00
pandamicro 8035e1e47d Merge pull request #12821 from darkdukey/release_notes_sdkbox
update 3.7 release notes for sdkbox
2015-07-14 09:25:04 +08:00
Neo Kim 863c3a0a2a Correct a typo 2015-07-14 10:17:05 +09:00
Nite Luo 5631fa33e0 update release notes for sdkbox 2015-07-13 17:44:44 -07:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00