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
d8be5a8af4
fix includes so that minizip builds correctly on Mingw-w64
2014-11-13 23:27:04 +00:00
martell
3de4906797
Make use of options for cc builder, cc studio and spine
2014-11-13 23:25:21 +00:00
Noel Cower
fbdf0201c6
Permit plugin-x plugins to ship third-party libraries.
...
Ignoring the libs directory's .jar files is strange. I'm not sure
whoever put the total block over libs/ knew that this is the standard
Android library directory and not just for NDK-compiled assets.
More granular ignores over libs/ contents would be better in the
future, but this fixes the odd sdk/ directory hack plugins currently
use and lets the Android build system auto-link libraries that're
shipped with plugins instead of forcing Cocos developers to manually
sift through a plugin's Android dependencies and include them by hand.
2014-11-13 09:20:09 -08:00
Dhilan007
f52c3e5a83
Remove unneeded include in AudioEngine.h
2014-11-13 22:02:28 +08:00
minggo
596537ebcc
[ci skip] Update CHANGELOG
2014-11-13 19:03:08 +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
5f1ca44f0c
Merge pull request #9071 from mikandi/feature/android-build-native-with-spaces
...
Android build_native.py with spaces in path
2014-11-13 18:37:37 +08:00
Dhilan007
5a8ac8f151
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
2014-11-13 18:15:41 +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
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
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