CocosRobot
a908c391b0
[AUTO]: updating luabinding automatically
2014-11-09 15:33:08 +00:00
minggo
6ac6e07a4d
[ci skip] Update CHANGELOG
2014-11-09 23:30:39 +08:00
minggo
8476956ef9
Merge pull request #9057 from andyque/fixScale9FlipIssueNew
...
fix scale9sprite flip issue
2014-11-09 23:27:40 +08:00
minggo
d2fd1a1152
[ci skip]Update Authors
2014-11-09 23:27:13 +08:00
minggo
e7d5e79e88
Merge pull request #8998 from aeonmine/v3
...
fix memory leak cocos studiov2.0 engine v3.3
2014-11-09 23:24:16 +08:00
minggo
0bbb9e9368
Merge pull request #9056 from CocosRobot/update_lua_bindings_1415327766
...
[AUTO]: updating luabinding automatically
2014-11-09 23:19:53 +08:00
minggo
c1d25e18ce
Merge pull request #9055 from CocosRobot/update_cocosfiles_1415327684
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-09 23:19:28 +08:00
cpascal
74ba46f225
Fixed "warning: bundle reader out of range"
...
This warning was displayed even if it's valid c3b file..
Changed "validLength <= needLength" to "validLength < needLength".
2014-11-09 07:38:44 +09:00
andyque
5483bc834d
fix scale9sprite flip issue
2014-11-07 11:09:22 +08:00
CocosRobot
aae2fd9e2a
[AUTO]: updating luabinding automatically
2014-11-07 02:38:01 +00:00
CocosRobot
80ce1537e7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-07 02:34:46 +00:00
minggo
db659107d3
Merge pull request #9052 from huangshiwu/v3_fixbug
...
fix ui crash bug caused by DrawNode
2014-11-07 10:33:08 +08:00
minggo
3b8ddf1b54
Merge pull request #9005 from joshuastray/add-resource-folder-def
...
Update CCFileUtils-linux.cpp
2014-11-07 10:25:14 +08:00
huangshiwu
ace9933d72
fix ui crash bug caused by DrawNode
2014-11-07 10:05:29 +08:00
Ricardo Quesada
9558d97517
Merge pull request #9047 from ricardoquesada/releasing
...
Adds releasing rules
2014-11-06 14:44:21 -08:00
Ricardo Quesada
120e31f4fe
Adds releasing rules
2014-11-06 14:43:45 -08:00
Ricardo Quesada
738deddd42
Update CONTRIBUTE.md
2014-11-06 14:30:00 -08:00
Ricardo Quesada
9e795777b3
Merge pull request #9042 from ricardoquesada/contribute
...
How to contribute to cocos2d-x
2014-11-06 14:17:07 -08:00
Ricardo Quesada
8926e115cd
How to contribute to cocos2d-x
2014-11-06 14:16:39 -08:00
Ricardo Quesada
f8b1915970
Merge pull request #9040 from ricardoquesada/warnings_fixes
...
fixes some compiler warnings
2014-11-06 12:26:30 -08:00
Ricardo Quesada
3d448e86ef
fixes some compiler warnings
...
don't call deprecated functions
2014-11-06 12:25:55 -08:00
G17hao
c7f5c3052d
Update CCBone.cpp
...
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
2014-11-06 17:51:19 +08:00
samuele3hu
e2474e1f96
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-11-06 14:38:55 +08:00
samuele3hu
76ab86674e
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android
2014-11-06 14:32:03 +08:00
minggo
4911ae448d
Merge pull request #9032 from cocoscodeide/v3
...
runtime demo is ugly when screen orientation is portrait
2014-11-06 11:59:53 +08:00
honghui
8af00cdb06
runtime demo is ugly when screen orientation is portrait
2014-11-06 11:30:01 +08:00
minggo
0402ed37f6
Merge pull request #9027 from winipcfg/patch-1
...
Update CHANGELOG
2014-11-06 10:19:39 +08:00
Summoner
3109b40df9
Update CHANGELOG
...
fix typo
2014-11-06 09:13:47 +08:00
cpascal
3dcce59e84
Fix error with CC_ENABLE_SCRIPT_BINDING=0
...
There are too much compile error if I set EE_ENABLE_SCRIPT_BINDING=0.
CCEventTouch and CCTouch related things...
This is temporary fix... Many source/header files must be patched for
the right way..
2014-11-06 07:20:41 +09:00
Ricardo Quesada
bffe5e09e0
Merge pull request #9024 from ricardoquesada/readme_fixes
...
fixes types in readme
2014-11-05 10:27:25 -08:00
Ricardo Quesada
e83de40592
fixes types in readme
...
thanks @kidproquo
2014-11-05 10:26:46 -08:00
minggo
25053b80bc
Merge pull request #8930 from super626/fixsprite
...
add Sprite3D::getMeshArrayByName and refactor re-skin test
2014-11-05 18:11:51 +08:00
minggo
666fdac7cb
Merge pull request #9012 from CocosRobot/update_lua_bindings_1415148600
...
[AUTO]: updating luabinding automatically
2014-11-05 18:09:23 +08:00
minggo
7565b9b1eb
Merge pull request #8969 from kaylyun/v3
...
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
2014-11-05 17:58:28 +08:00
minggo
46972eb477
[ci skip]Update Authors
2014-11-05 17:53:38 +08:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
minggo
7123902f11
[ci skip] Update CHANGELOG
2014-11-05 17:51:35 +08:00
minggo
e56c84ebf0
Merge pull request #8983 from super626/camera
...
fix wrong camera lookat computation
2014-11-05 17:49:59 +08:00
minggo
dd7ef28145
Merge pull request #8954 from andyque/modifyChangeLog
...
modify changelog
2014-11-05 17:49:12 +08:00
cpascal
c1f85bac0e
Fixed compile error with CC_REF_LEAK_DETECTION
2014-11-05 16:23:25 +09:00
minggo
c1caa8515c
Merge pull request #9015 from CocosRobot/update_lua_bindings_1415166130
...
[AUTO]: updating luabinding automatically
2014-11-05 13:54:19 +08:00
CocosRobot
13f9073e22
[AUTO]: updating luabinding automatically
2014-11-05 05:44:02 +00:00
minggo
98073632d4
Merge pull request #8908 from zawasp/v3-source
...
fix some warnings / remove TABs
2014-11-05 13:39:20 +08:00
CocosRobot
767437969f
[AUTO]: updating luabinding automatically
2014-11-05 00:52:05 +00:00
Ricardo Quesada
92caf4026a
Merge pull request #9011 from ricardoquesada/perf_fixes
...
Performance improvements
2014-11-04 16:47:00 -08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Ricardo Quesada
a95f689842
Merge pull request #9010 from ricardoquesada/treat_warnings_as_errors_in_samples
...
treat warnings as errors in samples
2014-11-04 15:43:16 -08:00
Ricardo Quesada
2ec1170943
treat warnings as errors in samples
2014-11-04 15:42:29 -08:00
Jialong Zhai
6e35e91642
Update CCFileUtils-linux.cpp
2014-11-04 18:23:12 +08:00
峰 正博
828715ab8b
;; -> ;
2014-11-04 11:54:48 +09:00