31849 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	a71f1495e9	Lowered sound volume on doll, now choose between two screams	2015-09-21 11:15:40 -07:00
ericrius1	5cd69c4f03	Added dice to master reset script	2015-09-21 09:17:23 -07:00
ericrius1	fb98960194	Adding wand to master script	2015-09-18 17:45:28 -07:00
ericrius1	b62807011c	Doll screams and writhes when picked up, returns to default position when let go	2015-09-18 17:22:45 -07:00
ericrius1	de14fc64f6	screaming on grab. Need to get release working	2015-09-18 17:17:55 -07:00
ericrius1	dd3f1301e6	Blocks are now multi colored	2015-09-18 14:36:41 -07:00
ericrius1	86dfa6f590	2 sizes for blocks	2015-09-18 12:35:49 -07:00
ericrius1	8ada3dec6e	Adding doll in	2015-09-18 11:29:16 -07:00
ericrius1	65722dc870	Removed master spawner as its no longer needed	2015-09-18 11:01:33 -07:00
ericrius1	6e4b838bf9	added collision sound to bbal	2015-09-18 10:59:28 -07:00
ericrius1	d6377ee6bb	Added basketball to master reset script	2015-09-18 10:55:29 -07:00
ericrius1	ae795a5c4f	spray paint spawner working	2015-09-17 17:15:59 -07:00
ericrius1	78642e3c79	Getting rid of managers	2015-09-17 17:04:09 -07:00
ericrius1	5f12a5c85a	Merge branch 'master' into toybox	2015-09-17 16:13:10 -07:00
ericrius1	9614a69b19	adding spray can	2015-09-17 16:12:16 -07:00
ericrius1	109f2d8a1a	base positions	2015-09-17 15:39:31 -07:00
ericrius1	75c1e49567	more tweaks ... yeah	2015-09-17 15:32:40 -07:00
Ryan Huffman	d0acd74861	Merge pull request #5833 from birarda/master ... fix for some locking races in SendQueue/Connection cleanup	2015-09-17 15:04:52 -07:00
Stephen Birarda	285a6cc738	use erase directly for cleanupConnection	2015-09-17 14:51:48 -07:00
Howard Stearns	fb71a85bb8	Merge pull request #5831 from hyperlogic/tony/anim-qstring ... AnimGraph: prefer QString over std::string	2015-09-17 14:36:39 -07:00
ericrius1	cdae5452ce	going ac script route for entity reset	2015-09-17 14:21:11 -07:00
Stephen Birarda	a914ec82c3	more comment correctness for Socket	2015-09-17 14:17:43 -07:00
Stephen Birarda	1f9bb22b9e	fix some wording in Socket comment	2015-09-17 14:17:03 -07:00
Stephen Birarda	36e2d4fc76	add check for NotStarted state in PL queue	2015-09-17 14:16:03 -07:00
Stephen Birarda	320429fd1e	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-09-17 14:15:05 -07:00
Stephen Birarda	4758dd2a53	correct locking races in SendQueue/Connection cleanup	2015-09-17 14:13:24 -07:00
Brad Hefta-Gaub	58e0625192	Merge pull request #5824 from jherico/marge ... Debug Oculus plugin for performance testing	2015-09-17 11:46:26 -07:00
Brad Hefta-Gaub	5549f4ec40	Merge pull request #5821 from ericrius1/paintCan ... Paint can tweaks	2015-09-17 11:37:44 -07:00
Anthony J. Thibault	bef136d811	AnimGraph: prefer QString over std::string	2015-09-17 11:21:14 -07:00
ericrius1	c5b7de2156	added fire spawner	2015-09-17 10:00:01 -07:00
Ryan Huffman	f099e17f43	Merge pull request #5823 from birarda/master ... guard a perpetual AC domain connection if the NL thread is locked	2015-09-17 09:40:52 -07:00
Stephen Birarda	fb38fd05ed	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-09-17 09:37:29 -07:00
ericrius1	7ffcce589d	blocks spawning	2015-09-17 09:09:25 -07:00
ericrius1	b9985031da	adding blocks	2015-09-17 09:03:42 -07:00
Brad Davis	5ba6242bda	Support a debug oculus plugin for performance testing	2015-09-16 19:55:57 -07:00
Howard Stearns	5eef0e21ad	Merge pull request #5826 from AndrewMeadows/ik-repairs-000 ... prevent initial bad IK targets for hands	2015-09-16 18:49:46 -07:00
Seth Alves	da74d4b1e1	Merge pull request #5830 from ZappoMan/entityScriptsReload ... add reload all support for entity scripts	2015-09-16 17:09:07 -07:00
Brad Hefta-Gaub	b645d99412	CR feedback	2015-09-16 17:07:12 -07:00
Andrew Meadows	e1fc1900ab	remove IK 'flutter' bug	2015-09-16 17:02:12 -07:00
Andrew Meadows	d4ea661aca	cleanup whitespace	2015-09-16 17:02:12 -07:00
Andrew Meadows	9a86fc2e62	build local list of IK targets every frame	2015-09-16 17:02:12 -07:00
Andrew Meadows	089c719612	minor cleanup	2015-09-16 17:02:12 -07:00
Howard Stearns	e9265ebec2	Merge pull request #5828 from hyperlogic/tony/anim-bug-fixes ... AnimController bug fixes and rename to AnimManipulator	2015-09-16 16:59:41 -07:00
Brad Hefta-Gaub	2021a15527	fix white space	2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub	fa6396bbfa	fix white space	2015-09-16 16:53:20 -07:00
Brad Hefta-Gaub	7840f122dc	add reload all support for entity scripts	2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub	009633f281	Merge pull request #5829 from samcake/HMDLightingBug ... Fixing the disappearing local lights	2015-09-16 16:19:21 -07:00
Sam Gateau	882ca5d6c0	Fix the lights not rendering roperly	2015-09-16 15:57:35 -07:00
Anthony J. Thibault	5aeebba90e	Renamed AnimController to AnimManipulator, Removed offsets on IK targets	2015-09-16 15:49:47 -07:00
Brad Hefta-Gaub	0a41ab2f41	Merge pull request #5827 from jherico/homer ... fix ScriptEngine location property	2015-09-16 15:19:54 -07:00