Commit Graph

779 Commits

Author SHA1 Message Date
zilongshanren cfb0b36343 fix generate templates json file scripts 2016-05-10 14:57:43 +08:00
zilongshanren c647536c0c Merge branch 'develop' into syncMasterBranch
# Conflicts:
#	gulpfile.js
#	package.json
2016-05-10 14:12:59 +08:00
zilongshanren a45d0f5772 add travis build status to develop branch 2016-05-06 16:22:28 +08:00
zilongshanren d366a8d1bb make travis working 2016-05-06 16:10:43 +08:00
zilongshanren 4f42d3a5ca add travis scripts back.
1. it also fix generate cocos files and bindings code
2016-05-06 14:54:19 +08:00
Nan Wang dd000ca571 tweaked title for resolution option 2016-05-04 09:54:28 +08:00
Nan Wang 946e4ba516 fix comma 2016-05-04 09:50:21 +08:00
Nan Wang 9690cf55c9 add iphone 6 resolution 2016-05-04 09:50:02 +08:00
2youyouo2 4a7b42fc3f update simulator config.json 2016-05-03 14:33:33 +08:00
Wenhai Lin 94501cc8f1 Bug fix and stability improvements 2016-04-25 15:56:03 +08:00
Wenhai Lin 1c5f974d78 Fixed generate error code for constructor 2016-04-22 14:10:02 +08:00
Wenhai Lin f1d7d03ab5 Update the submodule bindings-generator 2016-04-22 11:43:17 +08:00
Wenhai Lin a4bdfa270c Fixed warns in JS bindings 2016-04-22 11:31:32 +08:00
Wenhai Lin 0abea90927 Update the submodule bindings-generator 2016-04-19 14:50:46 +08:00
Wenhai Lin 7bf60cb53e Update JS bindings and support generate JS bindings by NDK r11+. 2016-04-19 14:36:00 +08:00
2youyouo2 1402d72199 update cocos console 2016-04-18 10:03:20 +08:00
2youyouo2 fd876c82f9 fixed mac simulator 2016-04-15 10:36:44 +08:00
2youyou2 4cabfc4e45 update win32 project 2016-04-14 18:56:00 +08:00
2youyou2 5f83d4a2e3 update win32 config 2016-04-14 11:46:16 +08:00
2youyouo2 fa4b9cae89 update creator js binding 2016-04-13 21:42:14 +08:00
2youyouo2 d2cc58eb56 add make-package 2016-04-13 18:36:51 +08:00
2youyouo2 6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00
2youyouo2 ce4f78f312 add creator files 2016-04-13 15:35:27 +08:00
2youyouo2 a4d8f0ba8c add binding generator 2016-04-13 15:33:39 +08:00
2youyouo2 296933fc4d update cocos console 2016-04-13 15:32:28 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin b3441f7981 Add template project 2016-03-30 21:12:14 +08:00
Wenhai Lin c06ebef18c Update the submodule cocos2d-console 2016-03-30 17:19:54 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00