Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14551 from slackmoehrle/fix_server_in_cpp_tests 

changed to cocos2d-x.org server
This commit is contained in:
Ricardo Quesada 2015-12-02 15:53:53 -08:00
parent bc418feb96 1b4d12ced7
commit 4ab1540ccc
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cpp-tests/Resources/Manifests/AMTestScene1/project.manifest
View File

@ -1,7 +1,7 @@
{ {
"packageUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene1/", "packageUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene1/",
"remoteManifestUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene1/project_dev.manifest", "remoteManifestUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene1/project_dev.manifest",
"remoteVersionUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene1/version_dev.manifest", "remoteVersionUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene1/version_dev.manifest",
"version" : "1.0.0", "version" : "1.0.0",
"engineVersion" : "3.0 beta", "engineVersion" : "3.0 beta",

4
tests/cpp-tests/Resources/Manifests/AMTestScene2/project.manifest
View File

@ -1,6 +1,6 @@
{ {
"packageUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene2/", "packageUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene2/",
"remoteManifestUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene2/project_dev.manifest", "remoteManifestUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene2/project_dev.manifest",
"version" : "1.0.0", "version" : "1.0.0",
"engineVersion" : "3.0 beta", "engineVersion" : "3.0 beta",

6
tests/cpp-tests/Resources/Manifests/AMTestScene3/project.manifest
View File

@ -1,7 +1,7 @@
{ {
"packageUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene3/", "packageUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene3/",
"remoteManifestUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene3/project_dev.manifest", "remoteManifestUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene3/project_dev.manifest",
"remoteVersionUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene3/version_dev.manifest", "remoteVersionUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene3/version_dev.manifest",
"version" : "1.0.0", "version" : "1.0.0",
"engineVersion" : "3.0 beta", "engineVersion" : "3.0 beta",

4
tests/cpp-tests/Resources/Manifests/AMTestScene4/project.manifest
View File

@ -1,7 +1,7 @@
{ {
"packageUrl" : "http://cocostudio.download.appget.cn/Cocos2D-X/", "packageUrl" : "http://cocostudio.download.appget.cn/Cocos2D-X/",
"remoteManifestUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene4/project_dev.manifest", "remoteManifestUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene4/project_dev.manifest",
"remoteVersionUrl" : "http://tools.itharbors.com/assets_manager/AMTestScene4/version_dev.manifest", "remoteVersionUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/AMTestScene4/version_dev.manifest",
"version" : "1.0.0", "version" : "1.0.0",
"engineVersion" : "3.0 beta", "engineVersion" : "3.0 beta",

6
tests/cpp-tests/Resources/Manifests/ScriptTest/project.manifest
View File

@ -1,7 +1,7 @@
{ {
"packageUrl" : "http://tools.itharbors.com/assets_manager/ScriptTest/", "packageUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/ScriptTest/",
"remoteManifestUrl" : "http://tools.itharbors.com/assets_manager/ScriptTest/project_dev.manifest", "remoteManifestUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/ScriptTest/project_dev.manifest",
"remoteVersionUrl" : "http://tools.itharbors.com/assets_manager/ScriptTest/version_dev.manifest", "remoteVersionUrl" : "http://cocos2d-x.org/assets/cpp-tests-resources/assets_manager/ScriptTest/version_dev.manifest",
"version" : "1.0.0", "version" : "1.0.0",
"engineVersion" : "3.0", "engineVersion" : "3.0",

2
tests/js-tests/project/proj.ios/Info.plist
View File

@ -8,7 +8,7 @@
<false/> <false/>
<key>NSExceptionDomains</key> <key>NSExceptionDomains</key>
<dict> <dict>
<key>tools.itharbors.com</key> <key>cocos2d-x.org/assets/cpp-tests-resources</key>
<dict> <dict>
<key>NSIncludesSubdomains</key> <key>NSIncludesSubdomains</key>
<true/> <true/>

4
tests/js-tests/src/ExtensionsTest/NetworkTest/SocketIOTest.js
View File

@ -153,7 +153,7 @@ var SocketIOTestLayer = cc.Layer.extend({
onMenuSIOClientClicked: function(sender) { onMenuSIOClientClicked: function(sender) {
//create a client by using this static method, url does not need to contain the protocol //create a client by using this static method, url does not need to contain the protocol
var sioclient = SocketIO.connect("ws://tools.itharbors.com:4000", {"force new connection" : true}); var sioclient = SocketIO.connect("ws://cocos2d-x.org/assets/cpp-tests-resources:4000", {"force new connection" : true});
//if you need to track multiple sockets it is best to store them with tags in your own array for now //if you need to track multiple sockets it is best to store them with tags in your own array for now
sioclient.tag = "Test Client"; sioclient.tag = "Test Client";
@ -193,7 +193,7 @@ var SocketIOTestLayer = cc.Layer.extend({
onMenuSIOEndpointClicked: function(sender) { onMenuSIOEndpointClicked: function(sender) {
//repeat the same connection steps for the namespace "testpoint" //repeat the same connection steps for the namespace "testpoint"
var sioendpoint = SocketIO.connect("ws://tools.itharbors.com:4000/testpoint", {"force new connection" : true}); var sioendpoint = SocketIO.connect("ws://cocos2d-x.org/assets/cpp-tests-resources:4000/testpoint", {"force new connection" : true});
//a tag to differentiate in shared callbacks //a tag to differentiate in shared callbacks
sioendpoint.tag = "Test Endpoint"; sioendpoint.tag = "Test Endpoint";