minggo
0cd2f985e8
Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug
...
fix egl config chooser bug
2014-09-29 18:24:19 +08:00
minggo
8a5829631d
Merge pull request #8171 from huangshiwu/v3_Teivaz
...
Enable screen orientation change handling - by Teivaz
2014-09-29 18:02:03 +08:00
Dale Stammen
24e5df1644
updated wp8 precompiled shaders
2014-09-26 12:16:16 -07:00
Dale Stammen
67377b7d46
added check for WINRT_NO_WINSOCK
2014-09-26 12:05:19 -07:00
Dale Stammen
ef58fa7fd4
fixed winrt file functions to pass app certification tests.
2014-09-26 11:38:17 -07:00
Huabing.Xu
d7a5c464dd
remove test code
2014-09-26 16:37:05 +08:00
Huabing.Xu
7cfcdc1af8
fix egl config chooser bug
2014-09-26 16:23:54 +08:00
huanghsiwu
7a2a44ad88
Enable screen orientation change handling - by Teivaz
2014-09-26 16:16:34 +08:00
minggo
d491d9e6db
Merge pull request #8149 from andyque/fixIOS8EditBox
...
fix ios8 EditBox orientation problem
2014-09-25 13:47:23 +08:00
minggo
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
andyque
34fbca9c50
fix ios8 EditBox orientation problem
2014-09-25 11:46:42 +08:00
minggo
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
minggo
79446999bb
Merge pull request #8116 from Dhilan007/v3-labelfix
...
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
2014-09-24 15:03:40 +08:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Dale Stammen
2226aa5c8a
need to reset the accelerometer before trying to enable it again
2014-09-23 10:01:42 -07:00
Guy Kogus
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
Guy Kogus
a9a0ff35f6
Added method for converting from std::string to Platform::String.
2014-09-22 17:47:38 +04:00
Sergey
2255cf91ba
openUrl function for all platform but on windows RT empty function
2014-09-22 17:47:38 +04:00
Dhilan007
ac916c3027
Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7.
2014-09-22 18:01:13 +08:00
huanghsiwu
41b4ba8307
fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp
2014-09-22 09:42:33 +08:00
minggo
6569f1a7f0
Merge pull request #8108 from huangshiwu/v3_wp8test
...
fix wp8 directory control bug
2014-09-19 16:57:02 +08:00
huanghsiwu
f73f1a5379
fix wp8 directory control bug --modify
2014-09-19 16:52:11 +08:00
huanghsiwu
d42cec0708
fix wp8 directory control bug
2014-09-19 15:54:18 +08:00
Steve Kanter
05f0f71cc5
Update CCDevice-ios.mm
...
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
2014-09-17 14:52:30 -04:00
Eric Zhong
ae5f6e63e5
optimize decompress jpg data and fix warnings
2014-09-16 21:55:05 +08:00
Eric Zhong
8de3657f3c
optimize decompress jpg data
...
it may be unnecessary copy jpg bytes one by one when decompress jpg data
2014-09-15 23:15:01 +08:00
minggo
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
mailgyc
9e8b32b3c4
fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work
...
isPopupNotify() doesn't work
2014-09-15 14:06:04 +08:00
huangshiwu
0addaf3912
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
2014-09-12 15:38:29 +08:00
huangshiwu
f1f6373b6e
fix Cocos2dShaderCompile's compile error --use chipmunk static library
2014-09-12 15:29:10 +08:00
Ricardo Quesada
525fecc4ce
even more cmake fixes
2014-09-11 17:36:49 -07:00
Ricardo Quesada
f5cd48f154
Android properties back to 10
2014-09-09 18:46:47 -07:00
Ricardo Quesada
d5a6289a9b
compiles on wp8
2014-09-09 18:22:11 -07:00
Ricardo Quesada
6b4323642a
compiles on winphone8
2014-09-09 18:15:16 -07:00
Ricardo Quesada
fdabaa3082
Compiles on Android
2014-09-09 17:53:08 -07:00
Ricardo Quesada
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
73450be715
compiles and runs in Linux
2014-09-09 17:11:06 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
oleg-akatsuki
511ee30b6e
Move constructor from private to public
...
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.
Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
2014-09-09 11:34:48 +09:00
minggo
0fc1baee65
Merge pull request #7954 from huangshiwu/v3_wp8fix_pr
...
fix wp8 compile error and modify default resource path
2014-09-05 11:36:32 +08:00
huangshiwu
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
samuele3hu
61d1b67116
Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon
2014-09-04 18:17:05 +08:00
minggo
cbe357bbca
Merge pull request #7943 from Dhilan007/v3
...
fix compile error on android.
2014-09-04 13:43:39 +08:00
Dhilan007
64d926a75f
fix compile error on android.
2014-09-04 11:04:50 +08:00
minggo
83719db8d4
Merge pull request #7934 from wohaaitinciu/loc_ver
...
fix: win32 cpp-tests sometimes cannot display font correctly
2014-09-04 10:49:30 +08:00
Sergey
89ed897f47
getAllTouches() in GLView
2014-09-03 23:25:30 +04:00
minggo
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
Jeff
ed849a1863
fix: win32 cpp-tests sometimes cannot display font correctly
...
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
2014-09-03 11:34:40 +08:00
andyque
8033b1f7bb
Merge branch 'v3' into mergeExtensionEditBox
2014-09-02 00:03:16 -07:00
kaishiqi
8f11dd7f8b
Update CCGLViewImpl.cpp
...
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
2014-09-02 11:13:30 +08:00
andyque
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
minggo
bb85ecf0da
Merge pull request #7913 from chuanweizhang2013/v3fixed
...
make debug writable path the same as release
2014-09-01 10:15:52 +08:00
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
chuanweizhang2013
25a7f21056
make debug writable path the same as release
2014-08-29 17:27:55 +08:00
minggo
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
andyque
cf0baef7c0
add web view javascript support
2014-08-29 11:50:08 +08:00
andyque
cd031c4493
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
minggo
b8447baf73
Merge pull request #7893 from slackmoehrle/glview_fix
...
Glview fix
2014-08-28 10:10:17 +08:00
Ricardo Quesada
781b0bc478
properties revert back to 10
2014-08-27 16:35:13 -07:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Slack-Moehrle
1b5413d8b4
comment out [glview release]; and [eaglview release];
2014-08-27 10:42:27 -07:00
Slack-Moehrle
d4d2b8c83e
comment out [glview release]; and [eaglview release];
2014-08-27 10:26:09 -07:00
andyque
3d97ddc739
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
minggo
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
minggo
d290076917
invoke nativeOnPause after onSurfaceCreated is invoked
2014-08-27 10:13:03 +08:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
andyque
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
andyque
631e1a70c4
add WebView-inl.h and refactor Android code
2014-08-26 14:26:37 +08:00
minggo
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
huangshiwu
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
huangshiwu
7f57d15cb3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs
2014-08-22 11:04:13 +08:00
huangshiwu
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
minggo
4563e65427
fix compiling error on android and fix some coding style
2014-08-21 15:41:05 +08:00
minggo
b349ce43ae
use macro to control whether to use jpeg, tiff, webp or not
2014-08-21 15:19:26 +08:00
huangshiwu
2369a5900d
merge v3 to v3_glviewattrs
2014-08-21 10:18:55 +08:00
huangshiwu
2a03bea1a4
OpenGL context attributions setting
2014-08-21 09:35:32 +08:00
minggo
d91dc842de
Merge pull request #7822 from Teivaz/v3_WP8
...
Added method for custom precompiled shader program loading in WP8
2014-08-20 11:22:26 +08:00
teivaz
0e5a79d486
+ [WP8] Added method for custom precompiled shader program loading
2014-08-20 12:02:16 +03:00
andyque
07eb0d373c
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
cocos/ui/Android.mk
2014-08-20 09:32:29 +08:00
Sergey
bfe6513706
setKeepScreenOn method
2014-08-19 15:00:58 +04:00
teivaz
0e7ec265ee
* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"
2014-08-20 11:54:41 +03:00
andyque
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
minggo
b842c57954
Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
...
Seperate jpg tiff webp
2014-08-15 15:24:09 +08:00
minggo
e59283343a
Merge pull request #7751 from zawasp/win32_minimize
...
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
minggo
bf75e9996a
separate jpeg, tiff and webp
2014-08-15 14:29:10 +08:00
minggo
1643c29a00
Merge pull request #7782 from liang8305/v3
...
mLastTickInNanoSeconds is the renderStart
2014-08-14 18:11:41 +08:00
胖梁
3619fb943a
mLastTickInNanoSeconds is the renderStart
...
because:
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
renderInterval = renderEnd - renderStart
so:
this.mLastTickInNanoSeconds = renderEnd - ( renderEnd - renderStart );
so:
this.mLastTickInNanoSeconds = renderStart ;
so:
no need nanoTime() twice
2014-08-14 17:07:04 +08:00
Mircea Rila
d9a0c6a2ad
replace tabs with spaces
2014-08-14 10:48:09 +03:00
andyque
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
Mircea Rila
cfafeb1e87
add minimize / restore for win32
2014-08-12 22:22:47 +03:00
minggo
bed1ccf0f3
Merge pull request #7733 from huangshiwu/v3_glviewfix
...
CCGLView modefy
2014-08-12 09:51:27 +08:00
huangshiwu
77bc3a0e60
GLView modefy additional
2014-08-11 16:55:23 +08:00
huangshiwu
1177b0d545
CCGLView modefy
2014-08-11 16:15:02 +08:00
cpascal
5e1570e36e
Fix a correct onGLFWCharCallback
2014-08-10 01:42:21 +09:00
huangshiwu
6ce16546b5
winrt compile fix -addtional
2014-08-08 10:47:14 +08:00
huangshiwu
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
huangshiwu
b7aa046cd2
wp8 compile fix -additional
2014-08-07 14:09:22 +08:00
huangshiwu
0016c7af70
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
2014-08-07 11:58:01 +08:00
huangshiwu
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
minggo
a7d5b7af56
Merge pull request #7691 from Dhilan007/v3
...
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:52:59 +08:00
minggo
7b11c6a74e
Merge pull request #7237 from martell/v3
...
Cmake update and remove old scripts from build folder
2014-08-07 10:36:10 +08:00
minggo
4542b1882d
Merge pull request #7617 from rny/SpriteFrameCache
...
SpriteFrameCache load from plist file content data
2014-08-07 10:20:36 +08:00
Dhilan007
9da4ba14f5
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:04:29 +08:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
Kenichi Hamada
771996f9f3
Added a function getAssetManager() on CCFileUtilsAndroid
2014-08-06 13:36:04 +09:00
huangshiwu
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
huangshiwu
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
huangshiwu
372479d812
wp8 GLView Hook
2014-08-02 16:31:16 +08:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
Ningyu
aebe8317bd
spaces
2014-07-29 17:22:13 +08:00
Ningyu
d5242ef4fa
add
...
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
2014-07-29 17:06:43 +08:00
minggo
191f7a57e1
Merge pull request #7078 from reckhou/v3
...
Optimize FPS control algorithm under Android.
2014-07-28 14:00:55 +08:00
minggo
9efbd6e4ef
Merge pull request #7600 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:34:13 +08:00
pandamicro
823bd437d8
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:14:11 +08:00
minggo
cf7de08f22
Merge pull request #7594 from boyu0/image_premulti_alpha_refactor
...
Image premultiplied alpha refactor
2014-07-28 11:02:33 +08:00
boyu0
85b9765b8f
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
2014-07-28 10:38:22 +08:00
Dhilan007
f7a08d5697
Fix the size of VideoPlayer is incorrect on android.
2014-07-28 10:09:46 +08:00
boyu0
34a8d26124
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
2014-07-25 18:19:04 +08:00
boyu0
e3b79f4150
delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning.
2014-07-25 18:01:32 +08:00
minggo
20e3a61524
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
...
mac custom font fix v2
2014-07-25 11:38:38 +08:00
minggo
98943b4517
Merge pull request #7548 from yongkangchen/v3
...
fix Label::setTextColor did not have any effect.
2014-07-25 11:18:10 +08:00
minggo
b0c922d91e
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Add new file&directory apis into FileUtils and test cases
2014-07-24 22:18:10 +08:00
Reck Hou
44c675f9ee
Fix: Application::setAnimationInterval() not implemented.
2014-07-24 19:22:17 +08:00
Unai Orbe
ae56e637f8
allow setting bundle to use in file utils
2014-07-24 11:56:59 +01:00
Sergey
9501b9912d
load font v2
2014-07-24 12:25:07 +04:00
Sergey
59cbc153d4
Copyright & small fixes
2014-07-22 15:49:38 +04:00
Sergey
9c0493d40b
mipmaps loading fix
2014-07-22 15:49:37 +04:00
Sergey
600dbebfb0
pvr 2bpp decompression fixed
2014-07-22 15:49:37 +04:00
Sergey
1a617ad804
pvr display fix pvr decompression on 64 bit platforms fix
2014-07-22 15:49:36 +04:00
Sergey
2acce6771f
software per decompression support
2014-07-22 15:49:36 +04:00
minggo
8cc25f82e6
fix compiling error
2014-07-22 17:03:27 +08:00
Yongkang Chen
bb7d6ba3d4
fix Label::setTextColor did not have any effect.
2014-07-22 14:52:41 +08:00
zhangcheng
bc254cab25
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport
2014-07-21 20:46:55 +08:00
Huabing.Xu
3403182f3e
change define macros to avoid run error on mac 32 bit
2014-07-21 18:12:46 +08:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
pandamicro
d2c6602dea
Refactor #5580 : Merge createDirectories to createDirectory
2014-07-21 16:51:48 +08:00
minggo
45fa2363e8
Merge pull request #7517 from dabingnn/v3_dll
...
V3 dll
2014-07-21 11:53:36 +08:00
minggo
e128a432c1
Merge pull request #7521 from andyque/fixTextFieldDeleteBug
...
fix TextField backspace delete bug
2014-07-18 18:37:07 +08:00
andyque
73b38fbc6b
fix TextField backspace delete bug
2014-07-18 18:13:17 +08:00
minggo
aef1e01ce5
Merge pull request #7518 from natural-law/android-dependencies
...
Android dependencies
2014-07-18 17:57:42 +08:00
Huabing.Xu
0be2210724
rename CGSize to NSSize
2014-07-18 16:51:29 +08:00
pandamicro
b614854cf9
Refactor #5580 : Improve createDirectories
2014-07-18 15:09:00 +08:00
Huabing.Xu
8afd7614d1
Merge branch 'v3' into v3_dll
2014-07-18 14:01:17 +08:00