Commit Graph

65 Commits

Author SHA1 Message Date
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 e58f1f4976 Merge pull request #24 from WenhaiLin/master
Close web socket on exit may cause crash.
2016-04-11 15:53:59 +08:00
Wenhai Lin 7399218a5e Close web socket on exit may cause crash. 2016-04-11 15:52:40 +08:00
Wenhai Lin 3c8b460b26 Merge pull request #23 from WenhaiLin/master
Bugs fixed of 'Repeat'. etc..
2016-04-08 21:49:08 +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
Wenhai Lin c959b9ce2b Merge pull request #22 from WenhaiLin/master
Fixed compile fail on window
2016-04-08 18:47:13 +08:00
WenhaiLin e31a6e6196 Fixed compile fail on window 2016-04-08 18:43:44 +08:00
Wenhai Lin 9c11c81ed2 Merge pull request #21 from WenhaiLin/master
Fixed crash on android
2016-04-08 15:48:28 +08:00
Wenhai Lin b9680ea88f Fixed crash on android 2016-04-08 15:46:47 +08:00
Wenhai Lin 628d9ee73b Merge pull request #20 from WenhaiLin/master
Bug fix:
2016-04-08 15:22:21 +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 35ce3f57a6 Merge pull request #19 from WenhaiLin/master
Remove unnecessary 'void' modifier
2016-04-07 23:23:23 +08:00
Wenhai Lin ec1a1d65b7 Remove unnecessary 'void' modifier 2016-04-07 23:13:19 +08:00
Wenhai Lin 2c07cee01b Merge pull request #18 from WenhaiLin/master
Fixed crash
2016-04-07 23:13:02 +08:00
Wenhai Lin 2c998e8f4d Fixed crash 2016-04-07 23:05:29 +08:00
Wenhai Lin 3750476b24 Merge pull request #17 from WenhaiLin/master
sync bug fix++
2016-04-07 23:02:53 +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 59a27c3826 Merge pull request #16 from WenhaiLin/master
Iterator erase pattern
2016-04-07 16:37:36 +08:00
Wenhai Lin 2a68bf1c50 Iterator erase pattern 2016-04-07 16:32:25 +08:00
Wenhai Lin 24e1f2f4fa Merge pull request #15 from WenhaiLin/master
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener
2016-04-07 16:23:49 +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 cb9ab7d3bc Merge pull request #14 from WenhaiLin/master
Using 'using' instead of 'typedef'; + Not support iOS below version 7
2016-04-07 16:22:17 +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 4b32edf795 Merge pull request #13 from WenhaiLin/master
No more uthash
2016-04-07 11:35:09 +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 d72395aa17 Merge pull request #12 from WenhaiLin/master
Refine the JS implementations of CocoStudio parser
2016-04-07 09:59:21 +08:00
Wenhai Lin 134ea5f318 Refine the JS implementations of CocoStudio parser 2016-04-06 23:38:36 +08:00
Wenhai Lin f323564c12 Merge pull request #10 from WenhaiLin/master-refine-eventsystem
Refine event system
2016-04-06 18:38:08 +08:00
Wenhai Lin 675711b028 Refine event system 2016-04-06 18:37:22 +08:00
Wenhai Lin d4890deb8b Merge pull request #11 from WenhaiLin/v3-0405
Update README.md and add licenses
2016-04-05 17:24:57 +08:00
Wenhai Lin e8fd036cb7 Update README.md and add licenses 2016-04-05 17:19:01 +08:00
Wenhai Lin 09675c4bf0 Merge pull request #9 from WenhaiLin/master
Withespaces does matter.
2016-03-31 23:52:37 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin c24a60bb08 Merge pull request #8 from WenhaiLin/master
Fixed create new JSB project fail.
2016-03-31 22:37:51 +08:00
Wenhai Lin 791ba29db8 Fixed create new JSB project fail. 2016-03-31 22:35:42 +08:00
Wenhai Lin 71e3aa29fa Merge pull request #7 from WenhaiLin/master
Fixed crash on Android
2016-03-31 18:42:48 +08:00
Wenhai Lin a7e4fb1c89 Fixed crash on Android 2016-03-31 18:42:03 +08:00