子龙山人
|
7e4e82da2c
|
Merge pull request #12835 from zilongshanren/improve-coding-style
add more descriptive message to ASSET macro.
|
2015-07-14 16:36:59 +08:00 |
pandamicro
|
41778f35fb
|
Add cc.path.mainFileName
|
2015-07-14 16:33:38 +08:00 |
pandamicro
|
658fe74141
|
Merge pull request #12838 from VisualSJ/v3.7-release-parser
[ci skip] Remove getRes (parser)
|
2015-07-14 16:20:42 +08:00 |
pandamicro
|
efffea5b91
|
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 15:35:29 +08:00 |
andyque
|
91dfb07a8c
|
add more descriptive message to ASSET macro.
|
2015-07-14 15:28:36 +08:00 |
VisualSj
|
a9deb6dda5
|
Remove getRes (parser)
|
2015-07-14 15:26:13 +08:00 |
pandamicro
|
09775d6f2a
|
Ensure backward compatibility
|
2015-07-14 14:14:36 +08:00 |
CocosRobot
|
6b9a5b8264
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-14 05:41:48 +00:00 |
pandamicro
|
43a5b6f020
|
Fix jsb loaders issues
|
2015-07-14 13:40:09 +08:00 |
子龙山人
|
e1ae3631fc
|
Merge pull request #12818 from zilongshanren/v3
merge v3.7 back to v3
|
2015-07-14 13:32:56 +08:00 |
andyque
|
ef5d4ddf86
|
Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-07-14 11:24:38 +08:00 |
Vincent Yang
|
0a6933cc8c
|
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
|
2015-07-14 10:46:17 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
CocosRobot
|
9e60713322
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 14:41:58 +00:00 |
CocosRobot
|
300da3e3fc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 12:57:03 +00:00 |
CocosRobot
|
8b50c307e5
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 09:35:35 +00:00 |
XiaoFeng
|
a68835733f
|
Add Skybox parser to js
|
2015-07-13 16:02:19 +08:00 |
CocosRobot
|
0e8a3f14f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-10 09:11:50 +00:00 |
pandamicro
|
69cdaca306
|
Auto add extend to jsb need to extend classes
|
2015-07-10 09:49:39 +08:00 |
CocosRobot
|
2065e5b4a7
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 07:45:43 +00:00 |
VisualSj
|
9f52b1e6fb
|
Fixed a bug that is SingleNode setColor is null
|
2015-07-09 11:49:11 +08:00 |
CocosRobot
|
bfe6db174e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 01:07:59 +00:00 |
CocosRobot
|
9638ae628a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-08 05:48:55 +00:00 |
pandamicro
|
8f0cf8c3e6
|
Merge pull request #12575 from ywxzm/v3
fix onTouch begin don't return value
|
2015-07-07 14:57:13 +08:00 |
pandamicro
|
e717155930
|
Merge pull request #12715 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 14:13:31 +08:00 |
CocosRobot
|
4a486077c0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 06:05:39 +00:00 |
pandamicro
|
5970f56e1f
|
Merge pull request #12714 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:55:12 +08:00 |
VisualSj
|
dd0edac171
|
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:36:47 +08:00 |
andyque
|
6238ddebf3
|
Merge remote-tracking branch 'upstream/v3.7-release' into v3
|
2015-07-07 10:18:43 +08:00 |
CocosRobot
|
4c88db3fb2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 00:44:47 +00:00 |
CocosRobot
|
a4bce56cca
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 10:37:24 +00:00 |
VisualSj
|
3b69a1726f
|
Fixed a bug that action texture address error
|
2015-07-06 17:17:20 +08:00 |
CocosRobot
|
ae860bd6ee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 08:29:03 +00:00 |
CocosRobot
|
fbf98adc7a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 14:48:11 +00:00 |
CocosRobot
|
91dc2d22de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 10:37:33 +00:00 |
pandamicro
|
1f48beee1e
|
Reorganize code
|
2015-07-03 12:55:55 +08:00 |
pandamicro
|
155b9b918c
|
Add retain/release for XMLHTTPReqest in JSB
|
2015-07-03 11:01:43 +08:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
pandamicro
|
dbd72d0123
|
Merge pull request #12646 from VisualSJ/v3.7-release
[ci skip] Fixed a bug that is don't analytical frame
|
2015-07-02 17:22:13 +08:00 |
Sijie.Wang
|
7818bfcc7a
|
Fixed a bug that is don't analytical frame
|
2015-07-02 14:30:44 +08:00 |
pandamicro
|
079ccbb0e2
|
Merge pull request #12639 from VisualSJ/v3.7-release
Fixed a bug that is LayoutComponent position error
|
2015-07-02 13:58:15 +08:00 |
VisualSJ
|
a475caf35a
|
Fixed a bug that is LayoutComponent position error
|
2015-07-02 11:52:31 +08:00 |
CocosRobot
|
bf3c970534
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-01 14:12:18 +00:00 |
pandamicro
|
3b9fd5502e
|
Fix cc.isArray for JSB
|
2015-07-01 21:57:39 +08:00 |
zhang
|
48c3466774
|
Update LayerEx.lua
|
2015-07-01 20:25:45 +08:00 |
pandamicro
|
4d95c8778b
|
Merge pull request #12598 from shinhirota/v3
Fixed iOS/JS-Bind callStaticMethod() with bool arg
|
2015-07-01 11:34:03 +08:00 |
Bin Zhang
|
d0db3aee98
|
Remove the plugin-x related files from the Xcode project of js-bindings .
|
2015-06-30 17:28:47 +08:00 |
子龙山人
|
077241eecf
|
Merge pull request #12599 from jianglong0156/jsbProjectMerge
merge the jsb project into cocos2d project
|
2015-06-30 17:04:12 +08:00 |
Bin Zhang
|
bb77101f0b
|
Solve the error when building simulator for android.
|
2015-06-30 16:45:13 +08:00 |
jianglong0156
|
185b4419be
|
merge job project into cocos2d-x project
|
2015-06-30 13:49:24 +08:00 |
Shin Hirota
|
221d33a431
|
Fixed iOS/JS-Bind callStaticMethod() with bool arg
|
2015-06-30 14:00:28 +09:00 |
子龙山人
|
29cccf631e
|
Merge pull request #12550 from kompjoefriek/v3-vibrate
Vibrate support in v3
|
2015-06-30 10:28:59 +08:00 |
Dale Stammen
|
38b687f8d8
|
enable support for keyboard on winrt platforms to fix back button
|
2015-06-29 09:13:19 -07:00 |
pandamicro
|
15c763d84a
|
Update engine version
|
2015-06-29 18:21:06 +08:00 |
zhang
|
43ea04da3c
|
fix onTouch begin don't return value
fix only receive "begin" envent,can't receive "moved" "ended"
|
2015-06-28 13:18:33 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
jianglong0156
|
11ac928f59
|
winrt use touch event replace mouse event
|
2015-06-25 17:44:03 +08:00 |
jianglong0156
|
c60e9dfc9e
|
winrt not suppot mouse
|
2015-06-25 17:25:27 +08:00 |
pandamicro
|
04af5dfbe3
|
#12494 Upgrade platform constants for WP8 & WINRT
|
2015-06-23 23:23:25 +08:00 |
江龙
|
7ff383e4d2
|
add the return value
|
2015-06-23 20:27:30 +08:00 |
pandamicro
|
ac138a3287
|
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
|
2015-06-23 16:27:32 +08:00 |
XiaoFeng
|
befe97a78b
|
Update js parser for compatible with CocosStudio 2.3.2 json format export
|
2015-06-23 16:24:53 +08:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +08:00 |
pandamicro
|
7b1694bfeb
|
Merge pull request #12443 from VisualSJ/v3-aa
[ci skip]Studio parser: Code for defense
|
2015-06-19 14:24:39 +08:00 |
VisualSJ
|
8fa755d0e4
|
Studio parser: Code for defense
|
2015-06-19 13:15:10 +08:00 |
VisualSJ
|
ea0ab5c738
|
Studio parser: Code for defense
|
2015-06-19 11:13:07 +08:00 |
pandamicro
|
8e9fed936c
|
Add auto bindings
|
2015-06-19 10:36:36 +08:00 |
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +08:00 |
pandamicro
|
c6d4f283bb
|
Fix compilation issue in navmesh conversion
|
2015-06-19 08:11:45 +08:00 |
pandamicro
|
f405d00336
|
Fix linux compilation
|
2015-06-19 01:14:16 +08:00 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +08:00 |
江龙
|
8fc5835dee
|
modify linux file
|
2015-06-18 23:29:04 +08:00 |
江龙
|
61db9ef103
|
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
|
2015-06-18 23:21:53 +08:00 |
江龙
|
8c97fec5af
|
add navmesh project file path
|
2015-06-18 23:17:49 +08:00 |
jianglong0156
|
618d8f01e8
|
Merge pull request #9 from pandamicro/navmesh
Improve bindings for navmesh
|
2015-06-18 23:15:05 +08:00 |
pandamicro
|
b757837239
|
Move NavMesh to jsb namespace
|
2015-06-18 22:57:41 +08:00 |
jianglong0156
|
56382aae37
|
winphone project
|
2015-06-18 22:50:24 +08:00 |
CocosRobot
|
ea2ec582f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 14:05:05 +00:00 |
CocosRobot
|
e2268bb16f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 22:00:57 +08:00 |
CocosRobot
|
c069da629e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 22:00:56 +08:00 |
pandamicro
|
e09ba8080f
|
Fix create Sprite with PolygonInfo issue
|
2015-06-18 21:48:57 +08:00 |
jianglong0156
|
05c40b13f9
|
fix the win32 head error
|
2015-06-18 21:30:30 +08:00 |
pandamicro
|
10a8adad53
|
Change physics3d api to jsb namespace
|
2015-06-18 20:39:40 +08:00 |
jianglong0156
|
e0b66707f9
|
add nerviest android file
|
2015-06-18 19:30:05 +08:00 |
jianglong0156
|
4fe1542d17
|
add navmesh tests
|
2015-06-18 19:22:27 +08:00 |
CocosRobot
|
6e849a158d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 08:18:00 +00:00 |
pandamicro
|
aa566a3722
|
Merge pull request #12424 from pandamicro/physics3d
Fix Physics3D test and js bindings
|
2015-06-18 16:09:49 +08:00 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
CocosRobot
|
b76db94725
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 05:43:02 +00:00 |
pandamicro
|
7952477469
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
|
2015-06-18 12:05:01 +08:00 |
pandamicro
|
3ffc0e6be6
|
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
|
2015-06-18 09:20:37 +08:00 |
pandamicro
|
a94b49bdef
|
Add nav mesh bindings
|
2015-06-17 23:41:12 +08:00 |
pandamicro
|
85e8a407b1
|
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
|
2015-06-17 19:58:24 +08:00 |
samuele3hu
|
683812d817
|
Update Physics3D test for js.
|
2015-06-17 18:50:55 +08:00 |
jianglong0156
|
b265033a41
|
add testcase and manual bindings
|
2015-06-17 18:38:18 +08:00 |
jianglong0156
|
897b5fd0e9
|
add navmesh test project file and binding file
|
2015-06-17 18:37:19 +08:00 |
CocosRobot
|
22f04da582
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 07:18:18 +00:00 |
CocosRobot
|
55c7de75e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 06:48:41 +00:00 |
Jacky
|
3c5ab4f518
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-17 13:04:24 +08:00 |
CocosRobot
|
6bed988354
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 03:47:36 +00:00 |
pandamicro
|
e4d5db30eb
|
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
|
2015-06-16 15:09:06 +08:00 |
samuele3hu
|
a547d6aa33
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
Conflicts:
tools/bindings-generator
|
2015-06-16 11:36:11 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
Hao Wu
|
b4ca8c1489
|
Merge pull request #15 from pandamicro/spritepolygon
Add SpritePolygon JSB bindingsJSB bindings
|
2015-06-15 15:47:02 +08:00 |
CocosRobot
|
8ec924c206
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-15 05:46:51 +00:00 |
pandamicro
|
852b9b42b9
|
Remove jsb_cocos2dx_experimental_manual
|
2015-06-15 10:46:57 +08:00 |
pandamicro
|
032f231ed4
|
Add bindings for AutoPolygon and PolygonInfo
|
2015-06-13 11:14:57 +08:00 |
CocosRobot
|
60d68ab4de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-12 13:27:20 +00:00 |
pandamicro
|
f9057b3f32
|
Merge pull request #12284 from pandamicro/v3
Fix template android compilation issue on physics3d
|
2015-06-12 21:10:40 +08:00 |
Jacky
|
29c108bdef
|
Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-12 16:28:41 +08:00 |
pandamicro
|
e9d648f151
|
Fix physics 3d macro include issue
|
2015-06-12 15:41:46 +08:00 |
pandamicro
|
df1219c92d
|
Update manual conversion for sprite polygon
|
2015-06-12 12:56:37 +08:00 |
pandamicro
|
9acc51a5eb
|
Merge pull request #12301 from jianglong0156/webviewCrash
fix webview crash in android
|
2015-06-12 08:12:14 +08:00 |
pandamicro
|
12de53726d
|
Merge pull request #12182 from VisualSJ/v3-jsb
[ci skip] Synchronization studio parser
|
2015-06-11 17:35:15 +08:00 |
jianglong0156
|
c317eb428a
|
fix webview crash in android
|
2015-06-11 17:28:02 +08:00 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
CocosRobot
|
94a47fabcf
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-11 06:16:36 +00:00 |
VisualSJ
|
2d12d6a295
|
Plist file parsing (action-2.x.js)
|
2015-06-11 11:14:10 +08:00 |
VisualSJ
|
3306c7b072
|
Fixed control LayoutComponent positioning bug
|
2015-06-08 15:41:33 +08:00 |
CocosRobot
|
4fc0366e4d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-08 06:21:14 +00:00 |
VisualSJ
|
060ab85f22
|
Fixed UIText color settings bug
|
2015-06-08 13:58:08 +08:00 |
CocosRobot
|
835e56e80a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 23:13:03 +00:00 |
CocosRobot
|
9178eeca73
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 08:11:21 +00:00 |
CocosRobot
|
9e3fa92803
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 01:51:34 +00:00 |
pandamicro
|
e0eff26674
|
Fix component function execution issue in JSB
|
2015-06-05 00:03:21 +08:00 |
pandamicro
|
25e047eb41
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
|
2015-06-04 23:29:45 +08:00 |
CocosRobot
|
8865bd488e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 12:52:41 +00:00 |
pandamicro
|
af756c50dc
|
Merge pull request #12184 from pandamicro/v3
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 20:42:35 +08:00 |
pandamicro
|
e75dee6e7c
|
Remove C++ invocation functions of Component
|
2015-06-04 20:10:10 +08:00 |
pandamicro
|
2da754dcf2
|
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
Add onEnter and onExit of components to CCNode's onEnter and onExit function
|
2015-06-04 18:39:52 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
VisualSJ
|
a91fdd6b8e
|
Synchronization studio parser - (fixed: resPath and custom easing animation)
|
2015-06-04 16:59:42 +08:00 |
VisualSJ
|
587bd475e9
|
Synchronization studio parser - (fixed: resPath and custom easing animation)
|
2015-06-04 16:23:06 +08:00 |
pandamicro
|
2c168130ed
|
Fix jsbinding calls for CCComponent
|
2015-06-04 15:59:05 +08:00 |
pandamicro
|
83f7f30c1c
|
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 15:03:20 +08:00 |
pandamicro
|
9c23126d9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 13:14:34 +08:00 |
CocosRobot
|
76b151c281
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-03 20:25:32 +00:00 |
samuele3hu
|
0cccd6e765
|
Fix compile error on the Linux and update the test cases
|
2015-06-03 18:12:21 +08:00 |
samuele3hu
|
a20681aa21
|
Add Lua-bindings for NavMesh
|
2015-06-02 18:37:57 +08:00 |
jianglong0156
|
ac71777e97
|
add webview and videoplayer protect contidition.
|
2015-06-02 13:50:55 +08:00 |
jianglong0156
|
c46fea1f7a
|
Merge branch 'v3' into videoplayer
|
2015-06-02 11:26:48 +08:00 |
pandamicro
|
4c6f67fd7e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
tools/bindings-generator
web
|
2015-06-02 10:12:22 +08:00 |
pandamicro
|
fdec552ed7
|
Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader
|
2015-06-02 10:08:13 +08:00 |
江龙
|
a8b640f751
|
add videoplayer project
|
2015-06-02 09:04:15 +08:00 |
CocosRobot
|
3a1b52cafd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 06:31:00 +00:00 |
CocosRobot
|
892816de3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 05:46:22 +00:00 |
jianglong0156
|
722b6b1baf
|
add video player binding files
|
2015-05-29 11:39:47 +08:00 |
子龙山人
|
a968bc2d15
|
Merge pull request #12062 from jianglong0156/jsWebviewTest
Js webview test
|
2015-05-29 11:35:30 +08:00 |
jianglong0156
|
8b52563a8a
|
add videoplayer config ini and fix the url bug
|
2015-05-29 11:10:39 +08:00 |