minggo
|
16cb5f32d3
|
[ci skip]update CHANGELOG
|
2015-04-10 09:37:45 +08:00 |
minggo
|
e59e61b34f
|
[ci skip]update AUTHORS
|
2015-04-10 09:35:26 +08:00 |
minggo
|
0aef6b9446
|
Merge pull request #11295 from Almax27/v3
RenderQueue command buffer optimisation
|
2015-04-10 09:33:43 +08:00 |
XiaoYang
|
fc4ffe6a7c
|
Merge pull request #295 from songchengjiang/v3
fix the bug of PURibbonTrail
|
2015-04-10 09:09:45 +08:00 |
Ricardo Quesada
|
b409f20fcd
|
Merge pull request #11365 from ricardoquesada/cpp_compiles_on_mac
removes warning
|
2015-04-09 15:41:54 -07:00 |
Ricardo Quesada
|
967f35ad82
|
removes warning
warnings are treated as errors on Mac.
Why this was even merged? Do we have a Mac builder? The Mac builder
should fail.
|
2015-04-09 15:15:15 -07:00 |
geron-cn
|
c206725be5
|
fix color
|
2015-04-09 19:13:14 +08:00 |
Igor Mats
|
f5c61b4f9a
|
Ooops.
|
2015-04-09 13:36:17 +03:00 |
minggo
|
09c50c44dc
|
Merge pull request #11224 from hawkwood/patch-7
Remove use of autorelease NSString and NSURL
|
2015-04-09 18:36:07 +08:00 |
minggo
|
3a87cd2efa
|
Merge pull request #11364 from samuele3hu/v3_terrain
Fix the crash of lua-game-controller-test iOS on the 64-bit simulator
|
2015-04-09 18:20:57 +08:00 |
geron-cn
|
56bb0a68bb
|
add tween easing to carfare
|
2015-04-09 18:10:37 +08:00 |
samuele3hu
|
63fe17a77a
|
Fix the crash of lua-game-controller-test iOS
|
2015-04-09 18:10:15 +08:00 |
xiaofeng11
|
31640628ca
|
Merge pull request #10 from pipu/animation_easing
Serialize and parse attribute easing for Frame.
|
2015-04-09 17:36:30 +08:00 |
pipu
|
e86071e77e
|
Rest CCFrame.
|
2015-04-09 17:21:52 +08:00 |
minggo
|
2c08ae9549
|
Merge pull request #11363 from WenhaiLin/v3-autotest
[ci skip]Update the reference of submodule ccs-res.
|
2015-04-09 17:09:05 +08:00 |
WenhaiLin
|
b5ae74c52b
|
[ci skip]Update the reference of submodule ccs-res.
|
2015-04-09 17:07:37 +08:00 |
Igor Mats
|
60759764ff
|
Add getStroke method.
|
2015-04-09 12:05:21 +03:00 |
pipu
|
80ad7bbee8
|
Animation easing.
|
2015-04-09 16:55:15 +08:00 |
minggo
|
96f446ad93
|
Merge pull request #11362 from WenhaiLin/v3-autotest
Test automation support: Fixed may not to restore TestList to the original position.
|
2015-04-09 16:51:59 +08:00 |
songchengjiang
|
98211a8c3f
|
fix the bug of PURibbonTrail
|
2015-04-09 16:49:03 +08:00 |
WenhaiLin
|
8b839edfde
|
Test automation support: Fixed may not to restore TestList to the original position.
|
2015-04-09 16:46:35 +08:00 |
minggo
|
4e4b8bcea0
|
Merge pull request #11361 from WenhaiLin/v3-autotest
Remove unneeded code.
|
2015-04-09 16:29:56 +08:00 |
WenhaiLin
|
f502c5900b
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:23:29 +08:00 |
WenhaiLin
|
c5ff21f7c6
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:18:24 +08:00 |
minggo
|
238d677db0
|
Merge pull request #11360 from super626/releasenote
add terrain to release note
|
2015-04-09 16:12:05 +08:00 |
yangxiao
|
9b363e5193
|
add terrain to release note
|
2015-04-09 16:05:42 +08:00 |
minggo
|
a4bcb82983
|
Merge pull request #11359 from WenhaiLin/v3-autotest
Fixed crashes in test case of Scene/Node.
|
2015-04-09 15:58:08 +08:00 |
minggo
|
1765d53413
|
[ci skip]update CHANGELOG
|
2015-04-09 15:49:34 +08:00 |
WenhaiLin
|
16bce0bfd3
|
Fixed crashes in test case of Scene/Node.
|
2015-04-09 15:43:01 +08:00 |
minggo
|
d9acaa444a
|
Merge pull request #11358 from WenhaiLin/v3-autotest
Fixed the test case of BillBoard not respond touch event as expected.
|
2015-04-09 15:11:17 +08:00 |
WenhaiLin
|
2e24f302d6
|
Fixed the test case of BillBoard not respond click event as expected.
|
2015-04-09 15:08:49 +08:00 |
minggo
|
5938fce905
|
Merge pull request #11357 from WenhaiLin/v3-autotest
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
|
2015-04-09 15:05:44 +08:00 |
WenhaiLin
|
e5bd611604
|
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
|
2015-04-09 14:59:34 +08:00 |
minggo
|
961d00a94d
|
Merge pull request #11356 from WenhaiLin/v3-autotest
Fixed some test cases of action not respond click event as expected.
|
2015-04-09 14:36:03 +08:00 |
minggo
|
3dcd123c09
|
[ci skip]update release note
|
2015-04-09 14:30:06 +08:00 |
minggo
|
e9c88a61da
|
Merge pull request #11354 from samuele3hu/v3_terrain
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 14:22:19 +08:00 |
WenhaiLin
|
a378651320
|
Fixed some test cases of action not respond click event as expected.
|
2015-04-09 14:20:59 +08:00 |
minggo
|
9891a94e87
|
Merge pull request #11352 from super626/v3
Fix Sprite3D memory leak
|
2015-04-09 13:57:03 +08:00 |
minggo
|
76d66798ec
|
Merge pull request #11355 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
|
2015-04-09 13:44:51 +08:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
minggo
|
c022b7d615
|
Merge pull request #11351 from WenhaiLin/v3-autotest
Test automation support:
|
2015-04-09 13:41:20 +08:00 |
zhangbin
|
4929b584e2
|
Update the reference of submodule cocos2d-console.
|
2015-04-09 13:39:01 +08:00 |
Ricardo Quesada
|
8a31138160
|
Merge pull request #11353 from ricardoquesada/xcode_6_3_tests_compiles
Xcode 6 3 tests compiles
|
2015-04-08 22:31:29 -07:00 |
Ricardo Quesada
|
510d502631
|
Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles
|
2015-04-08 21:59:22 -07:00 |
WenhaiLin
|
57508b3c12
|
Fixed compile errors
|
2015-04-09 12:49:32 +08:00 |
Ricardo Quesada
|
49e2e8964e
|
more compilations issues.
compiles on Android
|
2015-04-08 21:40:39 -07:00 |
Ricardo Quesada
|
23b0d4d2f6
|
more fixes with the namespaces
|
2015-04-08 21:23:47 -07:00 |
WenhaiLin
|
565a79022b
|
Test automation support:
1.TestList support mouse scroll.
2.TestList respond click event in the right response area.
|
2015-04-09 11:56:49 +08:00 |
minggo
|
504e49d910
|
Merge pull request #11350 from CocosRobot/update_lua_bindings_1428551264
[AUTO]: updating luabinding automatically
|
2015-04-09 11:56:39 +08:00 |
CocosRobot
|
22da4c4832
|
[AUTO]: updating luabinding automatically
|
2015-04-09 03:50:13 +00:00 |