Commit Graph

92 Commits

Author SHA1 Message Date
pandamicro cf77995a94 Fix socket io variable name conflict in JSB 2016-03-25 20:49:10 +08:00
zilongshanren 83c30ea536 fix editbox maxLength 2016-03-24 18:01:41 +08:00
Jare Guo 51c5e1a2ba add cc.loader.loadRes, remove "resources://" protocol 2016-03-22 15:40:50 +08:00
pandamicro 6c0626f4e5 Merge pull request #515 from pandamicro/v1.0
Fix Rect width exceeds maximum margin issue in JSB
2016-03-22 00:14:54 +08:00
pandamicro 5934f04fbd Fix Rect width exceeds maximum margin issue in JSB 2016-03-22 00:07:48 +08:00
Jare Guo d41b71dcf1 Merge pull request #514 from zilongshanren/add-label-unit-tests
fix bmfont set file crash
2016-03-21 22:02:16 +08:00
zilongshanren 4c904649d0 fix bmfont set file crash 2016-03-21 21:50:37 +08:00
pandamicro 8336701b0e Fix issue caused by pauseTarget fix 2016-03-21 18:13:31 +08:00
pandamicro e670400a42 [JSB] Fix a small issue in pauseTarget 2016-03-21 17:39:52 +08:00
pandamicro 8beba0ea48 Fix clearInterval not working issue 2016-03-21 17:07:43 +08:00
pandamicro 4f880c39b6 [JSB] Fix pauseTarget before node onEnter not working issue 2016-03-21 16:48:51 +08:00
pandamicro 755f89dc3b Fix audio loading in JSB 2016-03-21 12:44:25 +08:00
Jare Guo da8f896a19 update jsb-director 2016-03-19 13:52:39 +08:00
pandamicro 34956900b1 Fix sprite frame can't be inited with a single texture in JSB 2016-03-19 00:38:32 +08:00
pandamicro e550592f1b Merge pull request #497 from pandamicro/v1.0
Fix EaseAction issue in JSB
2016-03-18 12:00:41 +08:00
pandamicro 3039a216c3 Fix EaseAction issue in JSB 2016-03-18 11:59:29 +08:00
Jare Guo 965c0bffbd fix removeSgNode on JSB 2016-03-18 11:07:35 +08:00
pandamicro e009eb0fc2 Detect existing persist node by uuid 2016-03-17 11:37:21 +08:00
pandamicro fc172e086a Replace instead of reattach when scene contains the persist node 2016-03-17 10:53:29 +08:00
pandamicro 3d14f13d1e Use id to identify persist root node 2016-03-16 22:07:40 +08:00
pandamicro f1a066807f Improve scheduler logic, avoid using key in web & native 2016-03-16 15:57:17 +08:00
Jare Guo 17f9641d23 allows users to use CC_EDITOR in JSB 2016-03-15 19:06:39 +08:00
Jare Guo cf614f41de Merge commit 'd43870aff07040d32817d010fc3ac1716e63d2fb' into v1.0 2016-03-15 10:54:11 +08:00
Jare Guo bfe253594d fix destroy in JSB 2016-03-15 10:50:32 +08:00
pandamicro d43870aff0 Add jsc downloader in JSB 2016-03-14 22:03:40 +08:00
pandamicro 6f530df13b Cleanup other modules 2016-03-14 21:46:13 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
Jare Guo 28b3da738b minor tweaks 2016-03-13 15:33:24 +08:00
pandamicro 62090dd4d1 Fix console.log & cc.log in JSB 2016-03-11 18:21:09 +08:00
zilongshanren 0666f6b19f fix parsing error 2016-03-10 10:22:15 +08:00
zilongshanren 201bf96706 fix jsb overflow none 2016-03-10 10:11:59 +08:00
pandamicro 195ed922f8 Fix downloadText won't return error issue 2016-03-09 18:08:27 +08:00
pandamicro 6a9b1e6738 Fix EVENT_AFTER_SCENE_LAUNCH not fired isse 2016-03-09 17:57:48 +08:00
Wang Nan afb7bf4b8f Merge pull request #449 from zilongshanren/fix-bmfont-error-before-3.10
fix jsb bmfont error
2016-03-09 14:44:09 +08:00
zilongshanren 3ee39c07d0 fix jsb bmfont error 2016-03-09 13:45:22 +08:00
pandamicro 3b0d6f9c35 Added cc.director.runSceneImmediate API 2016-03-09 12:13:57 +08:00
pandamicro 02debeeac2 Delay replace/run scene in JSB to avoid issues 2016-03-09 12:13:57 +08:00
Jare Guo 6b98138063 working on using resources:// instead of cc.url.raw in JSB 2016-03-09 09:58:10 +08:00
Huabing.Xu df2a5a374e fix blend func for 3.3 when blend func is not present in JSB 2016-03-04 16:26:04 +08:00
pandamicro 17aa75520d Refactor LoadingItem.src to id and url 2016-03-04 00:55:35 +08:00
pandamicro 068bfa76fa [JSB] Fix loadImg usage in cc.textureCache 2016-03-03 12:04:52 +08:00
pandamicro 310980bea8 Merge pull request #427 from natural-law/import-tiled
Solve the problems when using TiledMap in native environment.
2016-03-03 10:23:51 +08:00
Jare Guo 95ba52b316 polyfill spine on JSB 2016-03-02 19:53:29 +08:00
zhangbin 2e8d9432ba Bind the setter & getter of _ccsg.Node.arrivalOrder to the right method in native. 2016-03-02 17:32:11 +08:00
Jare Guo efd5ecb014 Merge pull request #417 from zilongshanren/improve-editbox
Improve editbox
2016-03-02 10:26:59 +08:00
pandamicro 4a04073011 More secured ActionManager / EventManager APIs in JSB 2016-03-01 20:33:34 +08:00
zilongshanren 2195f92908 optimize EditBox enum naming 2016-03-01 17:57:35 +08:00
Wang Nan 8c043208c2 Merge pull request #413 from nantas/master
update license file and source code header.
2016-03-01 12:05:44 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00