9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
31c0e27b4b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17606 )
2017-03-29 14:23:15 +08:00
cab5195ad4
find .luac first ( #17572 )
2017-03-23 10:43:39 +08:00
72d47c7f39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17566 )
2017-03-22 14:56:45 +08:00
95921836ca
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17549 )
2017-03-20 09:39:41 +08:00
f8eccb9608
Added VS2017 support in project files ( #17548 )
...
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file
* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.
* Changed extension of CCStencilStateManager.hpp to .h
* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
87b4d7d54d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17507 )
2017-03-15 16:23:50 +08:00
98d2236914
Prevent signed/unsigned mismatch ( #17468 )
2017-03-08 14:32:23 +08:00
fb730b5395
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17456 )
2017-03-07 11:29:17 +08:00
e08cbc1c39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17453 )
2017-03-07 09:45:23 +08:00
b32c84f8c2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17449 )
2017-03-06 18:28:58 +08:00
7dbfc85a8f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17430 )
2017-03-02 16:08:53 +08:00
619e012d9b
[WebSocket] Adds support for getting url and server selected protocol ( #17381 )
...
* [WebSocket] Adds support for getting url and server selected protocol
* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
a3daaf3626
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-02-17 07:53:15 +00:00
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
8cb299eb2b
fix lua binding string conversion ( #17367 )
...
* fix lua binding string conversion
In previous, the characters after \0 will be truncated.
* revert some unneeded modification
2017-02-15 09:27:10 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
ced1009291
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17339 )
2017-02-10 14:14:16 +08:00
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
85dbcc1638
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17332 )
2017-02-09 17:07:42 +08:00
8825a091bb
update spine to 3.5.35 ( #17331 )
...
* update spine to 3.5.35
* fix jsb compiling error
* fix lua compiling error
2017-02-09 16:57:42 +08:00
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
75d2e76095
Fix minor typos in comments and docs ( #17294 )
2017-02-07 09:41:52 +08:00
c1b4358d13
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17290 )
2017-02-06 16:31:09 +08:00
1d47ae7e90
Fix typo in function name ( #17253 )
2017-02-04 10:35:56 +08:00
bdcf461dc3
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-23 01:32:57 +00:00
690db56f44
Merge v3.14.1 ( #17231 )
...
* update cocos console to fix compiling error with Android Studio projects (#17129 ) (#17145 )
* fix crash if physics3d camera is not set (#17139 ) (#17144 )
* fix linking error with vs2015 (#17146 )
* fix issue #17116 & #17119 for v3.14.1
* tests cases
* better documentation
* doc: updates sprite doc
* Fix scale9sprite polygon info (#17161 )
* add guard code to Scale9Sprite
* add new test code
* Glfw linux issue (#17166 )
* purge glfw3 before installing glfw3.2
* purge glfw3 before installing glfw3.2
* Update web engine ref (#17169 )
* update version and release note (#17170 )
* issue ##17119 improved v3.14.1 (#17189 )
* update version (#17230 )
2017-01-20 09:59:30 +08:00
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
00b9dcd62e
Lua custom handler ( #17211 )
...
* avoid crash if custom handler vector is empty
* simplify codes
2017-01-18 17:05:08 +08:00
888b985e0e
Fix variable name typo ( #17195 )
2017-01-16 11:21:34 +08:00
21d57bfd39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17185 )
2017-01-16 11:20:39 +08:00
f2114f36f8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17183 )
2017-01-13 14:04:11 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
afb55253f1
fix dutch language value and add missing languages ( #17160 )
2017-01-11 14:04:45 +08:00
90e0ab0c2e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17152 )
2017-01-11 10:49:48 +08:00
91ae4b1c03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17143 )
2017-01-10 16:59:15 +08:00
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
61170c69ee
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17103 )
2017-01-04 11:47:58 +08:00
77d0e8292a
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17016 )
2016-12-15 10:03:04 +08:00
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +08:00
edca6862b9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17009 )
2016-12-14 09:37:46 +08:00
64994a2471
make it support .luac file too ( #16981 )
2016-12-09 17:52:45 +08:00
77f5204877
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16972 )
2016-12-09 14:30:01 +08:00
5ef072de03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-05 01:43:54 +00:00
f72b950465
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16926 )
2016-11-30 11:33:49 +08:00
129838d960
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16896 )
2016-11-24 11:39:02 +08:00
18204c1e37
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16880 )
2016-11-21 15:00:00 +08:00
7c6f0598b2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16861 )
2016-11-18 09:27:20 +08:00
f99dae383f
Fixed math error (issue #16837 ) in Lua function radian2angle ( #16848 )
2016-11-16 09:35:47 +08:00
d0705d9e25
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16828 )
2016-11-09 17:33:47 +08:00
minggo