Commit Graph

741 Commits

Author SHA1 Message Date
~hatteb-mitlyd
a2ad059d05 Fix :report for ames 2014-05-31 19:28:04 -07:00
johncburnham
4d450a4e3d Merge branch 'master' of https://github.com/urbit/urbit 2014-05-31 18:41:44 -07:00
johncburnham
e080ee108d added some comments 2014-05-31 18:41:27 -07:00
C. Guy Yarvin
08400bbefb Merge branch 'master' of github.com:urbit/urbit 2014-05-31 17:43:01 -07:00
C. Guy Yarvin
10f48cd797 Fix proxy bug. 2014-05-31 17:42:48 -07:00
johncburnham
130f653433 fixed hmac comment 2014-05-31 16:49:48 -07:00
pcmonk
9b523d1767 Fixed multiple entrance/exit notice bug. 2014-05-31 14:46:10 -07:00
Gavin Whelan
7eea04ce1e Minor interface changes 2014-05-31 14:11:11 -07:00
pcmonk
a03634a7e1 Fixed docs 2014-05-31 14:04:22 -07:00
pcmonk
f9406a7927 Fixed chat writing-to-old-version-of-file bug. 2014-05-31 14:03:17 -07:00
pcmonk
a830b6cfa9 Fixed :haus name bug 2014-05-31 13:56:40 -07:00
C. Guy Yarvin
4db07a816d More pre-breach fixes. 2014-05-31 13:22:49 -07:00
C. Guy Yarvin
32295555c5 Scry interface fixes. 2014-05-31 12:40:02 -07:00
C. Guy Yarvin
26be7c0871 Update packet version number to 0. 2014-05-31 11:31:15 -07:00
C. Guy Yarvin
8ed177e55a Remove a printf. 2014-05-31 11:25:10 -07:00
Gavin Whelan
341779681e Merge branch 'master' of https://github.com/urbit/urbit 2014-05-31 10:58:55 -07:00
Gavin Whelan
70622cb64e Small chat fixes 2014-05-31 10:58:39 -07:00
C. Guy Yarvin
733ff7f0c6 Fill in some stubs in %ford. 2014-05-31 05:52:06 -07:00
C. Guy Yarvin
afa57ae065 Change %ames namespace. 2014-05-30 21:58:37 -07:00
~hatteb-mitlyd
1c20ba00f4 actually commit the protocol 2014-05-30 18:58:16 -07:00
~hatteb-mitlyd
733e1b0a8f Merge remote-tracking branch 'origin/newbreach'
Update protocol for breach.

Conflicts:
	f/trac.c
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
	v/raft.c
2014-05-30 17:56:12 -07:00
C. Guy Yarvin
42bd55fdb4 Eliminate use of ++vane. 2014-05-30 16:51:35 -07:00
Gavin Whelan
47774a10a4 Final stuff 2014-05-30 16:40:56 -07:00
Gavin Whelan
cded6c902d Merge various changes 2014-05-30 16:13:44 -07:00
Gavin Whelan
6177ebbb26 Merge and minor merge changes 2014-05-30 15:59:58 -07:00
C. Guy Yarvin
dc4e9a41ca Changed some interfaces. 2014-05-30 15:51:31 -07:00
pcmonk
314ade93ea Updated chat, changed room to haus 2014-05-30 15:41:22 -07:00
C. Guy Yarvin
80dda23245 Add version state to vanes. 2014-05-30 15:10:39 -07:00
C. Guy Yarvin
a087b13417 Unbreak :reset. 2014-05-30 15:04:20 -07:00
C. Guy Yarvin
7c1cad4672 Revert "Remove unused arms from arvo external core."
This reverts commit b754c2aeadbc8028a2e7989066dbbf08d2f293ef.
2014-05-30 14:51:28 -07:00
C. Guy Yarvin
eb2f4a560b Remove unused arms from arvo external core. 2014-05-30 14:45:41 -07:00
Gavin Whelan
fec9999f42 Using named tiles 2014-05-30 13:58:12 -07:00
C. Guy Yarvin
6455b41363 Slow things commented out. 2014-05-30 13:57:49 -07:00
johncburnham
6aac6caf9c added glyph mnemonics 2014-05-30 13:52:35 -07:00
Gavin Whelan
aaee76e324 Merging clay fixes 2014-05-30 13:36:51 -07:00
C. Guy Yarvin
f729afacb1 Clay refactored to top-level redes. 2014-05-29 19:26:35 -07:00
C. Guy Yarvin
7d0be097de Middle stage of clay restructuring. 2014-05-29 19:12:02 -07:00
Galen Wolfe-Pauly
7a4b6f3096 trivial merge 2014-05-29 18:59:08 -07:00
Galen Wolfe-Pauly
98d41a9168 webconsole interface changes 2014-05-29 18:53:23 -07:00
C. Guy Yarvin
c123d4e115 Some gall related fixes. 2014-05-29 15:00:13 -07:00
Gavin Whelan
e235e18387 Merge 2014-05-29 12:33:46 -07:00
Gavin Whelan
f8c2775bde Merge 2014-05-29 12:29:55 -07:00
C. Guy Yarvin
e202c6e336 No printfs. 2014-05-29 12:20:27 -07:00
C. Guy Yarvin
61988d932e Clean build without debug printfs. 2014-05-29 12:06:08 -07:00
Gavin Whelan
9ef31016ab Broken happenings. 2014-05-29 12:01:50 -07:00
Gavin Whelan
fa518297f1 Merging 2014-05-29 11:52:49 -07:00
C. Guy Yarvin
b18c327392 Some optimizations. 2014-05-29 11:46:43 -07:00
Gavin Whelan
7c56f17a06 Fixing syntax error 2014-05-29 11:06:04 -07:00
C. Guy Yarvin
390457370a Merge branch 'newbreach' of github.com:urbit/urbit into newbreach 2014-05-28 16:43:43 -07:00
C. Guy Yarvin
2e5acd50da More good stuff. 2014-05-28 16:43:30 -07:00