minggo
563450624f
Merge pull request #3542 from natural-law/develop
...
Add code of plugin as a submodule.
2013-09-05 18:35:28 -07:00
minggo
249b4d79a3
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
...
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
zhangbin
eace2d1381
Add plugin code as submodule
2013-09-05 14:09:09 +08:00
zhangbin
b550d6c429
Remove the code of plugin.
2013-09-05 14:08:07 +08:00
samuele3hu
5d22b8671e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView
2013-09-04 22:19:10 +08:00
samuele3hu
4f9a9bfe85
issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
2013-09-04 22:17:26 +08:00
James Chen
850efa5eac
Merge pull request #3538 from dumganhar/iss2766-memory-leak-develop
...
closed #2766 : Memory leak in the binding glue code of cc.FileUtils.getStringFromFile(getByteArrayFromFile).
2013-09-04 01:42:26 -07:00
James Chen
00c0b94d65
closed #2766 : Memory leak in the binding glue code of cc.FileUtils.getStringFromFile(getByteArrayFromFile).
2013-09-04 16:38:07 +08:00
James Chen
80e46dc8c1
Merge pull request #3537 from samuele3hu/TableView
...
issue #2764:Add TableView lua binding and releated test sample
2013-09-04 00:04:32 -07:00
James Chen
3abfafe4e8
Merge pull request #3535 from CocosRobot/updategeneratedsubmodule_1378260416
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-09-03 23:20:29 -07:00
samuele3hu
32d056df18
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView
2013-09-04 14:03:21 +08:00
samuele3hu
6815e01f84
issue #2764:Add TableView lua binding and releated test sample
2013-09-04 14:02:22 +08:00
minggo
9dedb072e6
Merge pull request #3528 from natural-law/ForPlugin
...
Modify the method cocos_android_app_init()
2013-09-03 22:50:40 -07:00
CocosRobot
0780e90000
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-09-04 02:06:59 +00:00
minggo
b419b67001
Merge pull request #3530 from ricardoquesada/sprite_batch_node_perf_improvements
...
Little performance improvements in SpriteBatchNode
2013-09-03 18:59:21 -07:00
Ricardo Quesada
befcf722b6
compiles Linux / Windows
2013-09-03 10:17:25 -07:00
Ricardo Quesada
ee638b9c8b
removes 'private' section from SpriteBatchNode
2013-09-02 16:56:14 -07:00
Ricardo Quesada
088a11ad0d
Little performance improvements in SpriteBatchNode
...
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
2013-09-02 16:44:25 -07:00
zhangbin
b854c25103
Add parameter in method cocos_android_app_init() to initialize plugin.
2013-09-02 16:10:08 +08:00
Huabing.Xu
4c12f4029a
issue #2460 : project template for glfw
2013-09-02 13:48:39 +08:00
minggo
bc01e44f06
Merge pull request #3523 from samuele3hu/iss2433-lua-bindings-generator-new
...
Iss2433: Remoe some functions and files in cocos2dx-support
2013-09-01 20:51:35 -07:00
Huabing.Xu
bc5ae78423
issue #2460 : change other sample projects to glfw version
2013-09-02 11:46:23 +08:00
samuele3hu
71e0c4064a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new
2013-09-02 10:55:31 +08:00
samuele3hu
6eb5805e33
issue #2433:Remove some functions and files in cocos2dx_support
2013-09-02 10:54:39 +08:00
minggo
04ab331827
Merge pull request #3520 from CocosRobot/updategeneratedsubmodule_1378048657
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-09-01 08:42:07 -07:00
CocosRobot
115debd953
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-09-01 15:17:40 +00:00
minggo
54a5f1e870
Merge pull request #3516 from minggo/perf_addchild_test_fix
...
Perf addchild test fix
2013-09-01 08:12:24 -07:00
minggo
8e9131c2a2
Merge pull request #3514 from ricardoquesada/spritebatchnode_best_practices
...
SpriteBatchNode: follows C++ best practices
2013-09-01 07:45:50 -07:00
minggo
2c6665ac3b
add missing head
2013-09-01 22:41:11 +08:00
Ricardo Quesada
be0c8cb1e8
adds two more perf tests
...
Node::addChild and Node::removeChild
2013-08-31 17:08:51 -07:00
Ricardo Quesada
0d96a0ce40
resets random seed before each test
2013-08-31 15:49:25 -07:00
Ricardo Quesada
b697e2bc99
uses std::sort() by default
2013-08-31 15:37:35 -07:00
Ricardo Quesada
d41fdea999
objectComparisonLess -> nodeComparisonLess
...
and unified it.
No need to have 3 different copies.
The only copy is in CCNode.cpp
2013-08-31 15:18:28 -07:00
Ricardo Quesada
1393fb356a
SpriteBatchNode: follows C++ best practices
...
removes hungarian notation
uses `int` instead of `unsigned int`
Add more asserts
2013-08-31 10:38:10 -07:00
Ricardo Quesada
a5e0febc3e
Adds better names to test
...
And new values for get(),add(),remove(),sort(),reorder()
2013-08-31 07:27:56 -07:00
Ricardo Quesada
5abb57e5f2
AddChild test fix
...
`sortAllChildren` should not be part of the test.
It is tested separatedly on another test
2013-08-31 06:59:44 -07:00
James Chen
57f012f331
Merge pull request #3512 from CocosRobot/updategeneratedsubmodule_1377946618
...
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
2013-08-31 05:44:26 -07:00
CocosRobot
f678a4a9a3
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-31 10:57:01 +00:00
James Chen
b7258abbe6
Merge pull request #3510 from samuele3hu/iss2433-lua-bindings-generator-new
...
Iss2433:Add deprecated class and enums and modify some project config and test samples
2013-08-31 03:52:41 -07:00
James Chen
35f1a61a6d
Merge pull request #3511 from ricardoquesada/kazmath_bug_fix
...
Ooops, reverting optimization for C
2013-08-31 03:39:39 -07:00
Ricardo Quesada
9ad1ab50fd
compiles on ARM
2013-08-30 21:08:28 -07:00
Ricardo Quesada
09c0234821
Ooops, reverting optimization for C
...
still valid for Neon, but the current optimization is not valid for C.
Please, apply this patch otherwise cocos2d won't work correctly
on simulator, windows, linux, mac, etc...
2013-08-30 20:59:01 -07:00
samuele3hu
564a77edf6
issue #2433:Modify template/multi_platform_lua/Resources/hello.lua
2013-08-30 17:18:47 +08:00
samuele3hu
5ee2a7e58e
issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator
2013-08-30 17:15:16 +08:00
samuele3hu
8f338cc209
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-08-30 15:21:59 +08:00
samuele3hu
f184d7cd8f
issue #2433:Replace ccDraw** in DrawPrimitives with draw**
2013-08-30 15:06:00 +08:00
samuele3hu
f56c6f7087
issue #2433:Modify platform config and some test samples
2013-08-30 11:56:35 +08:00
minggo
4a49834c93
Merge pull request #3507 from ricardoquesada/fps_to_0_1s
...
revert back fps interval to 0.1s
2013-08-29 20:10:06 -07:00
Ricardo Quesada
c599ecb260
revert back fps interval to 0.1s
...
Why was it set to 2 seconds?
2013-08-29 20:05:14 -07:00
Huabing.Xu
ef7f51d875
issue #2460 : script compile error
2013-08-30 10:29:59 +08:00