Commit Graph

683 Commits

Author SHA1 Message Date
Luke Patmore
2ab9b9a78c Whitespace: the invisible killer 2014-06-04 19:46:12 -07:00
Luke Patmore
cdd109c178 Tested and enabled macro expansions. 2014-06-04 17:56:24 -07:00
Luke Patmore
b431dad6e0 Merge branch 'master' into nextbreach
Conflicts:
	urb/urbit.pill
2014-06-04 15:54:21 -07:00
Luke Patmore
b252cd7db2 Fixed censig macro expansion. 2014-06-04 15:10:20 -07:00
Luke Patmore
2cc43f51ca Merge branch 'master' of https://github.com/urbit/urbit 2014-06-04 13:21:52 -07:00
Luke Patmore
d2a9d80928 Fixed macro expansions and removed unused macro expansions. 2014-06-04 13:20:15 -07:00
Jared Hance
e49d222ae3 Add function for @u -> @rd 2014-06-04 15:16:15 -04:00
C. Guy Yarvin
8b67582649 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach
Conflicts:
	urb/urbit.pill
2014-06-04 03:44:33 -07:00
~hatteb-mitlyd
e3a32b69db carriers get files from U2_LIB, new pill 2014-06-03 18:33:35 -07:00
~hatteb-mitlyd
d45a407c1d fix braino in fake-make 2014-06-03 16:45:00 -07:00
~hatteb-mitlyd
232c80ada5 beginning stages of fake-net hackery 2014-06-03 16:39:28 -07:00
C. Guy Yarvin
b45e72a750 IPv4 lanes now have a timestamp. 2014-06-03 14:01:40 -07:00
C. Guy Yarvin
f4acd72d90 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-06-03 11:25:12 -07:00
Jared Hance
66be7673f9 Add comparison gates for floating points. 2014-06-03 14:15:22 -04:00
~hatteb-mitlyd
4c51fa75ee crash when crude fails 2014-06-03 11:10:24 -07:00
C. Guy Yarvin
3def0bca05 Merge branch 'master' of github.com:urbit/urbit 2014-06-03 10:46:02 -07:00
Jared Hance
1585ca9581 Merge branch 'newbreach'
Conflicts:
	urb/urbit.pill
2014-06-03 13:38:33 -04:00
James Torre
5b650b7ad0 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-03 15:55:59 +00:00
Jared Hance
7cc45edad5 Add div:rd, div:fl, and jet.
Also fix rnd:fl (by fixing rne:fl).
2014-06-03 11:41:25 -04:00
C. Guy Yarvin
d57b87d94a Some vane cleanups, etc. 2014-06-02 22:07:32 -07:00
Jared Hance
f50d3322b3 Jet sub:rd. 2014-06-02 15:13:58 -04:00
Gavin Whelan
4c8db08588 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 15:09:42 -04:00
Luke Patmore
57d45a25bd Actually added co.c 2014-06-02 12:09:19 -07:00
Gavin Whelan
6f59009632 Merge branch 'master' of https://github.com/urbit/urbit
This commit is broken, but I needed to merge before pulling in the fix

Conflicts:
	urb/urbit.pill
2014-06-02 14:56:27 -04:00
Luke Patmore
a97db340ce Added jet linkage for co_emco, co_oxco, and co_roco. Added templates for co jets. 2014-06-02 11:48:16 -07:00
Jared Hance
87427ef46f Jet add:rd.
Also fix some rounding in add:fl that was found through jet test mode.
2014-06-02 12:43:26 -04:00
Jared Hance
83127a0846 Merge branch 'newbreach' into ieee
Conflicts:
	urb/urbit.pill
2014-06-02 11:07:57 -04:00
Jared Hance
9d837c55fb Jet mul:rd.
Running in test mode for now.
2014-06-02 11:03:48 -04:00
Gavin Whelan
94c3eef12f Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 09:19:06 -04:00
~hatteb-mitlyd
b76b207bd2 fix booting without checkpoint 2014-06-01 22:24:50 -07:00
John Dulin
1d5ccdd5d2 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-01 18:31:41 -07:00
C. Guy Yarvin
006335cfb9 Merge branch 'master' of github.com:urbit/urbit 2014-06-01 14:07:38 -07:00
~hatteb-mitlyd
dd0104dbce Add basic synclog code to try and track sync issues 2014-05-31 20:26:18 -07:00
~hatteb-mitlyd
c819b4c034 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
Gavin Whelan
901c83799b Merge various changes 2014-05-30 16:13:44 -07:00
Gavin Whelan
9933bca9cf Merge and minor merge changes 2014-05-30 15:59:58 -07:00
~hatteb-mitlyd
b04775c002 remove old boot cruft 2014-05-30 15:05:47 -07:00
C. Guy Yarvin
8327419b78 Revert "Remove unused arms from arvo external core."
This reverts commit b754c2aeadbc8028a2e7989066dbbf08d2f293ef.
2014-05-30 14:51:28 -07:00
C. Guy Yarvin
4cbb1eeb18 Remove unused arms from arvo external core. 2014-05-30 14:45:41 -07:00
C. Guy Yarvin
c5513510f0 Slow things commented out. 2014-05-30 13:57:49 -07:00
Gavin Whelan
97637ebe78 Merging clay fixes 2014-05-30 13:36:51 -07:00
C. Guy Yarvin
534e1a9090 Perfect GHETTO. 2014-05-30 12:47:47 -07:00
C. Guy Yarvin
bb4696d9aa Only the GHETTO can save the GHETTO. 2014-05-30 12:05:03 -07:00
C. Guy Yarvin
93bd99a4d2 GHETTO. 2014-05-30 11:44:08 -07:00
C. Guy Yarvin
f4e45a67ab GHETTO. 2014-05-30 11:43:48 -07:00
~hatteb-mitlyd
f97058f0b8 more profiling detritus
Conflicts:
	v/raft.c
2014-05-30 11:42:49 -07:00
~hatteb-mitlyd
b23c701c2a more profiling detritus 2014-05-30 11:09:47 -07:00
Galen Wolfe-Pauly
695e7beee9 trivial merge 2014-05-29 18:59:08 -07:00
Gavin Whelan
eb4bd3c6cc Merge 2014-05-29 12:33:46 -07:00
Gavin Whelan
57cb5c1bb4 Merge 2014-05-29 12:29:55 -07:00