Philip C Monk
f014ecdac0
Merge branch 'master' into time-tools
...
Conflicts:
urb/urbit.pill
2015-05-19 18:07:54 -04:00
C. Guy Yarvin
b41780b3c3
Merge remote-tracking branch 'urban/hugeicon' into demo
2015-05-19 14:14:51 -07:00
Galen Wolfe-Pauly
a21434974a
Merge branch 'master' of github.com:urbit/urbit
2015-05-19 13:26:18 -07:00
vere
af2d572171
Merge branch 'master' of https://github.com/urbit/urbit
2015-05-19 20:00:37 +00:00
Galen Wolfe-Pauly
d21f21fcfa
Merge branch 'master' of github.com:urbit/urbit
2015-05-19 12:07:43 -07:00
C. Guy Yarvin
225d211f01
You can now start with -v.
2015-05-19 11:56:44 -07:00
Galen Wolfe-Pauly
4144b7dea7
Merge branch 'master' of github.com:urbit/urbit
2015-05-19 11:55:01 -07:00
C. Guy Yarvin
5f6e3522ff
Merge branch 'master' of https://github.com/urbit/urbit
...
Conflicts:
urb/urbit.pill
2015-05-19 11:46:46 -07:00
C. Guy Yarvin
ad47ebec56
-T for autoboot.
2015-05-19 11:38:23 -07:00
vere
213e207e20
Merge branch 'master' of https://github.com/urbit/urbit
2015-05-19 17:49:18 +00:00
Galen Wolfe-Pauly
ed608b6d1b
Merge branch 'master' into test
...
Conflicts:
urb/urbit.pill
2015-05-19 10:17:37 -07:00
Galen Wolfe-Pauly
588d257778
solided
2015-05-19 10:12:36 -07:00
vere
5ca233a73c
Merge branch 'master' of https://github.com/urbit/urbit
2015-05-18 21:35:59 +00:00
Philip Monk
d3fd096231
Merge pull request #282 from othercriteria/chatless
...
Removing chat clutter
2015-05-18 13:49:04 -07:00
C. Guy Yarvin
d31186b021
Revert dual network.
2015-05-18 13:14:27 -07:00
C. Guy Yarvin
74ea159ccb
Merge branch 'livetest'
...
Conflicts:
urb/urbit.pill
2015-05-18 13:02:17 -07:00
C. Guy Yarvin
90dbe458f3
Merge branch 'master' into livetest
...
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/dill.hoon
urb/zod/base/arvo/gall.hoon
2015-05-18 12:43:11 -07:00
C. Guy Yarvin
7181d26ca8
Merge branch 'test' into livetest
...
Conflicts:
urb/urbit.pill
2015-05-18 12:24:58 -07:00
C. Guy Yarvin
8caac67e05
Eliminated last direct pointers from piers.
2015-05-18 10:07:42 -07:00
C. Guy Yarvin
2b861da97c
drum in hood works, modulo slow update bug.
2015-05-16 17:31:28 -07:00
C. Guy Yarvin
a7970bebee
Merge branch 'test' into livetest
...
Conflicts:
urb/urbit.pill
urb/zod/base/ape/hood/core.hook
urb/zod/base/arvo/dill.hoon
2015-05-15 13:34:41 -07:00
Philip C Monk
2fc873f37e
jetted ++scag
2015-05-14 20:39:27 -04:00
Henry Ault
3847c64f47
Merge branch 'master' of https://github.com/urbit/urbit into do
2015-05-14 15:20:56 -04:00
Anton Dyudin
e9aa8aeb80
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-05-14 11:04:49 -07:00
Philip C Monk
c1261be063
temporarily changed ~zod's address
2015-05-14 13:49:22 -04:00
C. Guy Yarvin
d2633b152c
Merge branch 'test' of https://github.com/urbit/urbit into test
...
Conflicts:
urb/urbit.pill
2015-05-13 17:15:06 -07:00
Philip C Monk
7641dfad01
fix profiling on linux
2015-05-13 19:48:29 -04:00
Galen Wolfe-Pauly
ae6ef34d89
Merge branch 'test' of github.com:urbit/urbit into test
2015-05-13 16:22:03 -07:00
Anton Dyudin
1991ed6f07
Merge remote-tracking branch 'origin/test' into do
2015-05-13 16:12:58 -07:00
Philip C Monk
9b9fe1bfb4
plug memoization leak
2015-05-13 18:23:20 -04:00
Philip C Monk
ff4e20d63f
fixed merges
2015-05-13 17:18:43 -04:00
Anton Dyudin
9a625bdc5b
Merge branch 'test' into do
2015-05-13 12:46:39 -07:00
Anton Dyudin
580077e725
Merge branch 'test' into do
...
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/dill.hoon
urb/zod/base/arvo/gall.hoon
2015-05-13 12:21:53 -07:00
vere
18080ab9bd
Merge branch 'master' of https://github.com/urbit/urbit
2015-05-13 00:12:18 +00:00
vere
816205e708
split out road memory data
2015-05-13 00:11:11 +00:00
Philip Monk
82ed68f2d1
Merge pull request #280 from chc4/master
...
Awesome, thanks so much!
2015-05-12 16:47:38 -07:00
Henry Ault
f7f081dbed
Merge remote-tracking branch 'origin/master' into do
2015-05-12 15:59:28 -07:00
Philip C Monk
55c3827fb4
removed -g from c++ compiling
2015-05-12 17:39:45 -04:00
Philip C Monk
fe7948d4eb
Merge remote-tracking branch 'origin/master' into space-tools
...
Conflicts:
urb/urbit.pill
2015-05-12 17:24:24 -04:00
chc4
55a0bdf3e2
Small fix
...
Typo, and make it clearer that the updates happen automagically instead of only being downloaded, with you having to apply them.
2015-05-12 17:22:07 -04:00
Philip C Monk
5c8fec270a
reworked ++mass
2015-05-12 17:18:34 -04:00
chc4
85d9cc87fb
Readme cleanup
...
Finishing touches.
That travis-ci badge doesn't look like it was ever actually setup, and the build never really breaks anyways.
Notable issues:
- The +cat example doesn't work. At all. You can't even try to type the path without breaking :dojo.
- The "Control Characters" example for ^X is a lot more lack-luster now. Instead of being able to spawn arbitrarily many console apps that wait for input, being able to kill and swap between them at will, you can only have one console app running under a :dojo instance and arbitrary other ^V app. This is bad, since if a reader is going through the file sequentially they may not have a program other than :dojo running, making it looks broken. I moved the ^V section to the top so they can hopefully put the pieces together...
- Someone should really proofread this. Make sure I updated all the hostnames and shipnames, since I had to do that manually, and that everything read well. Dammit Jim I'm a programmer not a writer...
2015-05-12 17:12:53 -04:00
Philip C Monk
bcd3b98e1f
massing works without U3_MEMORY_DEBUG
2015-05-11 19:47:53 -04:00
chc4
a4559fc7bb
Semi-update readme
...
A bit more work. I'm pretty sure calling it `:dojo` is more appropriate than `+dojo` since it is neither a dog nor a cat, like how we call it `:talk` instead of `+talk`.
I also rewrote some old sections, but not very well. Grep for "XX" to see what needs improvements...
2015-05-10 21:12:51 -04:00
Henry Ault
3dc940e73a
Merge branch 'master' of https://github.com/urbit/urbit into do
2015-05-10 16:44:53 -07:00
C. Guy Yarvin
da941e3d1d
Merge branch 'master' into test
...
Conflicts:
urb/urbit.pill
2015-05-09 13:47:51 -07:00
chc4
deff75f7f8
half-update readme
...
Update a good portion of the readme, since the old one was horribly out of date and from 2013.
I manually changed the path and ship name to match the old one, which might not have been the correct thing to do.
It still needs a bit of work to make all the information correct.
2015-05-09 15:12:43 -04:00
Philip C Monk
1edf15843f
added U3_CELLOC_TOGGLE
2015-05-08 21:22:11 -04:00
Philip C Monk
3155535c80
space profiling works with U3_MEMORY_DEBUG
2015-05-08 20:42:09 -04:00
Galen Wolfe-Pauly
50a5989751
Merge branch 'test' of github.com:urbit/urbit into test
2015-05-08 15:00:45 -07:00
