Ricardo Quesada
3bd466ce49
Merge pull request #9110 from martell/cmake
...
Cmake fixes and build fixes
2014-11-13 16:08:00 -08:00
Ricardo Quesada
2e3b2d9f28
Merge pull request #9080 from vovkasm/cmake-refactoring
...
Cmake refactorings and fixes
2014-11-13 15:42:47 -08:00
martell
3de4906797
Make use of options for cc builder, cc studio and spine
2014-11-13 23:25:21 +00:00
minggo
156be2e633
Merge pull request #9077 from super626/fixscene
...
fix Scene::setScale does not work #9031
2014-11-13 18:59:49 +08:00
minggo
906316df62
Merge pull request #8985 from samuele3hu/v3_new_spine
...
Fix error that the type judgment of lua value would parse string —> int or int —> string
2014-11-13 18:59:19 +08:00
minggo
f753368246
Merge pull request #9017 from cpascal/fix_error_refleakdetection
...
Fixed compile error with CC_REF_LEAK_DETECTION
2014-11-13 18:56:46 +08:00
minggo
133d51cad1
Merge pull request #9026 from cpascal/fix_error_scriptbinding_off
...
Fixed compile error with CC_ENABLE_SCRIPT_BINDING=0
2014-11-13 18:53:40 +08:00
minggo
306518cebf
Merge pull request #9035 from samuele3hu/v3_fix
...
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES in the Android.mk
2014-11-13 18:49:44 +08:00
minggo
d6eea4dc3c
Merge pull request #9037 from G17hao/patch-8
...
Update CCBone.cpp
2014-11-13 18:46:48 +08:00
minggo
d965062866
Merge pull request #9066 from cpascal/fix_bundlereader
...
Fixed "warning: bundle reader out of range"
2014-11-13 18:38:06 +08:00
minggo
63f2f8da76
Merge pull request #9092 from zawasp/touch-callbakcs
...
define touch callback types
2014-11-13 18:07:39 +08:00
minggo
222adb22dd
Merge pull request #9104 from super626/camera
...
add comments to camera and scene
2014-11-13 18:04:44 +08:00
yangxiao
d50670af4b
add comment to camera and scene
2014-11-13 17:30:49 +08:00
minggo
ee31273fa5
Merge pull request #9088 from Dhilan007/v3-audio-Lollipop
...
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() freeze on Lollipop
2014-11-13 16:02:40 +08:00
LinWenhai
48f1bd62d7
remove unrelated modification
2014-11-13 15:43:39 +08:00
minggo
c64ee1b4b8
Merge pull request #9090 from wangqm0513/patch-1
...
Update TouchesJni.cpp
2014-11-13 15:22:35 +08:00
minggo
68cb1d6c6a
Merge pull request #9096 from Dhilan007/v3-label-i9095
...
Fix Label may display incomplete for multiline text with outline feature enabled.
2014-11-13 15:12:20 +08:00
samuele3hu
a3dbd010db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-11-13 13:42:46 +08:00
Dhilan007
249d34b707
fix AudioEngine can't looping audio on Android 2.3.x
2014-11-13 11:28:08 +08:00
LinWenhai
a37549d7bc
Update Cocos2dxMusic.java
2014-11-13 11:00:29 +08:00
samuele3hu
1d1d004c3a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-11-12 17:46:13 +08:00
Dhilan007
e071e5c896
Fix Label may display incomplete for multiline text with outline feature enabled.
2014-11-12 17:24:35 +08:00
wangqm0513
9415b2b930
Update TouchesJni.cpp
...
fixed gamelist can't pull by mouse.
2014-11-12 14:21:48 +08:00
Dhilan007
76c9accec9
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop
2014-11-12 13:01:47 +08:00
Mircea Rila
a643f05330
add touch callback types
2014-11-11 18:00:34 +02:00
Vladimir Timofeev
8910b962a0
cmake:
...
- fix Audio engine build on Mac
- remove duplicated defintions of _EXPORT_DLL_
2014-11-11 10:30:48 +03:00
Vladimir Timofeev
dba8ef33bd
cmake: connect mac specific UIEditBox implementation to build
2014-11-11 10:30:48 +03:00
Vladimir Timofeev
0059c93757
cmake: protobuf should be linked with cocos2d.a in every platform (not only on linux)
2014-11-11 10:30:48 +03:00
minggo
6c67c6921d
Merge pull request #8977 from pipu/v3_Modify_TextReader
...
Modify that parsing attribute "fontName" of TextReader
2014-11-11 12:05:49 +08:00
yangxiao
6ecb9a7b04
fix #9031
2014-11-10 12:48:42 +08:00
CocosRobot
a908c391b0
[AUTO]: updating luabinding automatically
2014-11-09 15:33:08 +00:00
minggo
8476956ef9
Merge pull request #9057 from andyque/fixScale9FlipIssueNew
...
fix scale9sprite flip issue
2014-11-09 23:27:40 +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
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
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
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
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
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
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
7565b9b1eb
Merge pull request #8969 from kaylyun/v3
...
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
2014-11-05 17:58:28 +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
e56c84ebf0
Merge pull request #8983 from super626/camera
...
fix wrong camera lookat computation
2014-11-05 17:49:59 +08:00
cpascal
c1f85bac0e
Fixed compile error with CC_REF_LEAK_DETECTION
2014-11-05 16:23:25 +09: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