Commit Graph

2409 Commits

Author SHA1 Message Date
Dan Haffey
26144fedde Shorter spinner delay after previous spinful event. 2016-02-20 14:35:06 -08:00
Raymond Pasco
eea4758290 Merge branch 'nounlock'
Fake fix for a fake bug, let the dead bury the dead
2016-02-19 14:03:49 -05:00
C. Guy Yarvin
6a72b535a9 Don't unlock mutex when exiting; it crashes for some reason. 2016-02-19 14:03:32 -05:00
Raymond Pasco
49ab9b7a9a Merge remote-tracking branch 'cgyarvin/unlost'
Stack traces for .^s
2016-02-18 17:11:01 -05:00
C. Guy Yarvin
ce4ef7aab0 Put [~ ~] 11 failures on the trace stack. 2016-02-18 13:39:45 -08:00
Raymond Pasco
95c85cbc81 Merge remote-tracking branch 'curtis/unfoul'
Compiler jet fixes
2016-02-17 14:53:33 -05:00
C. Guy Yarvin
d175c24a57 Fix a bug in deep axis handling. 2016-02-17 11:12:44 -08:00
Raymond Pasco
dca16bc7bb Merge remote-tracking branch 'ohaitch/fix-dtzy-n'
Change a compiler jet to match a bugfix
see arvo@84ae855ccecc492b20875fc030981e34ab722d2e
2016-02-16 15:50:45 -05:00
Raymond Pasco
81ba11cd7d Merge branch 'pills'
Work correctly in refactored repository
NB: partially unfinished
2016-02-15 06:10:43 -05:00
Raymond Pasco
eb350a7e17 Merge branch 'switch-on-crub'
Accept more characters for carrier generator, in preparation for crub
2016-02-15 06:08:19 -05:00
Raymond Pasco
e31723f077 Fix up README and CONTRIBUTING for new world order 2016-02-15 06:07:17 -05:00
Raymond Pasco
bb5e995202 Look for pill in build dir, arvo in arvo/
also .gitignore them
BUG: length of arvo sources directory is hardcoded!
2016-02-15 06:06:56 -05:00
Anton Dyudin
2bbefd1f58 handle ._~~__ many/~[`n/0] compilation properly
Type was atom/%n, whould be cube/[0 atom/%n]
Cherry-pick of 005903
2016-02-11 16:32:58 -08:00
Philip C Monk
27c10801c6 checkpoint 2016-02-11 14:44:28 -05:00
Anton Dyudin
ea01bfd471 Merge branch 'hoon-151' into tree-comments
Merge hoon 151
2016-02-10 19:43:53 -08:00
Raymond Pasco
1380547485 Merge remote-tracking branch 'ohaitch/ford-wipe'
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/gen/hood/overload.hoon
	urb/zod/lib/kiln.hoon

NB: Was briefly hotfixed to master, if you care about trivia
2016-02-10 18:12:24 -05:00
Raymond Pasco
101673f511 Merge tag 'hoon-151' into pills
Hoon 151 merge
2016-02-10 15:16:45 -05:00
Raymond Pasco
343bb338a3 Merge in Hoon 151
Complicated merge of Hoon 151. This commit is a major sequence point.
2016-02-10 14:03:28 -05:00
C. Guy Yarvin
fd001d55ef Keyword/stem changes, final draft. 2016-02-08 19:35:13 -08:00
C. Guy Yarvin
52004a4f97 Generating new stems, double solid. 2016-02-08 18:17:17 -08:00
Raymond Pasco
aa4eab1375 accept more characters in _sist_text() 2016-02-08 19:48:04 -05:00
Raymond Pasco
10ff0c8eaa Merge remote-tracking branch 'galenwp/factor'
Conflicts:
	urb/urbit.pill
	urb/zod/ape/bit.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/mar/hook.hoon
	urb/zod/pub/bit/fab/hymn.hook
	urb/zod/pub/docs/dev/hoon/principles/1-twigs.md
	urb/zod/pub/docs/dev/hoon/principles/2-syntax.md
	urb/zod/pub/docs/dev/hoon/reference/odors.md
	urb/zod/pub/docs/dev/hoon/reference/pronunciation.md
	urb/zod/pub/docs/dev/hoon/runes/sg/sgcn.md
	urb/zod/pub/docs/dev/hoon/runes/sm.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smsg.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smzz.md
	urb/zod/pub/docs/dev/hoon/runes/ts/tssg.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wthz.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wtls.md
	urb/zod/pub/docs/dev/hoon/runes/zp/zpzp.md
	urb/zod/pub/docs/theory/whitepaper.md
	urb/zod/pub/docs/user/appliance.md
	urb/zod/pub/docs/user/intro.md
	urb/zod/pub/docs/user/talk.md

Merged Galen and Anton's web refactoring work
2016-02-08 16:14:03 -08:00
C. Guy Yarvin
97a4d5abdb Some naming improvements. 2016-02-06 22:44:56 -08:00
Galen Wolfe-Pauly
953bce5d14 Merge branch 'factor' of https://github.com/ohaitch/urbit into factor 2016-02-05 10:54:25 -08:00
C. Guy Yarvin
016b5931e5 All stems changed over. 2016-02-05 03:27:26 -08:00
C. Guy Yarvin
9425766ec0 Modified all stems. About to remove old. 2016-02-05 03:10:07 -08:00
C. Guy Yarvin
180c350cdc Everything except %tsgl through %wtdt. 2016-02-05 02:32:37 -08:00
C. Guy Yarvin
c7e9b8676f Keyword stems, step 1. 2016-02-05 01:25:58 -08:00
Anton Dyudin
417bd8834d ape -> app 2016-02-04 16:38:18 -08:00
C. Guy Yarvin
35a385e81c Fully shifted over to modern typed namespace. 2016-02-03 20:51:01 -08:00
Raymond Pasco
d1bb7cbef2 Merge branch 'crub'
This merge only takes the completed cryptosuite B implementation.
Curve will be enabled later.
2016-02-03 17:53:50 -05:00
C. Guy Yarvin
b26fd40636 More typed .^. 2016-02-03 13:33:43 -08:00
Raymond Pasco
282b933882 support only U3_LIB, no hardcoded urb/ 2016-02-03 14:31:29 -05:00
C. Guy Yarvin
326fd27db8 Fully transitioned to correct %face. 2016-02-02 18:45:11 -08:00
C. Guy Yarvin
df6da0fbf7 Ready to remove temporary %fuss. 2016-02-02 18:26:22 -08:00
C. Guy Yarvin
0838818881 %face to %fuss. Next change back. 2016-02-02 17:50:34 -08:00
C. Guy Yarvin
27ff65f81f Merge remote-tracking branch 'cgyarvin/newdeal' into newdeal 2016-02-02 14:13:21 -08:00
C. Guy Yarvin
4b92cd2685 Making typed .^ a little less fake. 2016-02-02 11:52:10 -08:00
C. Guy Yarvin
4042253eeb Merge remote-tracking branch 'upstream/master' into newdeal 2016-01-31 20:37:49 -08:00
C. Guy Yarvin
55d1d29b56 Fix various marks, etc. 2016-01-30 19:37:03 -08:00
C. Guy Yarvin
cf813ad46d Fix oct*. Check in %work to delete it. 2016-01-30 15:44:22 -08:00
C. Guy Yarvin
cdf1f86e01 Fix some shit code in lib/tree.hoon. 2016-01-29 20:40:01 -08:00
Galen Wolfe-Pauly
dcedda2b01 everything ready to be cleaned. 2016-01-29 18:29:57 -08:00
C. Guy Yarvin
e3a0446634 In the middle of internal merge. 2016-01-29 18:25:52 -08:00
Anton Dyudin
3d4fe1d9e7 Merge branch 'factor' into ford-ren - XX unresolved js 2016-01-29 17:35:38 -08:00
Anton Dyudin
5e29c850d2 Merge branch 'eyre-root-beam' into ford-ren - requested for glen/factor merge 2016-01-29 14:41:19 -08:00
Raymond Pasco
fda8ff38a4 support U3_LIB define 2016-01-28 08:28:13 -05:00
Raymond Pasco
71d8f1228d Make sure specified pill exists 2016-01-26 16:36:22 -05:00
Raymond Pasco
02f656b233 sanity check -B option 2016-01-26 16:31:26 -05:00
C. Guy Yarvin
a4e950a3a2 Merge remote-tracking branch 'cgyarvin/newdeal' into newdeal 2016-01-26 11:06:13 -08:00