99 commits

Author	SHA1	Message	Date
Peter Cottle	4f453ad4d8	big advance on levels, i can now compare trees holistically or just specific branches, will be big for level design	2012-10-30 16:51:06 -07:00
Peter Cottle	018a404bc6	levels file, for GAMEIFICATIONNNnnn	2012-10-30 16:47:01 -07:00
Peter Cottle	103ea281ff	merge animation fix	2012-10-30 14:05:19 -07:00
Peter Cottle	eb254126cb	and also bug about backbone events throwing random args	2012-10-27 18:21:18 -07:00
Peter Cottle	6c6c789da8	FIXED RELOADINGGGGGGGGGGGGGGGG	2012-10-27 17:05:43 -07:00
Peter Cottle	5272cfea47	print tree string and load from string	2012-10-25 15:37:13 -07:00
Peter Cottle	fcee1fa321	better merge birth animation	2012-10-25 12:34:41 -07:00
Peter Cottle	385e3be236	better merge commit tree layout algorithm	2012-10-25 12:30:09 -07:00
Peter Cottle	647bba9903	whoops messed up rebase	2012-10-25 09:58:58 -07:00
Peter Cottle	fe5e29bfe1	correct revert now	2012-10-24 15:31:52 -07:00
Peter Cottle	f6a81c4ba0	better merge commit messages and right sorting now	2012-10-24 14:59:52 -07:00
Peter Cottle	87954b306c	better git log	2012-10-24 14:41:56 -07:00
Peter Cottle	5c73cfb5c1	ordering on rebase -i	2012-10-23 23:24:02 -07:00
Peter Cottle	b3339c07f1	adding jquery ui lib	2012-10-23 22:30:15 -07:00
Peter Cottle	41d72793ea	damn! all of git rebasing interactive barebones almost done	2012-10-23 22:05:12 -07:00
Peter Cottle	a5da6f76b8	rebase interactive with animations	2012-10-23 20:18:18 -07:00
Peter Cottle	c3ce495d56	beginnings of rebase interactive going	2012-10-23 20:11:32 -07:00
Peter Cottle	0674d77fed	moving to interactive rebasing	2012-10-23 15:18:37 -07:00
Peter Cottle	0fbbbcf35d	final arg refactor	2012-10-23 09:38:46 -07:00
Peter Cottle	aaf7a462c0	local storage and general arg stuff	2012-10-23 09:27:19 -07:00
Peter Cottle	eeff8da035	makes branch now	2012-10-22 20:24:29 -07:00
Peter Cottle	338259de12	force branch implemented	2012-10-22 13:16:14 -07:00
Peter Cottle	8f396de98d	introduced bug with rebasing on HEAD from checking out too early	2012-10-22 09:18:45 -07:00
Peter Cottle	bebe06baa4	always check out branch on rebase	2012-10-22 09:10:03 -07:00
Peter Cottle	7e04853a77	cehcking out what we rebased	2012-10-22 09:04:12 -07:00
Peter Cottle	73cf66b35e	rebase onto commits	2012-10-21 18:24:45 -07:00
Peter Cottle	93abdd9043	nice rebase update	2012-10-21 13:35:44 -07:00
Peter Cottle	85b66e83bd	rebase detached head thing	2012-10-21 13:16:36 -07:00
Peter Cottle	85de7c5a04	collision issue	2012-10-21 09:35:37 -07:00
Peter Cottle	ea3fe2f3eb	two small updates	2012-10-20 23:09:48 -07:00
Peter Cottle	a8866ec593	thanks nikita	2012-10-20 22:12:21 -07:00
Peter Cottle	904a52fc50	better error message	2012-10-20 19:25:45 -07:00
Peter Cottle	e88539bd08	bug fix for rebasing	2012-10-20 18:54:11 -07:00
Peter Cottle	51a92227c3	quick implementation of git status	2012-10-20 18:12:37 -07:00
Peter Cottle	b944a23790	stuck on weird load issues	2012-10-13 16:01:09 -07:00
Peter Cottle	ec5c40141c	working on tree reload bugs	2012-10-13 15:44:36 -07:00
Peter Cottle	3bc67d66d3	basic import export working	2012-10-13 15:15:32 -07:00
Peter Cottle	37c5c4c28a	export tree working	2012-10-13 14:14:29 -07:00
Peter Cottle	a9e4d5a9a6	have somewhat ok global lock on animation down, better than nothing	2012-10-13 13:48:15 -07:00
Peter Cottle	ef5ff59cca	woohoogit push rebases correctly based on previous changes	2012-10-13 13:32:09 -07:00
Peter Cottle	8534bdad2c	nice, node highlighting now	2012-10-13 13:14:45 -07:00
Peter Cottle	359878037a	BOOM BIG UPDATE on the rebase animation awesome	2012-10-13 00:22:57 -07:00
Peter Cottle	703591be5c	can't merge a commit anyomre	2012-10-12 23:18:12 -07:00
Peter Cottle	f353fa118d	branch deleting down	2012-10-12 22:59:29 -07:00
Peter Cottle	15817f9220	another bug fix and colored nodes	2012-10-12 17:42:14 -07:00
Peter Cottle	bca3e1d537	nice hue blending and cursor focus blur	2012-10-12 15:52:07 -07:00
Peter Cottle	076f8e3056	another bug fix, fixed the quotes escaping	2012-10-12 13:53:49 -07:00
Peter Cottle	225f3cf635	bug fix 2, now checks for ID existence	2012-10-12 13:47:16 -07:00
Peter Cottle	ba07683591	ammend on root node fixed	2012-10-12 13:44:35 -07:00
Peter Cottle	2866ff38bb	right commit messages	2012-09-30 16:55:57 -07:00