Nite Luo
|
83972ecf57
|
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
|
2013-11-27 10:16:34 -08:00 |
Nite Luo
|
75381ebc51
|
Merge branch 'develop' into newRenderer
|
2013-11-27 10:16:17 -08:00 |
darkdukey
|
6538455643
|
Merge pull request #1 from dabingnn/newRendererCulling
New renderer culling
|
2013-11-26 23:02:44 -08:00 |
James Chen
|
468ba24183
|
Merge pull request #4397 from CocosRobot/updategeneratedsubmodule_1385533506
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-26 22:32:04 -08:00 |
James Chen
|
749fc5d95b
|
Update CHANGELOG [ci skip]
|
2013-11-27 14:31:05 +08:00 |
Huabing.Xu
|
ea46e1c658
|
change test case
|
2013-11-27 14:30:38 +08:00 |
James Chen
|
1a283ab600
|
Merge pull request #4396 from dumganhar/iss3289-armature-crash
closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes...
|
2013-11-26 22:29:36 -08:00 |
CocosRobot
|
4d327b8180
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-27 06:25:08 +00:00 |
James Chen
|
c63698b488
|
Update CHANGELOG [ci skip]
|
2013-11-27 14:23:24 +08:00 |
James Chen
|
2bfb6af1d8
|
Merge pull request #4395 from dumganhar/iss3288-bind-unsigned-long
closed #3288: Bindings-generator needs to support 'unsigned long'
|
2013-11-26 22:21:08 -08:00 |
James Chen
|
6dc9183c8a
|
closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes!
|
2013-11-27 14:12:43 +08:00 |
James Chen
|
216f8743b0
|
closed #3288: Updates bindings-generator.
|
2013-11-27 14:04:53 +08:00 |
James Chen
|
4311e7c469
|
[Script Binding] Bind ‘unsigned long’.
|
2013-11-27 13:52:41 +08:00 |
minggo
|
bd5ff294f8
|
Merge pull request #4391 from minggo/fix-warnings
[ci skip]use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings
|
2013-11-26 19:04:15 -08:00 |
James Chen
|
94c41ea51e
|
Update CHANGELOG [ci skip]
|
2013-11-27 11:03:16 +08:00 |
James Chen
|
f4610c5272
|
Merge pull request #4382 from dumganhar/iss3279-xmlhttprequest-bin
closed #3279: XMLHttpRequest receives wrong binary array.
|
2013-11-26 19:02:07 -08:00 |
Huabing.Xu
|
f8281cbb93
|
add test case scale
|
2013-11-27 10:41:01 +08:00 |
Huabing.Xu
|
dd6c14e88d
|
add test case
|
2013-11-27 10:35:23 +08:00 |
Huabing.Xu
|
3da196ea43
|
add Frustum culling to new Sprite
|
2013-11-27 10:35:12 +08:00 |
Huabing.Xu
|
80da1dac3f
|
add Frustum, AABB, ViewTransform
|
2013-11-27 10:34:30 +08:00 |
minggo
|
3469f2adf5
|
closed #2539:use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings
|
2013-11-27 10:34:05 +08:00 |
James Chen
|
6d8b7fb494
|
Merge pull request #4390 from CocosRobot/updategeneratedsubmodule_1385518720
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-26 18:29:03 -08:00 |
CocosRobot
|
dda13b7e8a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-27 02:18:42 +00:00 |
James Chen
|
6c097fa692
|
Merge pull request #4389 from minggo/remove-unneeded-codes
override addChild in Sprite to fix error in binding generator
|
2013-11-26 18:14:20 -08:00 |
minggo
|
0ac9022201
|
fix a typo
|
2013-11-27 10:02:32 +08:00 |
minggo
|
85002285c2
|
override addChild in Sprite to fix error in binding generator
|
2013-11-27 09:50:47 +08:00 |
Nite Luo
|
3123c70153
|
Sprite are now using NewRenderer
|
2013-11-26 17:13:04 -08:00 |
Nite Luo
|
bf53cc116b
|
use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode
|
2013-11-26 17:01:32 -08:00 |
Nite Luo
|
f1ca3f9a8a
|
Fix NewRendererTest after change
|
2013-11-26 16:54:48 -08:00 |
Ricardo Quesada
|
4a59cc6297
|
Merge pull request #4387 from ricardoquesada/build_type_conf
Reports wether the build is DEBUG or RELEASE
|
2013-11-26 14:37:33 -08:00 |
Ricardo Quesada
|
b7f7b0dae4
|
Reports wether the build is DEBUG or RELEASE
Reports wether the build is DEBUG or RELEASE in Configuration
|
2013-11-26 14:36:31 -08:00 |
Nite Luo
|
92b57c79ba
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCClippingNode.h
cocos/2d/CCLayer.h
|
2013-11-26 11:56:03 -08:00 |
Nite Luo
|
61ca4f0137
|
Fix a bug with NewSprite Update Quad
|
2013-11-26 11:48:37 -08:00 |
James Chen
|
f6a1f5cc95
|
issue #3279: A warning fix for 64bit platform.
|
2013-11-26 21:54:48 +08:00 |
James Chen
|
ecc7783685
|
closed #3279: XMLHttpRequest receives wrong binary array.
|
2013-11-26 20:31:44 +08:00 |
James Chen
|
770b806216
|
Merge pull request #4380 from minggo/remove-unneeded-codes
remove unneeded codes
|
2013-11-26 03:04:04 -08:00 |
minggo
|
fcf43823b4
|
remove unneeded codes
|
2013-11-26 17:53:34 +08:00 |
minggo
|
ba101809de
|
[ci skip]
|
2013-11-26 17:49:50 +08:00 |
minggo
|
6c7cb0bf23
|
Merge pull request #4359 from Dhilan007/androdi_build
[ci skip]add proceed java compilation and generate apk.
|
2013-11-26 01:47:14 -08:00 |
James Chen
|
888fd73702
|
Update AUTHORS
|
2013-11-26 17:44:24 +08:00 |
James Chen
|
23de9bf8cd
|
Merge pull request #4378 from hulefei/dev_addGuiNamespace
add gui namespace before SEL_TouchEvent
|
2013-11-26 01:43:36 -08:00 |
hanson
|
d650c0a6a1
|
add gui namespace before SEL_TouchEvent
|
2013-11-26 17:03:01 +08:00 |
James Chen
|
1a34ce2a9b
|
Merge pull request #4376 from CocosRobot/updategeneratedsubmodule_1385454978
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
|
2013-11-26 00:45:25 -08:00 |
CocosRobot
|
17c4631f45
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-26 08:36:22 +00:00 |
James Chen
|
999b7ccd07
|
Merge pull request #4375 from dumganhar/constructors_are_protected
issue #3258: Merge PR #4351: Constructors are protected
|
2013-11-26 00:30:06 -08:00 |
James Chen
|
a04c45f0d9
|
issue #3258: Renames ControlSwitchSprite::createWithMaskSprite to ControlSwitchSprite::create.
|
2013-11-26 16:19:12 +08:00 |
James Chen
|
63702188be
|
issue #3258: Compilation error fix for linux port.
|
2013-11-26 15:56:43 +08:00 |
James Chen
|
03005173b1
|
issue #3258: Updates bindings-generator.
|
2013-11-26 15:45:09 +08:00 |
James Chen
|
ebcdf2f87d
|
issue #3258: Bug fix of MenuItemToggle binding.
|
2013-11-26 15:44:49 +08:00 |
James Chen
|
b55e8f17c7
|
issue #3258: MenuItemFont has empty argument create function now.
|
2013-11-26 15:44:21 +08:00 |