pandamicro
445442c964
Upgrade spider monkey to solve win32 js project crash issue
2015-12-14 10:27:11 +08:00
pandamicro
1935e2a89b
Merge pull request #14655 from CocosRobot/update_lua_bindings_1449976044
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-13 11:12:35 +08:00
CocosRobot
0473dd88fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-13 03:12:14 +00:00
pandamicro
a80ca25d63
Merge pull request #14576 from mogemimi/fix-deprecation-warns-particle3d
...
Fix deprecation warnings in PU
2015-12-13 11:09:47 +08:00
pandamicro
2f4867c2af
Merge pull request #14415 from mogemimi/fix-mismatch-include-guards
...
Fix inconsistent header include guards
2015-12-13 11:04:18 +08:00
pandamicro
07077f5c36
Merge pull request #14650 from mogemimi/fix-typo-extensions
...
Fix typos in documentation and comments
2015-12-13 11:03:24 +08:00
mogemimi
07673f71cd
Fix inconsistent header include guards
2015-12-12 21:05:22 +09:00
mogemimi
8df13ad6f9
Replace non-ASCII characters in comments
2015-12-12 21:04:23 +09:00
mogemimi
d27f50aaf2
Fix typos in documentation and comments
2015-12-12 21:04:22 +09:00
mogemimi
3bb9a37393
Fix deprecation warnings in PU
2015-12-12 17:50:32 +09:00
Ricardo Quesada
7e72a7110c
Merge pull request #14651 from CocosRobot/update_lua_bindings_1449856025
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-11 09:56:08 -08:00
CocosRobot
71f9ead981
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-11 17:52:29 +00:00
Ricardo Quesada
8878992a79
Merge pull request #14645 from ricardoquesada/js_fixes
...
Squashed commit of the following:
2015-12-11 09:42:53 -08:00
Ricardo Quesada
fd321530e5
restores autobindings
2015-12-11 08:59:35 -08:00
Ricardo Quesada
8b2dfb1a4b
Mooooores fixes
...
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
zilongshanren
a9f404c200
Update CHANGELOG
2015-12-11 13:56:29 +08:00
Ricardo Quesada
c034303ad8
Adds MemoryModelTest
2015-12-10 18:22:10 -08:00
Ricardo Quesada
96d391ea30
Squashed commit of the following:
...
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:58:41 2015 -0800
compiles with new GC model
commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:41:15 2015 -0800
Animation3D works Ok
commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:39:50 2015 -0800
Sprite3d create: converted to new API
commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:27:33 2015 -0800
ouch...
commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:12:25 2015 -0800
Spawn/Sequence init* were not bound
Fixed. Now JS Scheduler Test works Ok
2015-12-10 18:02:55 -08:00
Ricardo Quesada
2420c942c3
Merge pull request #14617 from chengstory/#24345
...
Fix #24345
2015-12-10 09:19:30 -08:00
pandamicro
aa66e3a97c
Merge pull request #14629 from MSOpenTech/v3-winrt-3.10
...
V3.10 winrt updates
2015-12-10 10:05:23 +08:00
pandamicro
cb22de5a09
Merge pull request #14590 from pandemosth/issue_14589
...
Fixes #14589 allocation issue with remote images
2015-12-10 10:04:29 +08:00
pandamicro
ab45a69136
Merge pull request #14630 from CocosRobot/update_lua_bindings_1449711652
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-10 09:58:36 +08:00
CocosRobot
6727719cb7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-10 01:47:27 +00:00
pandamicro
ceac1d9d6a
Merge pull request #14626 from dumganhar/v3
...
Bug fix for shouldStartLoading method, should return value from JS
2015-12-10 09:36:28 +08:00
Dale Stammen
908d872a0e
updated winrt template files with typo fixes
2015-12-09 17:33:50 -08:00
Dale Stammen
35c855a565
updated dll name to v3.10
2015-12-09 17:33:14 -08:00
Dale Stammen
6a06f6c3ad
ignore VS2015 .opendb files
2015-12-09 17:25:16 -08:00
Slack-Moehrle
ea2354932c
Merge pull request #14614 from mogemimi/fix-doc-and-comment-typo
...
Fix typo in documentation and comments
2015-12-09 14:08:57 -05:00
Slack-Moehrle
b1480c393a
Merge pull request #14587 from cocos2d/slackmoehrle-patch-1
...
added learning, spreading the word, where to get help
2015-12-09 14:07:56 -05:00
James Chen
65eb5fa4ba
Bug fix for shouldStartLoading method, should return value from JS, also fix that webview callback is already in Cocos Thread, don't need to post to cocos thread for running again.
2015-12-09 22:40:57 +08:00
pandamicro
936ff936e2
Merge pull request #14621 from GuoLunHao/v3
...
fix the link error and compile error in windows and android platform
2015-12-09 20:25:15 +08:00
lunhao.guo
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
zilongshanren
aedd48e74b
Merge pull request #14615 from xiaofeng11/v3_testBugFix
...
Remove default focus item from "Node:UI->1:GUI Dynamic Create Test->4:Focus Test"
2015-12-09 18:36:08 +08:00
zilongshanren
666281754d
Merge pull request #14616 from zilongshanren/fixLoadingBarScale9Rendering
...
Refactoring Scale9 ui widgets to use the latest RenderingType feature.
2015-12-09 18:34:57 +08:00
zilongshanren
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
zhangcheng
2a806a82c6
Fix #24345
...
TMX Iso Zorder and TMX Ortho Zorder rendering error in TestCPP.
2015-12-09 15:07:58 +08:00
zilongshanren
e37e1909f2
don't remove optimize code for capInsets
2015-12-09 15:00:41 +08:00
zilongshanren
db05c13407
update ccs-res ref
2015-12-09 14:45:41 +08:00
zilongshanren
df44b164ef
change layout scale9 rendering type to simple
2015-12-09 14:38:53 +08:00
zilongshanren
4c99bdf04f
change imageview non-s9 to simple rendering type
2015-12-09 14:26:12 +08:00
zilongshanren
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
Ricardo Quesada
2251b52929
Merge pull request #14611 from ricardoquesada/js_get_or_create_jsobject
...
js_get_or_create_jsobject() and other stuff
2015-12-08 20:48:58 -08:00
Ricardo Quesada
96ee343884
fixes for windows
2015-12-08 20:07:13 -08:00
zilongshanren
9fd5985581
add simple rendering mode to slider
2015-12-09 11:32:52 +08:00
XiaoFeng
724e9b42a2
Remove default focus item from "Node:UI-->1:GUI Dynamic Create Test-->4:Focus Test"
2015-12-09 11:12:42 +08:00
zilongshanren
a671bf7ce9
loading bar use new scale9 feature
2015-12-09 10:41:31 +08:00
mogemimi
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
zilongshanren
ea5dacedd0
Merge pull request #14608 from xiaofeng11/v3_310fix
...
Bug fix & make test case more clear.
2015-12-08 18:05:36 +08:00
Ricardo Quesada
e675657cae
improved docstrings
2015-12-07 19:14:10 -08:00
Ricardo Quesada
13dc967b03
js_get_or_create_jsobject() and other stuff
...
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()
Squashed commit of the following:
commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:04:24 2015 -0800
logging added (and commented)
will be useful in the future
commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:00:09 2015 -0800
new js_get_or_create_jsobject<T>
Specializes Template on cocos2d::Ref.
When Ref, it calls the `jsb_ref` functions
commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 13:31:52 2015 -0800
singletons converted
commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 12:20:07 2015 -0800
getDescendants() converted
2015-12-07 19:05:23 -08:00