Commit Graph

24 Commits

Author SHA1 Message Date
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
pandamicro ba33766602 Upgrade scripting/js-bindings/script to v3.13 2016-08-25 17:25:51 +08:00
pandamicro f05b67e287 Upgrade cocos/scripting to v3.13 2016-08-09 18:17:42 +08:00
minggo 93d895a526 Merge pull request #228 from minggo/sync-15705
lock mutext to get element from g_queue
2016-07-18 18:05:01 +08:00
minggo 446e5f26b5 lock mutext to get element from g_queue 2016-07-18 18:04:35 +08:00
minggo f922c9a798 avoid accessing invalid memory 2016-07-18 17:02:32 +08:00
2youyouo2 10111b0cd4 fixed errorHandler 2016-07-06 14:21:49 +08:00
knoxHuang 94bec4a581 fix ScriptingCore code error 2016-06-30 13:06:59 +08:00
knoxHuang 06bf021143 merge code for #/fireball/issues/2787 2016-06-28 14:22:22 +08:00
Wenhai Lin 033cd4649f IPV6 compatibility 2016-05-19 01:46:01 +08:00
Wenhai Lin e571338580 Disable cc.log in release mode.(Redefine it in CocosRuntime) 2016-05-18 17:43:47 +08:00
Wenhai Lin b7f8bb7ab4 Enable cc.log in release mode. 2016-05-17 17:59:58 +08:00
pandamicro 9ce7955434 Some small fixes 2016-05-17 17:33:11 +08:00
Wenhai Lin d4481bfd5a Refine (#48) 2016-04-28 11:58:34 +08:00
Wenhai Lin 83fc6fd1a8 Bug fix:
1.Fixed crash in win for rich text
2.Fixed crash when custom SSL certificate is set on iOS
3.Fixed SocketIO crash on reconnect
4.Fixed ActionManager memory leak
5.Fixed crash in MenuItem::activate
6.Fixed crash on exit game
7.Fixed crash in TableView::updateCellAtIndex
8.Fixed crash in RichText on window
2016-04-21 15:19:47 +08:00
Wenhai Lin 822966e820 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into md 2016-04-19 10:05:02 +08:00
Wenhai Lin 2c3bfd1cef Fixed memory leak 2016-04-18 16:16:17 +08:00
2youyouo2 389e91893b Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-04-15 10:33:12 +08:00
Wenhai Lin e572df8a55 Fixed memory leak 2016-04-14 23:41:46 +08:00
2youyouo2 529c5d8899 remove JS: prefix for jsb log 2016-04-13 15:37:19 +08:00
Wenhai Lin e4b8db424a Withespaces does matter. 2016-04-07 21:56:30 +08:00
Wenhai Lin 0e7cb5da16 no more uthash 2016-04-07 11:33:04 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00