minggo
6536862e34
[ci skip] Update CHANGELOG
2014-11-13 16:05:37 +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
samuele3hu
9492a19dcb
Add test case for value type judge error
2014-11-13 15:36:43 +08:00
minggo
c64ee1b4b8
Merge pull request #9090 from wangqm0513/patch-1
...
Update TouchesJni.cpp
2014-11-13 15:22:35 +08:00
minggo
4bb42a5825
[ci skip] Update CHANGELOG
2014-11-13 15:18:02 +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
minggo
d11ceebd79
Merge pull request #9099 from samuele3hu/v3_release_note
...
Update the RELEASE_NOTES.md
2014-11-13 14:52:18 +08:00
minggo
0f2651b6f4
[ci skip] Update CHANGELOG
2014-11-13 14:48:13 +08:00
minggo
09738136ca
Merge pull request #9098 from Dhilan007/v3-audio-loopfix
...
fix AudioEngine can't looping audio on Android 2.3.x
2014-11-13 14:45:22 +08:00
minggo
7d574f80e0
Merge pull request #9084 from CocosRobot/update_cocosfiles_1415744220
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-13 14:40:48 +08:00
yangxiao
e8fbf4d071
remove space line
2014-11-13 14:21:19 +08:00
yangxiao
ba51065f3a
remove space line
2014-11-13 14:19:51 +08:00
yangxiao
7395fb70f6
refact code style
2014-11-13 14:16:38 +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
XiaoYang
2f2e2e2b46
Merge pull request #158 from tangziwen/v3
...
V3
2014-11-13 11:07:40 +07:00
tangziwen
3381400eec
trim uv_test texture's size
2014-11-13 12:06:52 +08:00
tangziwen
c33777a45a
remove dummy log
2014-11-13 11:57:18 +08:00
samuele3hu
8d3718d283
Update the RELEASE_NOTES.md
2014-11-13 11:47:31 +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
honghui
9656a31be9
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
...
Conflicts:
templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
2014-11-12 18:12:07 +08:00
honghui
d4e0460ed4
revert commit a7f8199e65
2014-11-12 18:05:32 +08:00
honghui
a6e1c40db7
can't build IPA using developer certificate in Mac OS X 10.10
2014-11-12 18:05:32 +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
tangziwen
85f0b0ec29
fix resource miss
2014-11-12 17:44:19 +08:00
tangziwen
8101b6a94e
add UV Animation Test & it's resource
2014-11-12 17:42:45 +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
wangqm0513
e8d24cb49b
Update MathUtilNeon64.inl
...
add arm64bit neon support
2014-11-12 14:15:29 +08:00
Dhilan007
76c9accec9
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop
2014-11-12 13:01:47 +08:00
jicheol-ryu
c94a9ea01a
fix bugs - potential memory leak.
...
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.
So we have to use next string constructor.
string (const char* s, size_t n);
http://www.cplusplus.com/reference/string/string/string/
2014-11-12 00:06:30 +01:00
CocosRobot
4ae4932e8a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-11 22:17:01 +00:00
Ricardo Quesada
706f49cb59
Merge pull request #9083 from ricardoquesada/release_fixes
...
Release fixes
2014-11-11 14:09:43 -08:00
Ricardo Quesada
46004f3d7e
renamed RELEASING_RULES to RELEASE ENGINEERING
2014-11-11 14:09:08 -08:00
Ricardo Quesada
3d4b477fc4
more RELEASING_RULES.md fixes
2014-11-11 14:08:21 -08:00
teivaz
7c355a087b
- Optimization in CCClippingNode.
...
Disable visiting when no objects has to be drawn under stencil.
2014-11-11 21:09:58 +02:00
Mircea Rila
a643f05330
add touch callback types
2014-11-11 18:00:34 +02:00
Vladimir Timofeev
77ab866090
Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications.
2014-11-11 10:30:48 +03:00
Vladimir Timofeev
72e59a53a8
cmake: Build application bundles on Mac for test applications (this allow run they from Xcode)
2014-11-11 10:30:48 +03: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
Vladimir Timofeev
e3e3de2d87
Remove unused variable from composed include_directories
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
Ricardo Quesada
7417d59447
Merge pull request #9078 from ricardoquesada/releasing_fixes
...
fixes for releasing
2014-11-10 19:30:08 -08:00
Ricardo Quesada
9da8188012
fixes for releasing
2014-11-10 19:29:44 -08:00
Ricardo Quesada
377af3b447
Merge pull request #9076 from ricardoquesada/android_build_fix
...
fixes how to check for CPU in android-build
2014-11-10 16:09:00 -08:00
Ricardo Quesada
4d2752e84f
fixes how to check for CPU in android-build
2014-11-10 16:08:12 -08:00
minggo
8e3590978d
Merge pull request #9072 from andyque/fixCompileError
...
fix compile error
2014-11-10 16:03:21 +08:00