minggo
6d08b33a68
Merge pull request #9107 from Dhilan007/v3-audio-includefix
...
Remove unneeded include in AudioEngine.h
2014-11-14 20:09:33 +08:00
Vladimir Timofeev
48108e548a
Fix compile errors with recent mingw.
...
Constify arguments to copy constuctors. Without this gcc fail to compile if classes used inside containers.
Error message is rather cryptic: " error: 'constexpr std::pair<_T1, _T2>::pair(const std::pair<_T1, _T2>&) [with _T1 = const int; _T2 = cocos2d::experimental::AudioPlayer]' declared to take const reference, but implicit declaration would take non-const"
2014-11-14 10:52:17 +03:00
Vladimir Timofeev
5a833a1792
This should fix and unify finding GLFW3 for all desktop archs.
...
Instead of using glfw3 on each required configuration, use it centralized way.
Add our prebuilt location to search paths, so FindGLFW3.cmake can find it also.
2014-11-14 10:43:49 +03:00
Dhilan007
ac0fb68989
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
2014-11-14 15:04:32 +08:00
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
Dhilan007
f52c3e5a83
Remove unneeded include in AudioEngine.h
2014-11-13 22:02:28 +08: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
teivaz
2d75ceafb7
- set const modifier to ClippingNode::hasContent()
2014-11-13 12:43:05 +02: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
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
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
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
joewanchen
c4b1aeb0ec
fix momery leak (partly fix, memory leak still exist).
2014-11-07 11:43:55 +08: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
joewanchen
b05f558214
fix compile error.
2014-11-07 10:14:07 +08:00
huangshiwu
ace9933d72
fix ui crash bug caused by DrawNode
2014-11-07 10:05:29 +08:00
joewanchen
b682438b68
revert some modifications.
2014-11-07 09:17:32 +08:00
joewanchen
c2b97a3b13
fix sprite frame cache, and remove unnecessary headers dependencies.
...
we should add private headers for ccs, do not expose privae headers to users.
2014-11-07 09:13:59 +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
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -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
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
峰正博
85fb2c91ab
fix memory leak cocos studiov2.0 engine v3.3
2014-11-04 01:25:58 +09:00
samuele3hu
08d6b0dcff
Fix the type judgment of lua value would parse string —> int or int —> string
2014-10-31 17:50:59 +08:00
yangxiao
642a601502
fix wrong look at
2014-10-31 11:32:10 +08:00
CocosRobot
9592b1f661
[AUTO]: updating luabinding automatically
2014-10-31 02:44:25 +00:00
minggo
d0edba2db3
Merge pull request #8975 from 2youyouo2/v3_EventFrame
...
update event frame
2014-10-31 10:32:53 +08:00
minggo
543c65c7b3
Merge pull request #8970 from super626/v3
...
refact 3d bundle code and fix sprite
2014-10-31 10:27:16 +08:00
minggo
87d7b7e8ee
Merge pull request #8973 from joshuastray/fix_constructor_access
...
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-31 10:26:32 +08:00
minggo
e87e0290fd
Merge pull request #8958 from MSOpenTech/wp8-shader-fix
...
WP8 Shader fix for cocos2d-x issue 8933
2014-10-31 09:43:31 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
pipu
2ed51e042d
Modify that parsing attribute "fontName" of TextReader
2014-10-30 18:00:03 +08:00
Jialong Zhai
ce85ea3946
fix indentation
2014-10-30 14:38:55 +08:00
Jialong Zhai
4113929fc0
Update UIVideoPlayer.h
2014-10-30 14:36:15 +08:00
Jialong Zhai
fd238cab36
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-30 14:24:37 +08:00
minggo
e99ea7a9fe
Merge pull request #8961 from Appgeneration/winrt_link_fix
...
Winrt link fix
2014-10-30 12:54:48 +08:00
yangxiao
77aebb657d
merge cocos
2014-10-30 11:56:20 +08:00
kaylyun
97c076337a
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
...
Sometimes app directly at the startup on android platform.
2014-10-30 10:21:19 +08:00
kaile.yin
ec5081798c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-30 09:57:01 +08:00
Miguel Ferreira
ad8ffa5de1
Fixed winrt DLL link errors when using extern consts
2014-10-29 10:47:02 +00:00
kyokomi
2b4cf9ae59
bugfix: setting forget the contentSize.
2014-10-29 19:38:12 +09:00
Dale Stammen
32a5a2cbb8
Merge branch 'v3' into wp8-shader-fix
2014-10-28 22:08:04 -07:00
Dale Stammen
060779c138
added check for WP8_SHADER_COMPILER
2014-10-28 21:01:26 -07:00
Dale Stammen
a8e0987b8d
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:59:44 -07:00
Dale Stammen
ee83a8a6e0
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:57:40 -07:00
Dale Stammen
145156d698
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:56:49 -07:00
minggo
e3d813795d
Merge pull request #8923 from liamcindy/v3
...
update ui button size changed logic
2014-10-28 21:59:49 +08:00
Dale Stammen
af14b40ba0
must call DisplayInformation::GetForCurrentView() from main UI thread
2014-10-27 13:40:19 -07:00
Dale Stammen
5b69a55121
added check for WP8_SHADER_COMPILER
2014-10-27 11:16:14 -07:00
Dale Stammen
510c8caed7
added DPI support for universal app
2014-10-27 11:12:54 -07:00
Dale Stammen
6d46ee8f3d
fixed location of renderer filter
2014-10-27 11:09:27 -07:00
Dale Stammen
4dd48d5020
removed mutex. use concurrent_queue for events
2014-10-27 11:08:22 -07:00
Dale Stammen
b483162128
added ignore warning 4756
2014-10-27 11:07:27 -07:00
Dale Stammen
2eccd58d45
added DPI support for universal app
2014-10-27 11:07:00 -07:00
Dale Stammen
6fb69870f9
fixed compiler warnings for winrt code
2014-10-27 10:57:57 -07:00