comparison settings

This commit is contained in:
Peter Cottle 2013-10-08 12:56:17 -07:00
parent f963c4ea0a
commit b13d6946e9
4 changed files with 51 additions and 1206 deletions

View file

@ -19691,20 +19691,22 @@ exports.levelSequences = {
if (typeof window !== 'undefined' && window.location &&
window.location.href.indexOf('showRemote') !== -1) {
exports.levelSequences.remote = [
require('./remote/clone').level,
require('./remote/remoteBranches').level,
require('./remote/fetch').level,
require('./remote/pull').level,
require('./remote/fakeTeamwork').level,
require('./remote/push').level,
require('./remote/fetchRebase').level
];
exports.levelSequences.remoteAdvanced = [
require('./remote/specify').level,
require('./remote/pushManyFeatures').level,
require('./remote/mergeManyFeatures').level
];
exports.levelSequences = {
remote: [
require('./remote/clone').level,
require('./remote/remoteBranches').level,
require('./remote/fetch').level,
require('./remote/pull').level,
require('./remote/fakeTeamwork').level,
require('./remote/push').level,
require('./remote/fetchRebase').level
],
remoteAdvanced: [
require('./remote/specify').level,
require('./remote/pushManyFeatures').level,
require('./remote/mergeManyFeatures').level
]
};
}
// there are also cute names and such for sequences
@ -23940,6 +23942,7 @@ require.define("/src/levels/remote/mergeManyFeatures.js",function(require,module
"hint": {
"en_US": "Pay attention to the goal tree!"
},
"compareOnlyMaster": true,
"startDialog": {
"en_US": {
"childViews": [
@ -39425,20 +39428,22 @@ exports.levelSequences = {
if (typeof window !== 'undefined' && window.location &&
window.location.href.indexOf('showRemote') !== -1) {
exports.levelSequences.remote = [
require('./remote/clone').level,
require('./remote/remoteBranches').level,
require('./remote/fetch').level,
require('./remote/pull').level,
require('./remote/fakeTeamwork').level,
require('./remote/push').level,
require('./remote/fetchRebase').level
];
exports.levelSequences.remoteAdvanced = [
require('./remote/specify').level,
require('./remote/pushManyFeatures').level,
require('./remote/mergeManyFeatures').level
];
exports.levelSequences = {
remote: [
require('./remote/clone').level,
require('./remote/remoteBranches').level,
require('./remote/fetch').level,
require('./remote/pull').level,
require('./remote/fakeTeamwork').level,
require('./remote/push').level,
require('./remote/fetchRebase').level
],
remoteAdvanced: [
require('./remote/specify').level,
require('./remote/pushManyFeatures').level,
require('./remote/mergeManyFeatures').level
]
};
}
// there are also cute names and such for sequences
@ -43137,6 +43142,7 @@ require.define("/src/levels/remote/mergeManyFeatures.js",function(require,module
"hint": {
"en_US": "Pay attention to the goal tree!"
},
"compareOnlyMaster": true,
"startDialog": {
"en_US": {
"childViews": [

File diff suppressed because it is too large Load diff

View file

@ -31,20 +31,22 @@ exports.levelSequences = {
if (typeof window !== 'undefined' && window.location &&
window.location.href.indexOf('showRemote') !== -1) {
exports.levelSequences.remote = [
require('./remote/clone').level,
require('./remote/remoteBranches').level,
require('./remote/fetch').level,
require('./remote/pull').level,
require('./remote/fakeTeamwork').level,
require('./remote/push').level,
require('./remote/fetchRebase').level
];
exports.levelSequences.remoteAdvanced = [
require('./remote/specify').level,
require('./remote/pushManyFeatures').level,
require('./remote/mergeManyFeatures').level
];
exports.levelSequences = {
remote: [
require('./remote/clone').level,
require('./remote/remoteBranches').level,
require('./remote/fetch').level,
require('./remote/pull').level,
require('./remote/fakeTeamwork').level,
require('./remote/push').level,
require('./remote/fetchRebase').level
],
remoteAdvanced: [
require('./remote/specify').level,
require('./remote/pushManyFeatures').level,
require('./remote/mergeManyFeatures').level
]
};
}
// there are also cute names and such for sequences

View file

@ -8,6 +8,7 @@ exports.level = {
"hint": {
"en_US": "Pay attention to the goal tree!"
},
"compareOnlyMaster": true,
"startDialog": {
"en_US": {
"childViews": [