Commit Graph

4804 Commits

Author SHA1 Message Date
2youyouo2 77dc0aed0b Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-04-13 20:03:21 +08:00
Wenhai Lin ed0ca9664e bump external version to 'v3-deps-3' 2016-04-13 19:52:23 +08:00
2youyouo2 eb0785bf50 add js-template-default project.properties 2016-04-13 19:50:29 +08:00
2youyouo2 ec3f526a4e add project.properties 2016-04-13 19:30:36 +08:00
2youyouo2 d2cc58eb56 add make-package 2016-04-13 18:36:51 +08:00
2youyouo2 e64e5e0178 add binary template 2016-04-13 17:14:11 +08:00
2youyouo2 6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00
2youyouo2 d1394f9600 fixed jsb.js 2016-04-13 15:41:12 +08:00
2youyouo2 5b93ed1521 update jsb debugger 2016-04-13 15:40:51 +08:00
2youyouo2 6d965cbef9 update templates 2016-04-13 15:39:33 +08:00
2youyouo2 529c5d8899 remove JS: prefix for jsb log 2016-04-13 15:37:19 +08:00
2youyouo2 cf79acff10 add js_module_register 2016-04-13 15:36:29 +08:00
2youyouo2 87c8deaf2e add creator files 2016-04-13 15:36:07 +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
2youyouo2 54f91df786 update templates 2016-04-12 10:32:10 +08:00
2youyouo2 e72b805fc9 fixed android local storage getItem 2016-04-12 10:31:40 +08:00
2youyouo2 ddce4b1a4e disable png image premultiplied alpha 2016-04-12 10:31:10 +08:00
2youyouo2 a6db08343c sync cocos2d/cocos2d-x#15293 2016-04-12 10:29:43 +08:00
Wenhai Lin 7399218a5e Close web socket on exit may cause crash. 2016-04-11 15:52:40 +08:00
Wenhai Lin 85860e43d2 Add ListView constants for JS bindings 2016-04-08 21:46:45 +08:00
Wenhai Lin 87b5397c43 Bugs fixed of 'Repeat'. 2016-04-08 21:02:00 +08:00
Wenhai Lin e42840bfac Add '{' in a new line 2016-04-08 20:52:41 +08:00
Wenhai Lin 9874ca80f7 Fixed projects 2016-04-08 20:29:12 +08:00
WenhaiLin e31a6e6196 Fixed compile fail on window 2016-04-08 18:43:44 +08:00
Wenhai Lin b9680ea88f Fixed crash on android 2016-04-08 15:46:47 +08:00
Wenhai Lin 1b3eba757a Bug fix:
1.Fix cc.CallFunc callback parameter issue
2.Fix arrivalOrder property of Node
2016-04-08 15:21:31 +08:00
Wenhai Lin ec1a1d65b7 Remove unnecessary 'void' modifier 2016-04-07 23:13:19 +08:00
Wenhai Lin 2c998e8f4d Fixed crash 2016-04-07 23:05:29 +08:00
Wenhai Lin e4b8db424a Withespaces does matter. 2016-04-07 21:56:30 +08:00
Wenhai Lin 34939f30fd sync bug fix++ 2016-04-07 21:56:09 +08:00
Wenhai Lin de0fa699dc Make selectedSprite optional in JSB too 2016-04-07 17:20:09 +08:00
Wenhai Lin 2a68bf1c50 Iterator erase pattern 2016-04-07 16:32:25 +08:00
Wenhai Lin b3a6312d88 Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener 2016-04-07 16:22:53 +08:00
Wenhai Lin 754fae9afc Not support iOS below version 7 2016-04-07 15:53:38 +08:00
Wenhai Lin 9dffef8763 Using 'using' instead of 'typedef' 2016-04-07 15:47:05 +08:00
Wenhai Lin 0e7cb5da16 no more uthash 2016-04-07 11:33:04 +08:00
Wenhai Lin 4b9f90861f Sync Bug fix 2016-04-07 11:07:46 +08:00
Wenhai Lin 134ea5f318 Refine the JS implementations of CocoStudio parser 2016-04-06 23:38:36 +08:00
Wenhai Lin 675711b028 Refine event system 2016-04-06 18:37:22 +08:00
Wenhai Lin e8fd036cb7 Update README.md and add licenses 2016-04-05 17:19:01 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin 791ba29db8 Fixed create new JSB project fail. 2016-03-31 22:35:42 +08:00
Wenhai Lin a7e4fb1c89 Fixed crash on Android 2016-03-31 18:42:03 +08:00
Wenhai Lin cb059c934a Update templates/cocos2dx_files.json 2016-03-31 17:58:25 +08:00
Wenhai Lin e6ce295ac5 Fixed exit the program lead to crash if the software keyboard is open. 2016-03-31 17:23:01 +08:00
Wenhai Lin 17d07e7669 Fixed the software keyboard fails to auto hide on iOS. 2016-03-31 16:59:06 +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