Бесшапошников Никита
54e457f1be
Fixed ccui scroll widgets constants for JS bindings
2016-04-11 11:29:00 +08:00
Ricardo Quesada
fea84b8af3
fix: use chipmunk v6.2 API whenever possible
...
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
2016-04-11 11:12:34 +08:00
pandamicro
79cfe8ac0e
Fix a issue in cc.CallFunc JSB implementation
2016-04-11 11:12:13 +08:00
CocosRobot
150ec2e7ce
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-11 11:11:54 +08:00
pandamicro
f9f9551645
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
pandamicro
bb2cfc7308
Update engine version
2016-04-11 11:11:17 +08:00
Бесшапошников Никита
9acde1bc06
Fixed ccui scroll widgets constants for JS bindings
2016-04-08 15:34:25 +03:00
pandamicro
f18763033d
Merge pull request #15390 from pandamicro/v3
...
Fix a issue in cc.CallFunc JSB implementation
2016-04-08 09:54:13 +08:00
zilongshanren
36c5ae4d9c
Merge pull request #15389 from CocosRobot/update_lua_bindings_1460042601
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-08 09:30:58 +08:00
Ricardo Quesada
c4230f839e
Merge pull request #15392 from ricardoquesada/chipmunk_js_fix
...
Chipmunk js fix
2016-04-07 16:24:28 -07:00
Ricardo Quesada
f243cc4ce3
fix: use chipmunk v6.2 API whenever possible
...
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
2016-04-07 16:22:49 -07:00
pandamicro
f1108bfbe3
Fix a issue in cc.CallFunc JSB implementation
2016-04-07 23:49:57 +08:00
CocosRobot
416d2531fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-07 15:25:41 +00:00
pandamicro
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro
1ada222c36
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
pandamicro
817f4f4871
Update engine version
2016-04-07 22:36:29 +08:00
pandamicro
9de585077a
Merge pull request #15369 from ntrrgc/develop
...
Make selectedSprite optional in JSB too
2016-04-07 17:07:03 +08:00
CocosRobot
dfe3dc5e14
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-07 07:46:49 +00:00
minggo
328331df4f
Merge pull request #15179 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types in PU and Lua
2016-04-07 15:41:00 +08:00
Ricardo Quesada
ae369c1b68
fix: compile in Windows
...
Github issue #15372
2016-04-06 10:26:46 -07:00
mogemimi
985155749b
Remove unnecessary const from return types in PU and Lua
2016-04-06 12:36:20 +09:00
minggo
6b167a1aa1
Merge pull request #15335 from mogemimi/fix-typos
...
Fix typos in comments and strings
2016-04-06 11:32:46 +08:00
Juan Luis Boya García
73b900a77f
Make selectedSprite optional in JSB too
2016-04-05 12:58:50 +02:00
CocosRobot
81448cd1b8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-02 12:06:57 +00:00
肖峰
5b10ab3c2d
rollback chipmunk export change
2016-03-31 11:01:58 +08:00
minggo
48d24f14d7
upgrade engine version
2016-03-30 15:17:49 +08:00
mogemimi
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
CocosRobot
6e12d8c98a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-22 12:58:39 +00:00
Xpol Wan
ae3fbcce79
Manually fixes include path for generated code.
2016-03-22 16:08:28 +08:00
Xpol Wan
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
CocosRobot
35645d8c26
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-22 06:24:54 +00:00
CocosRobot
97130dc084
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-21 12:56:42 +00:00
Xpol Wan
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
Xpol Wan
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
CocosRobot
e2f820df25
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-18 09:11:18 +00:00
zilongshanren
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
zilongshanren
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
zilongshanren
11ed05a0be
Merge pull request #15245 from mogemimi/fix-function-name
...
Fix incorrect function name of getTrianglesCount
2016-03-17 16:08:40 +08:00
CocosRobot
c250ac8bfd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 05:53:10 +00:00
mogemimi
2f75effe96
Add backwards compatibility for 'getTriaglesCount'
2016-03-17 14:22:09 +09:00
zilongshanren
d6f9ed93d6
add bindings
2016-03-17 11:56:48 +08:00
CocosRobot
69960024e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 03:42:52 +00:00
mogemimi
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
XiaoFeng
06ac05259b
More fix to compile libjscocos2dx as dll under win32
2016-03-14 12:06:14 +08:00
CocosRobot
16edf90f70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 14:40:00 +00:00
XiaoFeng
3acea03924
Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system
2016-03-11 15:44:28 +08:00
pandamicro
849a2ee544
Merge pull request #15215 from minggo/firefox-remote-debug
...
[ci skip]fix a bug that will miss packets
2016-03-09 16:59:03 +08:00
minggo
e44f4d8d61
fix a typo
2016-03-09 16:07:57 +08:00
minggo
8079c55d88
fix bug that will lost incoming packets
2016-03-09 16:03:55 +08:00
Ricardo Quesada
21cd5d08f7
Merge pull request #15177 from ricardoquesada/cmake_fixes
...
"cocos new" fixes for cmake
2016-03-04 12:38:13 -08:00
Ricardo Quesada
6a31f43a27
compiles on Mac. adds missing libs and files
2016-03-04 10:47:19 -08:00
CocosRobot
e31c918264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-04 08:14:39 +00:00
CocosRobot
169a81c6ea
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-03 07:57:25 +00:00
pandamicro
18a419a732
Merge pull request #15153 from minggo/firefox-remote-debug
...
[ci skip]add a function to get object name
2016-03-03 15:23:49 +08:00
minggo
f8580959f8
add a function to get object name
2016-03-02 15:51:29 +08:00
zilongshanren
859aadd5e9
Revert "[ci skip][AUTO]: updating luabinding & jsbinding automatically"
2016-03-02 14:10:40 +08:00
CocosRobot
6e0887b2c9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-02 03:38:29 +00:00
CocosRobot
56fa8fa759
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-01 00:27:33 +00:00
Ricardo Quesada
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 09:37:24 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Feb 27 01:11:13 2016 -0800
correct paths for win8.1
commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 22:46:58 2016 -0800
projects works on win32
commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:57:10 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:26:55 2016 -0800
trying to make it compile on win32
commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 10:28:12 2016 -0800
quick hack to make it compile...
...autogenerated files will fix it.
commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 09:20:59 2016 -0800
Squashed commit of the following:
commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 20:10:13 2016 -0800
compiles.. sort of
commit a7990e2888d5ef1e43b811148b23c0b899105ab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:55:24 2016 -0800
more chipmunk fixes
commit 1174f6ec8201324161d7946af0f493b136a56690
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:36:15 2016 -0800
more chipmunk fixes
commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
Merge: f942c5a 0594d3c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:29:27 2016 -0800
Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed
commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:28:51 2016 -0800
correct path for chipmunk
commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 18:44:05 2016 -0800
compiles on ios
commit 379503399c384ad77d25d68a2f83b71a829b1c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:51:36 2016 -0800
chipmunk include fixes
commit 95839fb7b406a32255853294b016d8c15aec1ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:09:04 2016 -0800
fixes for cmake + mac
commit 39449ea3b7efccae2946785c1c11433d964ee480
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:51:25 2016 -0800
correct includes
commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:35:40 2016 -0800
fixes chipmunk with cmake
commit 337f21f9466703722847635301d841ace9b757cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:42:01 2016 -0800
updates android and linux projects
commit 7111a9993b97f78cf73206804b25665c21a59ca8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:18:26 2016 -0800
cosmetic changes
commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:53:41 2016 -0800
chipmunk autogenerated files
commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:47:41 2016 -0800
compatibility both in JS (to reduce space)
and in C for (C++ users)
commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:10:02 2016 -0800
mooooore fixes
commit 9ab23014093677e8eda69b105f50410b8c792aa3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:30:58 2016 -0800
doesn't crash with collision handler
commit 69275a16817a038244bbaaff9e82a011b6729cb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:16:29 2016 -0800
adds missing space functions
commit a6b97bbc76cb9ab293356bb7451cfa858353f589
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 22:22:27 2016 -0800
queries... better
commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 19:48:41 2016 -0800
adds more missing functions
fixes other chipmunk JS issues
commit 3797a033896d059da58a05ce0de832ed9c150eff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 18:30:21 2016 -0800
yep... poly works ok
commit d1bb57776891605b9d3e4fb90736c6869d96b944
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:29 2016 -0800
neede compat files
commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:04 2016 -0800
query working!
commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:57:03 2016 -0800
almost there
commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:18:46 2016 -0800
fixes return values
commit 7218778da846e1e36a510c0a19a5ee76f91db032
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 20:36:14 2016 -0800
cpMomentForSegment is manual since parameter 4 is optional
in chipmunk 6, but not in 7
commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 17:29:28 2016 -0800
yeah... process the arguments correctly
works both for functions and auto_classes
commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 16:49:00 2016 -0800
compiles and links
fixes some issues with the queries.
returns shapes instad of the queryInfo
commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 15:03:18 2016 -0800
adds removeCollisionHandler and other fixes
commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 18 20:59:24 2016 -0800
compiles... doesn't work yet
commit bd64de81713fb2d7652a538d667d73f05f5d9320
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 17 18:17:39 2016 -0800
WIP: chipmunk bindings
2016-02-29 13:53:00 -08:00
CocosRobot
78c99e33e9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-26 02:11:26 +00:00
pandamicro
e991282ed8
Merge pull request #15109 from dongtaohan/v3
...
exported api for Cocos Studio.
2016-02-25 14:35:57 +08:00
CocosRobot
9a11556f4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-25 06:01:49 +00:00
dongtao.han
34b1c1bc18
exported js_get_type_from_native for cocos2d::Node type.
2016-02-25 09:47:19 +08:00
dongtao.han
7955721cb9
exported api.
2016-02-25 09:46:34 +08:00
Ricardo Quesada
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
CocosRobot
b2fd4b0c32
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-19 02:19:55 +00:00
mogemimi
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
肖峰
4e501149a3
Fix lua-test link error under linux
2016-02-18 10:53:33 +08:00
James Chen
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
CocosRobot
4d7186f5bd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-16 09:07:51 +00:00
pandamicro
6e7c9ab8db
Cleanup log
2016-02-15 17:19:37 +08:00
pandamicro
94c62bed53
Remove ScriptingCore::retainCount
2016-02-15 16:32:00 +08:00
CocosRobot
f1f0a7130f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-14 06:53:19 +00:00
pandamicro
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
CocosRobot
89c0c801b0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-11 13:40:35 +00:00
Ricardo Quesada
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 14:08:49 2016 -0800
Merge branch 'v3' into uniform_matrix_auto
commit d6c37297954af752ebf42ec5f71e5e2fe28c9cc2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 13:54:07 2016 -0800
works ok...
commit 45c288631989ea735cc31ec5aa683d9d41aacab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 12:58:34 2016 -0800
quad works!
commit 7137cff51df09adee7129738cea2b69da090756e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 3 16:19:34 2016 -0800
more optimizations... WIP... doesn't work yet
commit a8324c1a9acb6b82102e05eee6e5e5f341306c7b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 21:59:42 2016 -0800
compiles in release mode
more tests... better threshold
commit 884ffc756e7520fcbb9252260181538ec81b8368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 17:21:32 2016 -0800
initial uniform_auto_matrix commit
Changes the CC_matrix uniform in runtime depending on whether the command can be batched or not.
Lot of things missing, though... like performance tests.
2016-02-08 11:25:37 -08:00
pandamicro
c03d2c57d7
Made console.log writable
2016-02-05 15:13:07 +08:00
mogemimi
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
Wenhai Lin
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
CocosRobot
330751a150
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-03 09:50:03 +00:00
pandamicro
72be9a3966
Fix other issues
2016-02-02 23:39:18 +08:00
pandamicro
3c550853bc
Fix restart game issue and windows crash issue
2016-02-02 23:38:37 +08:00
pandamicro
08056b7b02
Fix debugger issue
2016-02-02 16:45:17 +08:00
CocosRobot
4ab9ffff4f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-01 06:34:11 +00:00
CocosRobot
346144742f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-28 04:01:53 +00:00
pandamicro
01f41921d1
Fix enableDebugger issue
2016-01-28 01:55:10 +08:00
pandamicro
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
pandamicro
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
pandamicro
554523a201
Use JS::Heap instead of Mozilla::maybe to improve stability
2016-01-28 01:03:13 +08:00
zilongshanren
366407ca1c
fix win32 compile issue
2016-01-27 20:21:32 +08:00
pandamicro
93987c7848
Remove PersistentRooted as much as possible and use pure JS references
2016-01-26 19:33:35 +08:00
zilongshanren
bc44769b8b
add more deprecated functions
2016-01-25 18:14:48 +08:00
zilongshanren
00ad5bd620
fix jsb deprecated constants
2016-01-25 15:40:51 +08:00
zilongshanren
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
pandamicro
d6cedb88ec
Remove JS::Persistent and move js object reference into JS scope
2016-01-24 19:47:26 +08:00
pandamicro
0daa846020
Improve gc test case and add cycle reference tests
...
t
Improve gc test case and add action cycle reference test
2016-01-24 19:47:24 +08:00
CocosRobot
039286f814
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-22 14:25:59 +00:00
James Chen
ed9ed6c92f
Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing.
2016-01-22 14:22:33 +08:00
Ricardo Quesada
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
zilongshanren
8fda08abcd
Merge pull request #14755 from mogemimi/fix-redefinition-warning
...
Fix OpenGL macro redefinition warning in JS bindings/Mac
2016-01-21 10:46:58 +08:00
CocosRobot
4dab20b715
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-21 02:37:23 +00:00
Ricardo Quesada
7735a75651
adds JS tests for RichText
2016-01-20 17:59:13 -08:00
mogemimi
73793a8317
Fix macro redefinition warning in JS bindings/Mac
2016-01-20 23:17:24 +09:00
CocosRobot
b340e48cb1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 10:21:41 +00:00
pandamicro
39ab445f7d
Merge pull request #14904 from pandamicro/v3
...
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
pandamicro
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
pandamicro
f8016978ff
Fix an improper macro syntax for windows platform
2016-01-18 14:28:39 +08:00
pandamicro
8bc9f712ea
Merge pull request #14895 from minggo/firefox-remote-debug
...
web console supports for JSB projects
2016-01-15 21:27:27 +08:00
minggo
5f9bd06bee
support webconsole
2016-01-15 18:05:59 +08:00
minggo
e062ade514
make require() returns the value of last statement
2016-01-15 18:02:11 +08:00
pandamicro
2640396822
Merge pull request #14890 from minggo/firefox-remote-debug
...
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 12:48:46 +08:00
minggo
299a56d52e
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 11:39:17 +08:00
Ricardo Quesada
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
James Chen
f9e8ae0f09
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-01-13 21:14:38 +08:00
mogemimi
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
XiaoFeng
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
XiaoFeng
0fcfb359d2
Fix more js parser font setting error
2016-01-06 20:42:27 +08:00
XiaoFeng
d82b6b6f1c
Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader
2016-01-06 19:36:32 +08:00
zilongshanren
100a119181
add overFlow enum to jsb and lua.
...
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
Ricardo Quesada
b92b67edad
moves macro definition to `ccConfig.h`
2015-12-29 17:36:02 -08:00
Ricardo Quesada
7cd80cb669
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-29 17:36:02 -08:00
pandamicro
6ea389f475
Merge pull request #14815 from pandamicro/v3.10
...
Made require overwritable
2015-12-29 22:06:00 +08:00
pandamicro
daac6ceb08
Made require overwritable
2015-12-29 21:28:30 +08:00
Ricardo Quesada
666a6c6f88
adds missing scheme files
2015-12-28 16:42:44 -08:00
Ricardo Quesada
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
xiaofeng11
69a6406661
Merge pull request #14805 from pandamicro/v3.10
...
Fix JSB issues on win32
2015-12-25 20:06:47 +08:00
pandamicro
fe1336bdc7
Fix chipmunk cpSpaceAddCollisionHandler issue on argument parsing
2015-12-25 19:08:33 +08:00
pandamicro
2ce866c4ba
Fix jsb_ref_rebind issue on win32 (mystery GC crash)
2015-12-25 19:08:32 +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
pandamicro
acf03c06d5
Fixed WebSocket JSB crash issue
2015-12-23 23:28:14 +08:00
mogemimi
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
CocosRobot
30f3096c92
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-21 11:36:07 +00:00
pandamicro
8d8ac60625
Merge pull request #14761 from pandamicro/v3.10
...
Correct return type to adopt GC Rooting API
2015-12-21 11:46:59 +08:00
pandamicro
616f5c0a01
Correct return type to adopt GC Rooting API
2015-12-21 11:07:40 +08:00
pandamicro
4e36e24993
Correct return type to adopt GC Rooting API
2015-12-21 10:42:54 +08:00
pandamicro
81918f51ea
Fix event handle function issue with compartment
...
and Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
pandamicro
8d712a4c45
Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2015-12-21 00:16:17 +08:00
pandamicro
34c7331b99
Issue fixes for new memory model
2015-12-21 00:16:17 +08:00
pandamicro
8ddaf310ef
Update manual bindings to use the new memory model
2015-12-21 00:16:16 +08:00
pandamicro
e1bc6640f4
Implement full GC relied memory model
2015-12-21 00:14:51 +08:00
pandamicro
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
pandamicro
1071f63ac7
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-12-20 22:45:51 +08:00
pandamicro
f747075a83
Merge pull request #14748 from pandamicro/v3.10
...
Temporary disable forceGC on win32
2015-12-19 23:27:12 +08:00
pandamicro
8f836162aa
Temporary disable forceGC on win32
2015-12-19 22:45:57 +08:00
pandamicro
386b850871
Fix issue in MenuItem init usage
2015-12-19 22:45:22 +08:00
pandamicro
ae48253da6
Fix UI addEventListener issue
2015-12-19 22:44:25 +08:00
fanli
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
CocosRobot
0f90f74df9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-19 09:12:27 +00:00
pandamicro
6481a0f3c1
Merge pull request #14740 from xiaofeng11/v3.10
...
Bug Fix & h5 engine ref update
2015-12-19 14:13:37 +08:00
XiaoFeng
a139221618
Synchronize parser match modify from h5 engine
...
Update h5 engine ref
2015-12-19 13:56:12 +08:00
CocosRobot
b5141a28bd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-18 13:28:14 +00:00
xiaofeng11
2ee5c88f9a
Merge pull request #14733 from xiaofeng11/v3.10
...
Update h5 sub-module ref
2015-12-18 19:06:59 +08:00
XiaoFeng
a13a0c35d3
Update h5 sub-module ref
...
Synchronize studio parser match change from h5 modify
2015-12-18 15:40:21 +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
Wenhai Lin
66b0a0e9b1
Adds `std::nothrow` to the `new` statements
2015-12-16 17:06:56 +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
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
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
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
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
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
Dale Stammen
46b926a18e
added missing _USRJSSTATIC preprocessor define for ARM builds
2015-12-14 14:55:33 -08:00
pandamicro
0e7a02d025
Merge pull request #14670 from pandamicro/v3
...
Fix evalString doesn't return result issue
2015-12-14 17:26:34 +08:00
pandamicro
662c7fbec5
Made API consistent with old version
2015-12-14 13:55:17 +08:00
pandamicro
cbce4d37c3
Merge pull request #14671 from ricardoquesada/more_js_fixes
...
More js fixes
2015-12-14 13:41:59 +08:00
pandamicro
330b588215
Fix evalString doesn't return result issue
2015-12-14 13:13:54 +08:00
pandamicro
41218a65e7
Merge pull request #14668 from pandamicro/v3
...
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
XiaoFeng
4815ec8b9a
Update version number to v3.10
2015-12-14 10:32:29 +08:00
pandamicro
445442c964
Upgrade spider monkey to solve win32 js project crash issue
2015-12-14 10:27:11 +08:00
CocosRobot
0473dd88fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-13 03:12:14 +00:00
pandamicro
2ef0197534
Merge pull request #14643 from GuoLunHao/v3.10
...
fix compile error and link error on ios/Mac platform
2015-12-12 23:46:32 +08:00
Ricardo Quesada
c5058aa2f9
more conversions
2015-12-11 17:18:20 -08:00
Ricardo Quesada
47911e0c24
more js fixes
...
fixes in how ref count is measured
opengl bindings converted to new API
2015-12-11 15:18:09 -08:00
CocosRobot
71f9ead981
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-11 17:52:29 +00:00
Ricardo Quesada
fd321530e5
restores autobindings
2015-12-11 08:59:35 -08:00
XiaoFeng
49d03d9de1
Synchronize js parsers modification from html5 version
2015-12-11 18:22:02 +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
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
GuoLunHao
5872745593
fix compile error and link error on ios/Mac platform
2015-12-10 16:43:01 +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
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
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
lunhao.guo
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
Ricardo Quesada
96ee343884
fixes for windows
2015-12-08 20:07:13 -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
CocosRobot
7e803cbd0a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-07 03:30:43 +00:00
zilongshanren
c9d32a83b8
Merge pull request #14597 from mogemimi/fix-api-spelling
...
Fix misspelled APIs in v3.10
2015-12-07 11:07:13 +08:00
Ricardo Quesada
d02f4afd4a
using new bindings templates
...
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
mogemimi
c7640c8aaf
Replace 'resoucedata' with 'resourcedata' in JS Binding
2015-12-05 18:59:54 +09:00
mogemimi
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
Ricardo Quesada
aebfefd7a8
Merge branch 'v3' into js_more_conversions
2015-12-04 19:01:20 -08:00
Ricardo Quesada
cd8631ef09
sfunction "create" uses new optimized code
...
...although this code should never be called
2015-12-04 18:42:31 -08:00
Pan Demosthenous
54ac5d8d2e
fix allocation issue with remote images
2015-12-05 10:10:58 +11:00
pandamicro
d371ec2c8a
Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 17:53:46 +08:00
pandamicro
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
CocosRobot
d5e54bdb81
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:48:13 +00:00
pandamicro
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
XiaoFeng
8f9ea8a87e
Add missing lua engine export declaration.
2015-12-04 15:23:59 +08:00
CocosRobot
d09eae92f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 07:13:02 +00:00
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
CocosRobot
fd2d616aed
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 02:03:46 +00:00
Ricardo Quesada
49882ed91c
js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI
2015-12-03 15:49:56 -08:00
Ricardo Quesada
b87975096e
GLProgram converted to new JSAPI
2015-12-03 15:47:39 -08:00
Ricardo Quesada
67948ff8c8
adds jsb_ref_get_or_create_jsobject()
...
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
2015-12-03 15:40:52 -08:00
Ricardo Quesada
37b4c3fe6a
CallFuncN converted to new JS API
2015-12-03 15:24:37 -08:00
Ricardo Quesada
013f5b8d33
layerMultiplex converted to new JS API
2015-12-03 15:15:47 -08:00
Ricardo Quesada
3100cba5a1
Animation ported to JS
2015-12-03 15:02:39 -08:00
Ricardo Quesada
cc6e72fe7c
MenuToggleItem converted
2015-12-03 14:54:38 -08:00
Ricardo Quesada
e5032dccc0
rootObject/unrootObject working again
2015-12-03 14:49:23 -08:00
Ricardo Quesada
bd943c5415
Sequence/Spawn converted to use new API
2015-12-03 13:56:00 -08:00
CocosRobot
3edadc035b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 21:34:13 +00:00
pandamicro
c304348c34
Merge pull request #14565 from pandamicro/v3
...
Add js test case for fix, improve template
2015-12-03 18:48:34 +08:00
pandamicro
4cc4dd3a9f
Fix Rooting API usage issue in cocos2d_specifics
2015-12-03 16:48:25 +08:00
CocosRobot
b1fd2277d8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 07:53:26 +00:00
XiaoFeng
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +08:00
Ricardo Quesada
58e4d3c487
JS Menu fixes
2015-12-02 17:30:54 -08:00
Ricardo Quesada
48523572b7
label JS fixes
2015-12-02 17:23:23 -08:00
Ricardo Quesada
6e50cf883f
Sprite::create() using new API...
...
...also code easier to understand
2015-12-02 16:45:28 -08:00
Ricardo Quesada
c321d35a9a
Squashed commit of the following:
...
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Dec 2 10:38:27 2015 -0800
updated submodule
commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 19:21:34 2015 -0800
ooops... thanks Panda
commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 18:19:16 2015 -0800
better macro name for GC. Thanks panda
commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 17:10:32 2015 -0800
RepeatForever, Repeat and Speed converted
commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 14:31:32 2015 -0800
cherry-picking changes to disable retain/release from GC
commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:31:04 2015 -0800
fixes autorelease issues on rebind
commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:23:33 2015 -0800
my JS changes... again
2015-12-02 14:45:13 -08:00
XiaoFeng
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
CocosRobot
edd786e7f6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 06:30:18 +00:00
CocosRobot
0c67171b9d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 02:05:32 +00:00
XiaoFeng
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
XiaoFeng
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
CocosRobot
e891b03eee
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-01 04:32:19 +00:00
pandamicro
81f590e52a
Merge pull request #14478 from pandamicro/v3
...
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
pandamicro
17bdfb4050
Fix android compilation issue
2015-11-30 15:20:57 +08:00
XiaoFeng
89ef6da5b5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/2d/CCFontFNT.h
2015-11-28 12:48:55 +08:00
pandamicro
43c68aa16b
Fix Chipmunk bindings issue
2015-11-27 22:38:16 +08:00
CocosRobot
5c9084fd7d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-27 09:41:59 +00:00
pandamicro
e13e0cb886
Fix getJSObject issues
2015-11-27 14:54:25 +08:00
XiaoFeng
ec1d76b15e
Fix compile error
2015-11-27 13:08:22 +08:00
XiaoFeng
9e50c010e9
Fix win8.1 project compile error
2015-11-27 11:49:35 +08:00
pandamicro
1ee7b11e31
Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject
2015-11-27 10:20:51 +08:00
pandamicro
8320c2f702
Use rooted object for js_proxy new and get
2015-11-27 10:19:13 +08:00
pandamicro
d23ffe4fc7
Fix some issue of js_type_class usage
2015-11-27 10:16:11 +08:00
pandamicro
73c3a5dcf5
Activate DEBUG to test
2015-11-27 01:35:07 +08:00
pandamicro
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
XiaoFeng
24dc9f3392
update code as comment
2015-11-26 17:39:57 +08:00
XiaoFeng
58dd27efd3
add missing return type
2015-11-26 17:33:45 +08:00