肖峰
|
dea99211fb
|
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
|
2015-12-25 11:44:11 +08:00 |
pandamicro
|
3a09bd400d
|
Merge pull request #14799 from xiaofeng11/v3.10_xf
[ci skip] Bug fix
|
2015-12-24 21:38:16 +08:00 |
xiaofeng11
|
ceedc80b44
|
Merge pull request #14800 from GuoLunHao/v3.10_updateConsole
update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f8…
|
2015-12-24 20:37:36 +08:00 |
lunhao.guo
|
1871813c2b
|
update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97
|
2015-12-24 20:35:12 +08:00 |
XiaoFeng
|
88196a4879
|
Both Image/blocks9ss.plist and animations/grossini.plist have image frames grossini_dance_*.png, and in Image/blocks9ss.plist the frames is smaller than frames in animations/grossini.plist, so if load Image/blocks9ss.plist first, the samples use frames named grossini_dance_*.png in animations/grossini.plist will crash. After check in source file, we found these frames in Image/blocks9ss.plist hasn't been used, so we changed frames name in Image/blocks9ss.plist to avoid crash.
|
2015-12-24 20:22:01 +08:00 |
pandamicro
|
599b22c816
|
Merge pull request #14798 from chengstory/UpdateSubmodule
Update Web Submodule
|
2015-12-24 19:07:33 +08:00 |
zhangcheng
|
755f46e0cb
|
Update Submodule: https://github.com/cocos2d/cocos2d-html5/pull/3223
|
2015-12-24 19:05:19 +08:00 |
pandamicro
|
169d3fc4b8
|
Merge pull request #14797 from VisualSJ/v3.10
Fixed a bug about should not be used `gl` in canvs mode
|
2015-12-24 17:51:03 +08:00 |
VisualSj
|
79bf3897d7
|
Fixed a bug about should not be used `gl` in canvs mode
|
2015-12-24 16:33:46 +08:00 |
zilongshanren
|
d5147a86c1
|
Merge pull request #14795 from liamcindy/v3_ui_BMFont
remove error logic for BMFont with newest CCLabel
|
2015-12-24 15:39:15 +08:00 |
Liam
|
d005bd18b7
|
remove error logic
|
2015-12-24 14:39:15 +08:00 |
xiaofeng11
|
434c79ae90
|
Merge pull request #14793 from super626/fixsprite2
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697.
We need merge it to V3.10 to file TMX render bug.
|
2015-12-24 09:40:36 +08:00 |
Ricardo Quesada
|
0f92513eeb
|
Merge pull request #14792 from cocos2d/revert-14697-v3.10-fixsprite
Revert "fix setflip for batch sprite"
|
2015-12-23 09:54:19 -08:00 |
Ricardo Quesada
|
707f08c557
|
Revert "fix setflip for batch sprite"
|
2015-12-23 09:54:04 -08:00 |
Ricardo Quesada
|
0d0534a2e1
|
Merge pull request #14697 from super626/v3.10-fixsprite
fix setflip for batch sprite
|
2015-12-23 09:53:24 -08:00 |
pandamicro
|
dea1ef1290
|
Merge pull request #14790 from pandamicro/v3.10
Fixed WebSocket JSB crash issue
|
2015-12-24 01:37:17 +08:00 |
Ricardo Quesada
|
add1bc7cbc
|
Adds iOS tests, calls GC after replacing scene
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 15:29:01 2015 -0800
Merge branch 'v3' into v3_js_memory_test_and_fixes
commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 21 21:27:19 2015 -0800
fixes crashes
commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 21 11:57:56 2015 -0800
Adds standalone test for JS GC memory
and fixes leaks on extended/subclassed objects
|
2015-12-23 08:54:00 -08:00 |
pandamicro
|
acf03c06d5
|
Fixed WebSocket JSB crash issue
|
2015-12-23 23:28:14 +08:00 |
zilongshanren
|
d11498ddef
|
Merge pull request #14788 from mogemimi/fix-method-name
Fix method name spelling in AutoPolygon
|
2015-12-23 19:27:53 +08:00 |
zilongshanren
|
830eb3433f
|
Merge pull request #14786 from liamcindy/v3_ui_widget
fix uiWidget clipping error with Node
|
2015-12-23 18:57:15 +08:00 |
xiaofeng11
|
519e69813d
|
Merge pull request #14785 from xiaofeng11/v3.10
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
|
2015-12-23 18:43:07 +08:00 |
XiaoFeng
|
c181390881
|
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
|
2015-12-23 18:39:06 +08:00 |
Liam
|
bcc2ed0e2a
|
update for scrollView test
|
2015-12-23 18:14:09 +08:00 |
mogemimi
|
b0c4adcbd0
|
Fix method name spelling in AutoPolygon
|
2015-12-23 19:07:03 +09:00 |
Liam
|
0cac519e5c
|
fix uiWidget clipping error with Node
|
2015-12-23 16:05:52 +08:00 |
zilongshanren
|
851d288d0b
|
Merge pull request #14781 from zilongshanren/rollbackSlider
Rollback slider and loadingbar in non scale9 mode
|
2015-12-23 15:04:55 +08:00 |
zilongshanren
|
2a2f184449
|
refine code with DRY.
|
2015-12-23 14:43:25 +08:00 |
zilongshanren
|
847094ec7d
|
ui::loadingBar -> add flip logic back
|
2015-12-23 14:34:36 +08:00 |
pandamicro
|
45d1d655cc
|
Merge pull request #14779 from xiaofeng11/v3.10
Bug fix & update
|
2015-12-23 12:35:52 +08:00 |
pandamicro
|
d11b2b4bfd
|
Merge pull request #14782 from geron-cn/v3.10
update submodule: web
|
2015-12-23 12:34:24 +08:00 |
XiaoFeng
|
3fd8f36a90
|
Limit force GC in menu item only work in lua-binding
|
2015-12-23 12:30:59 +08:00 |
zilongshanren
|
a5525c15ab
|
Merge pull request #14763 from ArisLittle/patch-1
fix some minor typos in the comments
|
2015-12-23 09:39:20 +08:00 |
geron-cn
|
26bd2b8212
|
update submodule
|
2015-12-22 21:43:10 +08:00 |
geron-cn
|
86ccf28343
|
update submodule: web
|
2015-12-22 21:25:21 +08:00 |
zilongshanren
|
d4a5d0da44
|
rollback uislider
|
2015-12-22 20:03:56 +08:00 |
zilongshanren
|
ab77e8c520
|
Revert "loading bar use new scale9 feature"
This reverts commit a671bf7ce9 .
|
2015-12-22 19:53:24 +08:00 |
pandamicro
|
1ac13efacc
|
Merge pull request #14780 from VisualSJ/v3.10
Close webgl dedicated test in canvas mode
|
2015-12-22 19:09:17 +08:00 |
VisualSj
|
1c60ae6ff1
|
Close webgl dedicated test in canvas mode
|
2015-12-22 19:07:46 +08:00 |
pandamicro
|
e311655fbe
|
Merge pull request #14778 from VisualSJ/v3_12_11
Close webgl dedicated test in canvas mode
|
2015-12-22 18:59:53 +08:00 |
VisualSj
|
843694cea5
|
Close webgl dedicated test in canvas mode
|
2015-12-22 18:46:30 +08:00 |
XiaoFeng
|
82867b0073
|
Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
|
2015-12-22 18:41:44 +08:00 |
VisualSj
|
875a2d83b1
|
Close webgl dedicated test in canvas mode
|
2015-12-22 18:36:48 +08:00 |
zilongshanren
|
7d730d7c21
|
Update CHANGELOG
|
2015-12-22 13:46:29 +08:00 |
zilongshanren
|
e8d3e3f136
|
Update CHANGELOG
|
2015-12-22 13:44:30 +08:00 |
zilongshanren
|
064cd8d04f
|
Merge pull request #14722 from newnon/v3.10_webp_improvement
WebP loading improvements WebP loaded as premultiplied alpha if it has
|
2015-12-22 13:43:11 +08:00 |
zilongshanren
|
9347335fad
|
Merge pull request #14767 from xiaofeng11/v3.10_logChange
[ci skip] remove duplicate change log
|
2015-12-22 13:41:39 +08:00 |
xiaofeng11
|
954a54f7bb
|
Merge pull request #14770 from pandamicro/v3.10
Fix VS crash issue caused by unsupported macro syntax
|
2015-12-22 09:42:24 +08:00 |
pandamicro
|
a91a669972
|
Fix VS crash issue caused by unsupported macro syntax
piece of shit...
|
2015-12-21 22:44:59 +08:00 |
pandamicro
|
baa6028e42
|
Merge pull request #14769 from CocosRobot/update_lua_bindings_1450697623
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-21 21:34:47 +08:00 |
CocosRobot
|
30f3096c92
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-21 11:36:07 +00:00 |