AWESOME origin compare within trees and levels, visualizations down, finish animation chain fixed, everything is awesome here. ready fororigin levels

This commit is contained in:
Peter Cottle 2013-07-24 21:41:53 -07:00
parent 7a00bd09f6
commit c4ae821cef
12 changed files with 203 additions and 60 deletions

View file

@ -13,6 +13,9 @@ exports.levelSequences = {
require('../../levels/rampup/relativeRefs2').level,
require('../../levels/rampup/reversingChanges').level
],
remote: [
require('../../levels/remote/clone').level
],
rebase: [
require('../../levels/rebase/manyRebases').level
],
@ -59,6 +62,14 @@ exports.sequenceInfo = {
'zh_CN': '接下来是git的超赞特性。迫不及待了吧'
}
},
remote: {
displayName: {
'en_US': 'Push & Pull -- Git Remotes!'
},
about: {
'en_US': 'Time to share your 1\'s and 0\'s kids; coding just got social'
}
},
rebase: {
displayName: {
'en_US': 'Master the Rebase Luke!',

View file

@ -0,0 +1,10 @@
exports.level = {
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\"},\"o/master\":{\"target\":\"C1\",\"id\":\"o/master\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"remoteTrackingBranch\":null,\"remote\":false,\"target\":\"C1\",\"id\":\"master\",\"type\":\"branch\"}},\"commits\":{\"C0\":{\"type\":\"commit\",\"parents\":[],\"author\":\"Peter Cottle\",\"createTime\":\"Wed Jul 24 2013 21:27:52 GMT-0700 (PDT)\",\"commitMessage\":\"Quick commit. Go Bears!\",\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"type\":\"commit\",\"parents\":[\"C0\"],\"author\":\"Peter Cottle\",\"createTime\":\"Wed Jul 24 2013 21:27:52 GMT-0700 (PDT)\",\"commitMessage\":\"Quick commit. Go Bears!\",\"id\":\"C1\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\",\"type\":\"general ref\"}}}",
"solutionCommand": "git clone",
"name": {
"en_US": "The Clone Wars"
},
"hint": {
"en_US": "Just use \"git clone\" to finish the level, but make sure you understand the tutorial!"
}
};