41467 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	cb1f5e3e4f	dressing room and tilt maze thangs	2016-03-28 15:07:14 -07:00
James B. Pollack	3f6b7c2f1c	derp day	2016-03-28 14:32:30 -07:00
James B. Pollack	774cf8f42f	single spawner tank	2016-03-28 11:44:11 -07:00
James B. Pollack	19a8fa82e3	wrapper clean	2016-03-28 10:49:54 -07:00
James B. Pollack	50b27b1fe2	Merge branch 'homereset' of github.com:imgntn/hifi into homereset	2016-03-28 10:49:37 -07:00
James B. Pollack	054b910e20	try hard coding doll sizesw	2016-03-28 10:42:17 -07:00
James B. Pollack	cffe37b984	merge master into home content branch	2016-03-27 21:41:50 -07:00
James B. Pollack	ca4931e6ce	re enable things	2016-03-27 18:23:35 -07:00
James B. Pollack	d74114ff55	cleannnn	2016-03-27 18:22:50 -07:00
James B. Pollack	a57ba39fdd	return early for now	2016-03-27 16:44:53 -07:00
James B. Pollack	f099f927e1	doll rotation	2016-03-27 14:56:12 -07:00
James B. Pollack	5fef23ae34	userdata	2016-03-27 14:48:09 -07:00
James B. Pollack	fa0a740370	ud parse order	2016-03-27 14:41:56 -07:00
James B. Pollack	8898c5ba04	go little peeps	2016-03-27 14:40:06 -07:00
James B. Pollack	a8ec78ed2f	object typo	2016-03-27 14:32:08 -07:00
James B. Pollack	816873204a	log	2016-03-27 14:28:52 -07:00
James B. Pollack	271996d93d	test pathing	2016-03-27 14:26:44 -07:00
James B. Pollack	9d4ddc24d4	script scope	2016-03-27 13:42:29 -07:00
James B. Pollack	e40fe09364	dont check userdata if we dont need to	2016-03-27 13:34:07 -07:00
James B. Pollack	624cefa806	add shapetype to dolls	2016-03-27 13:32:05 -07:00
James B. Pollack	0dcb86db92	logging	2016-03-27 13:29:36 -07:00
James B. Pollack	d3980f18eb	transformer	2016-03-27 13:26:16 -07:00
James B. Pollack	ed2691eada	typo	2016-03-27 13:24:17 -07:00
James B. Pollack	81e14d1d1c	logging	2016-03-27 13:23:18 -07:00
James B. Pollack	b3b58b561b	remove drawers from reset script	2016-03-27 13:15:48 -07:00
James B. Pollack	39a3c9280a	try to cleanup tank	2016-03-27 13:13:15 -07:00
James B. Pollack	12c3792c06	init with userdata	2016-03-27 13:05:31 -07:00
James B. Pollack	19e7b19533	push	2016-03-27 12:59:57 -07:00
James B. Pollack	75016be64e	fix typo	2016-03-27 11:44:15 -07:00
James B. Pollack	50cc632b9c	Merge pull request #7424 from ericrius1/batonSoundEntityTest ... Add a test case for playing a short sound from an entity using virtual baton	2016-03-27 10:49:59 -07:00
James B. Pollack	cf66cd42ed	merge	2016-03-27 10:46:21 -07:00
James B. Pollack	c7a709414b	add urls	2016-03-27 09:51:13 -07:00
James B. Pollack	8083eedcb0	transformer	2016-03-26 19:24:15 -07:00
James B. Pollack	f34e17fdea	start transformer, remove doppelganger, various cleanup	2016-03-26 13:30:35 -07:00
Philip Rosedale	473b7ff6d7	Merge pull request #7486 from ZappoMan/reduceFalsePositiveDeadlocks ... one more crack at fixing false deadlock	2016-03-25 20:15:39 -07:00
James B. Pollack	e261519b11	Update utils.js ... remove extra letter that would be crashing things	2016-03-25 19:29:18 -07:00
James B. Pollack	fc0c24ab65	end of the road	2016-03-25 19:26:01 -07:00
Brad Hefta-Gaub	f7e6f60e87	one more crack at fixing false deadlock	2016-03-25 19:04:01 -07:00
Brad Hefta-Gaub	bb42d84bbd	Merge pull request #7479 from sethalves/fix-logging-crash ... fix locking in GenericQueueThread::process	2016-03-25 17:56:10 -07:00
Brad Hefta-Gaub	9a66d779ae	Merge pull request #7463 from zzmp/guard/bugsplat-2177 ... Guard against lack of GL support to avoid crash	2016-03-25 16:31:14 -07:00
Seth Alves	1532800a4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-logging-crash	2016-03-25 16:17:58 -07:00
James B. Pollack	5708d2e6f0	Merge pull request #14 from ericrius1/homereset ... Added posters and bulldog lamp and new watercan sounds to home	2016-03-25 16:13:11 -07:00
James B. Pollack	4613c10fe9	Merge branch 'homereset' of github.com:imgntn/hifi into homereset	2016-03-25 16:13:03 -07:00
Philip Rosedale	44c6f81c0f	Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks ... make the deadlock watchdog more generous	2016-03-25 16:10:37 -07:00
ericrius1	89cea2a5ca	chair is now atp	2016-03-25 16:08:49 -07:00
Philip Rosedale	dfb09f134a	Merge pull request #7476 from ZappoMan/bugFixes ... fix a couple of model bugs	2016-03-25 15:58:52 -07:00
Zach Pomerantz	9f8848e833	Log on first login	2016-03-25 15:07:14 -07:00
Brad Hefta-Gaub	fe31be71eb	protect against unexpected rollover	2016-03-25 14:59:43 -07:00
Zach Pomerantz	b252139704	LMK when running with old GL version	2016-03-25 14:42:58 -07:00
ericrius1	c60a3c1f00	scripts atp	2016-03-25 14:41:08 -07:00