Commit Graph

1851 Commits

Author SHA1 Message Date
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
Galen Wolfe-Pauly
b388b433a3 talk updates 2015-05-08 13:29:24 -07:00
Philip C Monk
b84aa72678 checkpoint 2015-05-07 19:16:54 -04:00
Henry Ault
e5a6e84012 merge test 2015-05-07 14:34:49 -07:00
Anton Dyudin
eab2b1884d Merge branch 'test' 2015-05-07 10:31:10 -07:00
Anton Dyudin
ece8ed37d7 Merge branch 'space-tools' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/time.hoon
2015-05-07 10:30:32 -07:00
Philip C Monk
0ca2fc94de added space profiling tools 2015-05-06 22:25:41 -04:00
C. Guy Yarvin
a8f321cc55 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2015-05-06 19:13:15 -07:00
C. Guy Yarvin
7fb84652e8 Run test in optimized. 2015-05-06 18:25:58 -07:00
Henry Ault
71240536df Merge branch 'test' into do 2015-05-06 14:05:58 -07:00
Henry Ault
7055674deb ignore swap files 2015-05-06 13:58:54 -07:00
Philip C Monk
036fd00b70 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-05 19:43:36 -04:00
Philip C Monk
0a483a1b63 fixed a slew of memory leaks 2015-05-05 19:42:00 -04:00
Anton Dyudin
e67f49cf4b HEAD requests 2015-05-05 14:24:48 -07:00
cgyarvin
080cd90913 Merge pull request #277 from urbit/revert-276-revert-275-master
Revert "Revert "Jetted scrypt""
2015-05-03 16:32:12 -07:00
cgyarvin
b812d16b0a Revert "Revert "Jetted scrypt"" 2015-05-03 16:31:45 -07:00
cgyarvin
31104b226c Merge pull request #276 from urbit/revert-275-master
Revert "Jetted scrypt"
2015-05-03 16:29:24 -07:00
cgyarvin
ca99ef63e7 Revert "Jetted scrypt" 2015-05-03 16:28:51 -07:00
C. Guy Yarvin
88ffabf951 Binary accidentally checked into GH. 2015-05-03 16:24:09 -07:00
cgyarvin
6d2a603571 Merge pull request #275 from Hmmm-Max/master
Jetted scrypt
2015-05-03 16:21:36 -07:00
Max G
7443c352e1 new bounds 2015-05-03 23:45:41 +03:00
Max G
97d679ee69 fixed jet discrepancy 2015-05-03 16:02:14 +03:00
Max G
0385e3a701 Jetted scrypt 2015-05-03 15:26:42 +03:00
Anton Dyudin
12ed8c11af Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-01 15:09:59 -07:00
Philip C Monk
089dd10519 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-01 16:41:34 -04:00
Henry Ault
f0d56210f6 small update 2015-05-01 12:05:16 -07:00
Anton Dyudin
8008e5fb90 improve init printf 2015-05-01 11:40:01 -07:00