urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
746 Commits 768 Branches 10 Tags 215 MiB
4ad26b7c7c
Commit Graph

746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
4ad26b7c7c Merge branch 'newnextbreach' of github.com:urbit/urbit into newnextbreach 
Conflicts:
	urb/urbit.pill
 2014-06-25 12:20:33 -07:00
Jared Hance
2fe28632ca Merge branch 'nextbreach' into newnextbreach 
Conflicts:
	urb/urbit.pill
 2014-06-25 11:23:49 -04:00
C. Guy Yarvin
c0692b7a5c Various fixes and improvements. 2014-06-24 10:32:59 -07:00
C. Guy Yarvin
816d9acb75 Various fixes and improvements. 2014-06-19 11:53:16 -07:00
Luke Patmore
d8fc596038 Moar ap.c macro expansions 2014-06-18 13:09:04 -07:00
~hatteb-mitlyd
98a44cde66 total hack to get effects processed sooner 2014-06-18 12:04:27 -07:00
Luke Patmore
16f01b11b0 more ap.c improvements 2014-06-18 10:38:34 -07:00
C. Guy Yarvin
4e70deef56 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 2014-06-17 17:34:54 -07:00
Luke Patmore
e162abc6db Added bunting macro expansions to ap.c 2014-06-17 11:04:27 -07:00
C. Guy Yarvin
4eff84e13c Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	urb/urbit.pill
 2014-06-17 01:01:26 -07:00
C. Guy Yarvin
864eacff62 App model 1.1 at least compiles. 2014-06-16 18:33:31 -07:00
Luke Patmore
246dbbd2c7 Fixed wthp ap.c macro expansion 2014-06-16 12:19:33 -07:00
C. Guy Yarvin
422f267cc8 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 2014-06-13 22:47:29 -07:00
Luke Patmore
11f161abb1 Merge branch 'nextbreach' of https://github.com/urbit/urbit into nextbreach 2014-06-13 15:32:05 -07:00
Luke Patmore
396c2d1c7f Moar ap.c fixes, added macro expansions 2014-06-13 15:30:36 -07:00
C. Guy Yarvin
055db40029 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 2014-06-13 14:47:38 -07:00
Luke Patmore
147a423a3f Improvements to ap.c 2014-06-13 13:52:13 -07:00
Luke Patmore
4cf4ca57d9 Added moar ap.c macro expansions. 2014-06-12 15:22:25 -07:00
C. Guy Yarvin
e7b1d8d798 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	urb/urbit.pill
 2014-06-12 10:24:56 -07:00
Anton Dyudin
ce4d22af0b Merge branch 'nextbreach' of https://github.com/urbit/urbit into nextbreach 2014-06-11 20:25:01 -07:00
pcmonk
c10abf3e25 Fix memory bug in map union. 2014-06-11 20:24:14 -07:00
Anton Dyudin
26e99cbb23 Merge branch 'nextbreach' of https://github.com/urbit/urbit into nextbreach 2014-06-11 20:16:45 -07:00
pcmonk
43fb7819d6 Added set and map union and intersection (uni,int) 2014-06-11 20:14:50 -07:00
Luke Patmore
f0f3c7bd57 Added moar macro expansions to ap.c 2014-06-11 15:29:17 -07:00
Luke Patmore
22313fbcf4 Added macro expansions for bczp, brls, cncb, cnzy, and cnzz to ap.c 2014-06-11 13:16:34 -07:00
pcmonk
88a8b9460d Added map merge (mer:by) 2014-06-11 11:18:43 -07:00
pcmonk
c898c9d9f4 Added set merge to nextbreach. 2014-06-11 10:12:10 -07:00
C. Guy Yarvin
572879423d Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 2014-06-11 07:06:56 -07:00
C. Guy Yarvin
eba681be49 Various fixes and improvements. 2014-06-11 07:06:36 -07:00
Luke Patmore
0cdcd64267 Fixed wtls macro expansion 2014-06-10 18:09:47 -07:00
Luke Patmore
810f83bc6f Added wtkt macro expansion 2014-06-10 17:51:43 -07:00
Luke Patmore
ce0ad53cc2 Improvements to ap.c 2014-06-10 14:31:16 -07:00
~hatteb-mitlyd
1f0423048a re2 palliatives 2014-06-10 11:26:35 -07:00
C. Guy Yarvin
6d5ddd5571 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	Makefile
	urb/urbit.pill
 2014-06-09 13:09:50 -07:00
C. Guy Yarvin
087a55aa33 More %eyre fixes. 2014-06-09 13:09:14 -07:00
~hatteb-mitlyd
c85c87f71a fix build on gcc 2014-06-09 10:00:17 -07:00
~hatteb-mitlyd
936eb61eb0 Merge remote-tracking branch 'urbit/nextbreach' into telnet 
Conflicts:
	Makefile
	urb/urbit.pill
	urb/zod/arvo/gall.hoon
Their gall, a new pill, and our makefile.
 2014-06-07 21:14:37 -07:00
C. Guy Yarvin
71caca2856 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2014-06-07 19:56:38 -07:00
C. Guy Yarvin
68ceab0c69 Applications properly self-reload. 2014-06-07 19:45:00 -07:00
~hatteb-mitlyd
29eb63517b reorder blew 2014-06-07 17:23:35 -07:00
~hatteb-mitlyd
cccf3e2d93 default telnet windows to 80x25 2014-06-07 17:07:28 -07:00
~hatteb-mitlyd
4195c71113 negotiate about window size properly 2014-06-07 16:55:15 -07:00
~hatteb-mitlyd
c35b08e16f partially negotiate char-at-a-time telnet mode 2014-06-07 16:05:53 -07:00
Anton Dyudin
e97663ce3c Fixed %rake-gene to %rake-twig. 2014-06-07 14:16:06 -07:00
~hatteb-mitlyd
d5767a4159 Merge commit '7536d1406f7a2d8919b0a04f1ff5edcbddc9019a' as 'outside/anachronism' 2014-06-07 13:59:16 -07:00
~hatteb-mitlyd
7536d1406f Squashed 'outside/anachronism/' content from commit 02fa3b0 
git-subtree-dir: outside/anachronism
git-subtree-split: 02fa3b064112fa1d75209f123c07b5c7d58329b7
 2014-06-07 13:59:16 -07:00
~hatteb-mitlyd
9000cabe48 minor cleanups 2014-06-07 13:58:29 -07:00
~hatteb-mitlyd
50efa32a2b remove wipe, change boil 2014-06-07 13:58:29 -07:00
~hatteb-mitlyd
4344e97cb8 crash less often with dead terminals 2014-06-07 13:20:51 -07:00
~hatteb-mitlyd
c3727ee120 Don't overload the hole card 2014-06-07 13:18:13 -07:00