Commit Graph

233 Commits

Author SHA1 Message Date
Ubuntu
af394c1907 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-09-01 17:43:49 +00:00
Ubuntu
e92d03213e bump protocol number 2014-09-01 16:55:14 +00:00
Ubuntu
13d4772a95 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-28 17:20:02 +00:00
Ubuntu
cde357f317 bump protocol number and add Anton's carrier 2014-08-28 16:59:44 +00:00
Ubuntu
5c107029f6 almost done with lifecycle of a packet 2014-08-27 01:45:26 +00:00
Ubuntu
ee80bb021f Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-25 15:09:50 +00:00
vere
5b9fd272c6 bump protocol number 2014-08-24 22:13:27 +00:00
Ubuntu
554a22660b Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-21 20:08:32 +00:00
Anton Dyudin
3d454f2acf Am I doing this right? 2014-08-21 12:15:05 -07:00
johncburnham
d408ebc495 breach protocol roll 2014-08-21 06:08:56 -07:00
johncburnham
4a59dfc9d4 carriers 2014-08-18 20:17:40 -07:00
johncburnham
4ac0c678d5 roll protocol for breach 2014-08-18 00:05:57 -07:00
johncburnham
adaaca8735 roll breach protocol 2014-08-11 19:21:54 -07:00
vere
920c998f1b roll protocol again 2014-08-09 20:59:52 +00:00
johncburnham
3861f41ba0 roll protocol 2014-08-09 13:22:33 -07:00
Ubuntu
705b7812bb bump protocol number 2014-08-06 18:00:41 +00:00
vere
165a37626c bump protocol 2014-08-05 19:25:09 +00:00
C. Guy Yarvin
1d49dc93cc Ames protocol to 3. 2014-08-04 18:19:15 -07:00
C. Guy Yarvin
a4a3c67664 Protocol to 2. 2014-08-04 12:51:34 -07:00
C. Guy Yarvin
e772988cae Moving to protocol 1. 2014-08-04 10:46:37 -07:00
johncburnham
86e0312934 bad commit 2014-08-04 10:18:58 -07:00
johncburnham
4e925fa53d git dropped a commit? 2014-08-04 09:54:14 -07:00
pcmonk
1cb4bb27cb drop redundant acks instead of crashing 2014-08-01 19:04:50 -07:00
pcmonk
b7f2e2bc79 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-08-01 16:53:42 -07:00
pcmonk
97755be677 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:27:44 -07:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
pcmonk
7d581a3714 most of new chat 2014-07-31 19:44:49 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem'
Conflicts:
	urb/urbit.pill
2014-07-31 13:38:05 -07:00
johncburnham
5fd348d1e9 roll protocol for breach 2014-07-31 08:25:29 -07:00
pcmonk
f34071c4ff e2e-acks in a consistent state, ready to merge 2014-07-28 11:44:56 -07:00
pcmonk
1445aefca4 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-07-25 19:34:51 -07:00
pcmonk
2b4fec9a51 all (well-formed) test apps work 2014-07-25 19:10:24 -07:00
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00
Anton Dyudin
7e50755029 Restructured raws/rads:og for =^ result order, added /=pals= %ames .^ 2014-07-23 14:01:52 -07:00
pcmonk
13a4df24a1 cleanup 2014-07-23 11:25:53 -07:00
johncburnham
424fa7398d once more into the breach 2014-07-23 01:31:09 -07:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
pcmonk
2df55edb87 Bump protocol number 2014-07-16 11:25:22 -07:00
pcmonk
5acce9cc04 checkpoint 2014-07-11 16:44:33 -07:00
pcmonk
2f2112f153 bump protocol number for breach 2014-07-10 11:21:49 -07:00
C. Guy Yarvin
a608e99ce0 Various fixes and improvements. 2014-07-09 17:48:53 -07:00
pcmonk
2c15e0c0bf %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07:00
pcmonk
2e230304fc Fixed lag bug 2014-07-08 20:20:38 -07:00
pcmonk
90f915752d Bump protocol number 2014-07-08 12:51:24 -07:00
pcmonk
ce2a89fdd2 partial switch away from %rasp 2014-07-07 16:36:35 -07:00
pcmonk
ea49cdca02 progress on %gall over %ames 2014-07-02 15:08:02 -07:00
C. Guy Yarvin
f7f3e43424 %gall over %ames, first cut. 2014-06-29 16:58:17 -07:00
C. Guy Yarvin
28e63d7a36 Trailing whitespace and stuff. 2014-06-26 21:02:05 -07:00
C. Guy Yarvin
43f7dcba1d %ames to %gall as /q/gm/[app]/[logo]. 2014-06-26 05:18:30 -07:00