mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-08 21:54:26 +02:00
Merging now worksgit status! and have some nice graph exploration
This commit is contained in:
parent
af76c03ad1
commit
6cb4c6b4a1
7 changed files with 206 additions and 52 deletions
|
@ -8,7 +8,7 @@ var gitEngine = null;
|
|||
var gitVisuals = null;
|
||||
|
||||
$(document).ready(function(){
|
||||
sys = arbor.ParticleSystem(4000, 500, 0.5, false, 55, 0.005, 'verlet');
|
||||
sys = arbor.ParticleSystem(4000, 200, 0.5, false, 55, 0.005, 'verlet');
|
||||
sys.renderer = Renderer('#viewport');
|
||||
|
||||
new CommandLineView({
|
||||
|
@ -24,7 +24,8 @@ $(document).ready(function(){
|
|||
var repulsionBreathe = function(r) {
|
||||
sys.parameters({repulsion: r});
|
||||
};
|
||||
var b = new Breather(repulsionBreathe, 6050, 4000);
|
||||
// TODO: decide on breather
|
||||
// var b = new Breather(repulsionBreathe, 6050, 4000);
|
||||
|
||||
graphicsEffects.edgeStrokeEffect = new GraphicsEffect('edgeStroke', {wait: 1000});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue