samuele3hu
|
30f375ef07
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-17 17:37:18 +08:00 |
samuele3hu
|
1d6128443a
|
Update Mac project setting and some lua test cases about UI and ActionTimeline
|
2014-10-17 17:35:50 +08:00 |
minggo
|
91adb9a26c
|
Merge pull request #8807 from Dhilan007/v3-cpptemplate
Fix CPP template project crash
|
2014-10-17 17:17:07 +08:00 |
Dhilan007
|
4bede5067e
|
Fix CPP template project crash
|
2014-10-17 17:02:22 +08:00 |
minggo
|
d241e568b0
|
Merge pull request #8788 from samuele3hu/v3_new_spine
Update the deprecated Func and update bindings-generator
|
2014-10-17 16:35:51 +08:00 |
minggo
|
7b5e4f9eba
|
Merge pull request #8800 from joshuastray/v3
fix typo of file name
|
2014-10-17 16:33:34 +08:00 |
joshuastray
|
32c6bc05b9
|
fix typo of file name
|
2014-10-17 16:29:37 +08:00 |
minggo
|
6367727e18
|
Merge pull request #8784 from pipu/v3_Modify_Bug_#8770
Fixed #8770
|
2014-10-17 15:47:30 +08:00 |
minggo
|
6f55818146
|
Merge pull request #8791 from cocoscodeide/v3
win32 runtime need more dll files
|
2014-10-17 15:13:48 +08:00 |
samuele3hu
|
936510411b
|
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
|
2014-10-17 15:04:16 +08:00 |
honghui
|
8c0af59f9a
|
open lua debugger only when IDE connected
|
2014-10-17 14:55:20 +08:00 |
honghui
|
8a38d192bb
|
win32 runtime need more dll files
|
2014-10-17 14:55:20 +08:00 |
minggo
|
31664d979a
|
Merge pull request #8783 from andyque/adjustUITestProject
fix scrollView rotate issue
|
2014-10-17 14:54:32 +08:00 |
minggo
|
9c3a64000b
|
Merge pull request #8790 from Dhilan007/v3-android-release
Default build mode of samples change to release builds on android
|
2014-10-17 14:53:59 +08:00 |
Dhilan007
|
d997fdc7f7
|
Default build mode of samples change to release builds
|
2014-10-17 14:51:34 +08:00 |
minggo
|
73836e432d
|
Merge pull request #8787 from CocosRobot/update_lua_bindings_1413527197
[AUTO]: updating luabinding automatically
|
2014-10-17 14:41:03 +08:00 |
samuele3hu
|
14f91ea9f6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-17 14:38:07 +08:00 |
samuele3hu
|
dfd2077648
|
Update the related manifests files for assetsmanager tests
|
2014-10-17 14:35:52 +08:00 |
samuele3hu
|
4593b55e1a
|
Update bindings-generator submodule
|
2014-10-17 14:32:24 +08:00 |
CocosRobot
|
e8373e9b41
|
[AUTO]: updating luabinding automatically
|
2014-10-17 06:28:36 +00:00 |
samuele3hu
|
dd2ad66e41
|
Update bindings-generator submodule
|
2014-10-17 14:23:58 +08:00 |
minggo
|
871b440fc7
|
Merge pull request #8786 from andyque/changeCCSSubmodule
update css submodule
|
2014-10-17 14:23:56 +08:00 |
andyque
|
e76b605aeb
|
update css submodule
|
2014-10-17 14:22:48 +08:00 |
samuele3hu
|
c4d3914230
|
Fix the lua-tests compile error in the release condition
|
2014-10-17 14:16:17 +08:00 |
samuele3hu
|
066d94530c
|
Update the Deprecated Func
|
2014-10-17 14:15:30 +08:00 |
pipu
|
778701595c
|
Fixed #8770
|
2014-10-17 14:11:15 +08:00 |
minggo
|
18ca7c936c
|
Merge pull request #8768 from Dhilan007/v3-33rc
Improve Android.mk
|
2014-10-17 14:09:49 +08:00 |
andyque
|
952e52365b
|
fix scrollView rotate issue
|
2014-10-17 14:02:49 +08:00 |
minggo
|
9f941efb8f
|
Merge pull request #8779 from CocosRobot/update_cocosfiles_1413524832
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-17 13:47:51 +08:00 |
CocosRobot
|
592c39fd96
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-17 05:47:13 +00:00 |
minggo
|
7138933344
|
Merge pull request #8760 from samuele3hu/v3_new_spine
Update lua bindings for Spine and related test case
|
2014-10-17 13:43:26 +08:00 |
minggo
|
5a6e7150e0
|
[ci skip] Update CHANGELOG
|
2014-10-17 13:42:40 +08:00 |
minggo
|
91ef975c57
|
Merge pull request #8667 from super626/v3
Modify return type of Mesh::getAABB, add Animate3D::create from start frame and end frame
|
2014-10-17 13:40:53 +08:00 |
minggo
|
52f6fb7819
|
Merge pull request #8774 from joshuastray/v3
add missing CC_DLL for localstorage
|
2014-10-17 13:32:52 +08:00 |
minggo
|
aa303e975f
|
Merge pull request #8776 from huangshiwu/v3_iphone6hires
add launch images to templates to support iPhone6 and iPhone6+'s native ...
|
2014-10-17 12:03:56 +08:00 |
yangxiao
|
4991b2308d
|
fix warning
|
2014-10-17 11:58:12 +08:00 |
joshuastray
|
eba3642aef
|
add missing CC_DLL for localstorage
|
2014-10-17 11:52:59 +08:00 |
yangxiao
|
9e1656e5b0
|
simplify compute global z when it is transparent
|
2014-10-17 11:52:39 +08:00 |
minggo
|
623f707499
|
Merge pull request #8773 from Dhilan007/v3-win-release
fixed miss sqlite3 for release build on window.
|
2014-10-17 11:41:46 +08:00 |
huangshiwu
|
d05aa84699
|
add launch images to templates to support iphone6 and iphone6+'s native resolution mode
|
2014-10-17 11:40:22 +08:00 |
Dhilan007
|
4586954e0a
|
fixed miss sqlite3 for release build on window.
|
2014-10-17 11:39:06 +08:00 |
andyque
|
8161d2ad34
|
fix scrollView rotate issue
|
2014-10-17 11:31:00 +08:00 |
yangxiao
|
87850d0378
|
rename Animate::createWithFrames
|
2014-10-17 11:16:07 +08:00 |
XiaoYang
|
ed5f5d7229
|
Merge pull request #143 from tangziwen/v3
fix Zorder for transparent mesh
|
2014-10-17 11:14:01 +08:00 |
tangziwen
|
d14b30ecac
|
fix tab style
|
2014-10-17 10:59:53 +08:00 |
minggo
|
f537877116
|
Merge pull request #8767 from andyque/fixIOSIssue
fix winRT macro
|
2014-10-17 10:26:14 +08:00 |
minggo
|
9c53b72962
|
[ci skip]update config.json
|
2014-10-17 10:21:45 +08:00 |
samuele3hu
|
71f7520732
|
Fix win32 compile error
|
2014-10-17 10:19:41 +08:00 |
Dhilan007
|
ccbc668427
|
Improve Android.mk
|
2014-10-17 10:13:33 +08:00 |
andyque
|
812c2ecd0c
|
fix winRT macro
|
2014-10-17 10:09:05 +08:00 |