Sergey
a172cce874
fix web socket crash
2015-12-17 11:48:25 +03:00
kci
9e77fb0834
fix build fail error
2015-12-17 16:24:29 +09:00
pandamicro
3dbc453ee2
Merge pull request #14713 from chengstory/UpdateWebSubmodule
...
Update cocos2d-js web submodule to latest.
2015-12-17 15:08:28 +08:00
kci
8a39c1a06a
Windows/osx/linux build fail bug fixed
2015-12-17 15:40:16 +09:00
zhangcheng
df98bf098b
Update web submodule to latest.
2015-12-17 14:07:01 +08:00
Xpol Wan
41d4a41920
crystax-ndk-10.3.0 needs <stdint.h> to be included here.
2015-12-17 12:08:14 +08:00
Ricardo Quesada
d943381c65
Update spidermonkey_specifics.h
...
updated docstrings
2015-12-16 20:03:09 -08:00
Ricardo Quesada
1ba3f2badb
minor fixes
2015-12-16 17:47:50 -08:00
Ricardo Quesada
f023d5a378
no more uthash
...
Instead of using two uthash entires, it uses two unordered_map entries.
Benefits are:
easier to debug. I can inspect the contents of the unorderd_map with the
debugger
less memory. I don't need to allocate two proxies. I only allocate one
proxy and I added it into both maps
If also fixes an important bug when unrooting objects. Unroot was
cleaning the heap object. So now proxy adds a _jsobj, which is a raw
pointer. Needed under certain cases.
2015-12-16 17:37:44 -08:00
kci
afc50be1ed
Fix #14428 CCRenderTexture does not work properly on some devices which does not support "GL_OES_packed_depth_stencil".
2015-12-17 10:34:51 +09:00
pandamicro
b079705dcd
Merge pull request #14702 from pandamicro/v3.10
...
Fix Downloader callback bug on iOS9
2015-12-17 01:05:10 +08:00
pandamicro
58902f0711
Fix issue in URLSession:task:didCompleteWithError:
2015-12-16 21:19:46 +08:00
zilongshanren
2881ce7c40
Merge pull request #14632 from liamcindy/UITest
...
update for ui resource test
2015-12-16 18:18:35 +08:00
pandamicro
ffcf45ef78
Improved solution for Downloader status code issue on iOS 9
2015-12-16 17:45:40 +08:00
Wenhai Lin
66b0a0e9b1
Adds `std::nothrow` to the `new` statements
2015-12-16 17:06:56 +08:00
zilongshanren
89c620eb4b
Merge pull request #14696 from WenhaiLin/v3-labelfix
...
Improved robustness in release mode
2015-12-16 17:00:45 +08:00
pandamicro
a8a9c8ec92
Merge pull request #14694 from ricardoquesada/v3_10_js_fixes
...
ccvector_to / ccmap_to converted to new API
2015-12-16 16:34:51 +08:00
pandamicro
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
pandamicro
05da27338a
Merge branch 'fix/ios9_downloader_bug' of github.com:cezheng/cocos2d-x into v3.10
2015-12-16 15:24:42 +08:00
Wenhai Lin
dfdc202171
refine
2015-12-16 15:08:48 +08:00
Wenhai Lin
b91882f150
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-16 14:59:33 +08:00
Wenhai Lin
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
yangxiao
5e61e37d80
fix crash when shader can not compile
2015-12-16 13:54:43 +08:00
yangxiao
74b480c1b6
fix setflip for batch sprite
2015-12-16 13:45:37 +08:00
xiaofeng11
1bbb633934
Merge pull request #14691 from GuoLunHao/v3.10_xcodeProj
...
add 'js_module_register.cpp' and 'lua_module_register.cpp' in Compile Sources on iOS Targets' Build Phases
2015-12-16 13:00:52 +08:00
xiaofeng11
ef71d8cdcf
Merge pull request #14689 from GuoLunHao/v3.10_updateConsole
...
update cocos2d-console submodule to 1ad9331a9e3cbef9c499b6c7
2015-12-16 12:23:23 +08:00
Wenhai Lin
e5952ad440
Improved robustness in release mode
2015-12-16 11:53:59 +08:00
Ricardo Quesada
eb8e755362
removes logs
2015-12-15 18:21:44 -08:00
Ricardo Quesada
43a573f4fd
ccvector_to / ccmap_to converted to new API
...
and more fixes
2015-12-15 17:37:48 -08:00
Joachim Grill
8e75cdcd42
SpriteOffsetAnchorRotation test: moved setup code from ctor to onEnter(), as ctor is called before onExit() of previous test case, which might mess up sprite frame cache
2015-12-15 14:14:09 +01:00
GuoLunHao
7d72f66f5b
add 'js_module_register.cpp' and 'lua_module_register.cpp' in Compile Sources on iOS Targets' Build Phases
2015-12-15 21:00:24 +08:00
lunhao.guo
b32d013dc4
update cocos2d-console submodule to SH1 1ad9331a9e3cbef9c499b6c785d64c25b2f7e133
2015-12-15 20:06:16 +08:00
Joachim Grill
98079b49e8
updated javascript bindings
2015-12-15 11:18:32 +01:00
Joachim Grill
ba45e2df33
updated lua bindings; updated file format description
2015-12-15 10:56:10 +01:00
XiaoYang
727d857c88
Merge pull request #14674 from super626/tilemap
...
fix fast tilemap blend function
2015-12-15 17:23:53 +08:00
pandamicro
4c8fdc760d
Merge pull request #14684 from CocosRobot/update_lua_bindings_1450153784
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-15 12:32:11 +08:00
CocosRobot
8cb2ec6187
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-15 04:31:50 +00:00
pandamicro
6e20c3cc4f
Merge pull request #14681 from pandamicro/v3.10
...
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
Ce Zheng
6d58fc05d9
Fix Downloader callback bug on iOS9
...
On iOS 9 when server returns a response with HTTP status 403 caused the
downloader to callback successfully and saving the error message to the
storage path. This commit adds a check on the HTTP status code and
do failure callback if status code is 4xx or 5xx.
2015-12-15 13:16:24 +09:00
pandamicro
64276bd664
Fix ComponentJS proxy management issue in JSB
2015-12-15 11:48:44 +08:00
pandamicro
280a8e9d9c
Merge pull request #14663 from xiaofeng11/v3.10
...
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
pandamicro
f97a110eee
Merge pull request #14657 from mogemimi/fix-warning-fontfnt
...
Fix deprecation warning in FontFNT
2015-12-15 10:46:11 +08:00
pandamicro
ca45f9f69d
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3.10
2015-12-15 10:45:42 +08:00
pandamicro
77ca89a0fa
Merge pull request #14680 from MSOpenTech/winrt-v3.10-fixjs
...
added missing _USRJSSTATIC preprocessor define for ARM builds
2015-12-15 10:45:41 +08:00
pandamicro
f417f2ac2d
Auto generate bindings for v3.10
2015-12-15 10:44:18 +08:00
Dale Stammen
46b926a18e
added missing _USRJSSTATIC preprocessor define for ARM builds
2015-12-14 14:55:33 -08:00
mogemimi
18aec7e942
Fix deprecation warning in FontFNT
2015-12-15 02:25:32 +09:00
Joachim Grill
4dd3595b1e
added test with plist file containing anchor points
2015-12-14 16:17:41 +01:00
Joachim Grill
033b9aabf0
read sprite anchor point from plist file
2015-12-14 15:42:18 +01:00
zilongshanren
6318634887
Merge pull request #14641 from liamcindy/v3_ui_controlButton
...
fix controlButton test error
2015-12-14 19:47:41 +08:00