yangxiao
|
cfb6a7846f
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-10-17 18:08:55 +08:00 |
yangxiao
|
66dd0807eb
|
add isVisibleByVisitingCamera check when visit
|
2014-10-17 18:07:45 +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 |
samuele3hu
|
936510411b
|
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
|
2014-10-17 15:04:16 +08:00 |
minggo
|
31664d979a
|
Merge pull request #8783 from andyque/adjustUITestProject
fix scrollView rotate issue
|
2014-10-17 14:54:32 +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 |
CocosRobot
|
e8373e9b41
|
[AUTO]: updating luabinding automatically
|
2014-10-17 06:28:36 +00:00 |
samuele3hu
|
066d94530c
|
Update the Deprecated Func
|
2014-10-17 14:15:30 +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
|
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
|
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 |
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 |
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 |
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 |
minggo
|
ec4d83b646
|
Merge pull request #8738 from pipu/v3_Modify_Reader
Modify Reader:
|
2014-10-17 09:35:07 +08:00 |
minggo
|
8b1fe93269
|
Merge pull request #8762 from Dhilan007/v3-33rc
disable warn on zero-sized structure[android].
|
2014-10-17 09:34:41 +08:00 |
tangziwen
|
69cda9ccae
|
fix duplicate function in create dummy texture
|
2014-10-17 08:58:05 +08:00 |
Dale Stammen
|
41fe4a3e17
|
dpi for wp8 only
|
2014-10-16 11:16:26 -07:00 |
Dale Stammen
|
53302789a0
|
added missing files
|
2014-10-16 11:16:02 -07:00 |
Dale Stammen
|
d5b0830c3b
|
added missing files
|
2014-10-16 11:15:39 -07:00 |
Dhilan007
|
5595947dc3
|
disable warn on zero-sized structure[android].
|
2014-10-16 21:41:52 +08:00 |
minggo
|
b4867bf6e5
|
Merge pull request #8715 from iSevenDays/v3
CMakes support for Mac Os X & iOS
|
2014-10-16 21:16:02 +08:00 |
minggo
|
07253cfb60
|
Merge pull request #8743 from andyque/removeWebView
remove UIWebView.cpp in win32
|
2014-10-16 21:06:53 +08:00 |
minggo
|
2d6bfc74ea
|
Merge pull request #8757 from 2youyouo2/v3
set tag for ActionTimeline
|
2014-10-16 21:05:38 +08:00 |
samuele3hu
|
4d75c977ca
|
Remove useless binding code for SkeletonAnimation
|
2014-10-16 20:53:40 +08:00 |
samuele3hu
|
7198ae509c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 20:35:43 +08:00 |
samuele3hu
|
c5f19c20ca
|
Add SpineConstants.lua
|
2014-10-16 20:24:47 +08:00 |
samuele3hu
|
079df20541
|
Update lua bindings for Spine and related test case
|
2014-10-16 20:23:58 +08:00 |
minggo
|
a92f485d71
|
Merge pull request #8754 from zawasp/decrease-logging-verbosity
decrease logging verbosity - CCFileUtils-android
|
2014-10-16 19:28:20 +08:00 |
pipu
|
20cb663746
|
Delete the blank block
|
2014-10-16 19:02:39 +08:00 |
kaile.yin
|
7faf2fe1e6
|
set tag for ActionTimeline
|
2014-10-16 18:14:58 +08:00 |
Mircea Rila
|
0678601f61
|
decrease logging verbosity - CCFileUtils-android
|
2014-10-16 13:03:39 +03:00 |
CocosRobot
|
4a084a4ebc
|
[AUTO]: updating luabinding automatically
|
2014-10-16 09:55:07 +00:00 |
minggo
|
064f0d9042
|
Merge pull request #8708 from dabingnn/v3_updateSpine
V3 update spine
|
2014-10-16 17:50:07 +08:00 |
pipu
|
7cb2629baa
|
Delete annotate code of all Reader files
|
2014-10-16 17:44:22 +08:00 |
CocosRobot
|
c4985c45e4
|
[AUTO]: updating luabinding automatically
|
2014-10-16 08:55:11 +00:00 |
Huabing.Xu
|
644aa19b2d
|
Merge branch 'v3' into v3_updateSpine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 16:48:16 +08:00 |
andyque
|
f3f15c58fe
|
remove UIWebView.cpp in win32
|
2014-10-16 16:46:49 +08:00 |
minggo
|
8c06d6b981
|
Merge pull request #8737 from samuele3hu/v3_rc_fix
Update the related cocosstudio lua test cases and lua-bindings
|
2014-10-16 16:28:31 +08:00 |