3547 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	34fa5b43fc	Merge pull request #5991 from imgntn/knockover_blocks ... [Scripts] Test Block Spawner for Blockers Game	2015-10-06 17:03:29 -07:00
Brad Hefta-Gaub	0e5f4bc4c9	Merge pull request #5983 from ericrius1/lightFixes ... Light fixes in toybox	2015-10-06 17:02:17 -07:00
Atlante45	76e0006732	Remove forgotten cursorVisible	2015-10-06 15:58:35 -07:00
Andrew Meadows	2c276bb13e	Merge pull request #5986 from sethalves/kinematic-grab ... Kinematic grab	2015-10-06 10:30:06 -07:00
Brad Davis	8090bc8e8d	Revert "Enabling programmatic access to the IPD scale"	2015-10-06 10:16:42 -07:00
Eric Levin	0afaf84e2a	Merge pull request #5979 from imgntn/ping_pong_gun ... [Script] Updates to Ping Pong Gun	2015-10-06 09:47:53 -07:00
Seth Alves	febdb52b26	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-06 09:20:13 -07:00
James B. Pollack	1b241ea05e	Update createTestBlocks.js	2015-10-05 18:13:51 -07:00
Brad Hefta-Gaub	a554f3afb7	Merge pull request #5996 from cozza13/20701 ... CR for Job #20701 - Create a menu for HMD stereo and mono eye switching/	2015-10-05 17:22:36 -07:00
Brad Hefta-Gaub	d95fe3ddb7	Merge pull request #5989 from jherico/homer ... Enabling programmatic access to the IPD scale	2015-10-05 17:22:19 -07:00
Chris Collins	c0a881ec52	added the correct call ... added the correct call	2015-10-05 15:37:04 -07:00
Chris Collins	1e01d6bd8f	Add the ability to switch between mono and stereo in HMD ... Add the ability to switch between mono and stereo in HMD	2015-10-05 15:30:53 -07:00
Seth Alves	7f8411d947	reference count grabs on an entity	2015-10-05 14:15:38 -07:00
James B. Pollack	daf97b0b9d	header fixes	2015-10-05 14:12:18 -07:00
James B. Pollack	839301bf05	remove cleanup to make blocks persistent	2015-10-05 13:41:20 -07:00
Seth Alves	635c83dad1	reset gravity and ignore-for-collisions after grabs have released	2015-10-05 13:39:01 -07:00
James B. Pollack	e528125af2	add test blocks for blockers game	2015-10-05 13:38:48 -07:00
James B. Pollack	43f69a0be9	initial knockover blocks	2015-10-05 13:23:19 -07:00
James B. Pollack	1ba31a840a	Merge branch 'master' into knockover_blocks	2015-10-05 13:09:15 -07:00
Seth Alves	7f84e882c5	attempt to keep ignoreForCollisions the same before and after grab	2015-10-05 13:06:39 -07:00
Seth Alves	8f924f0be4	merge from upstream	2015-10-05 13:05:37 -07:00
Andrew Meadows	1ead20683c	Merge pull request #5976 from sethalves/fix-action-deletes ... Fix action deletion/addition when more than one interface are involved	2015-10-05 12:31:01 -07:00
James B. Pollack	65ae811c9c	make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script	2015-10-05 11:16:55 -07:00
James B. Pollack	588a256304	Merge branch 'master' into ping_pong_gun	2015-10-05 10:54:21 -07:00
Seth Alves	8c25f2e16c	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-05 09:09:01 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
Seth Alves	a42bb5f533	Merge pull request #5981 from ericrius1/sprayCanFix ... No longer removing non-existent entities from spray paint can; color …	2015-10-02 17:56:51 -07:00
Seth Alves	26310d8ce4	kill gravity in near-held objects	2015-10-02 17:54:09 -07:00
Seth Alves	89c848d8c8	fix up kinematic hold	2015-10-02 17:14:53 -07:00
ericrius1	38a66bc915	syntax fixes	2015-10-02 16:53:13 -07:00
Howard Stearns	a5a7c16466	Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment ... edit.js adjustment	2015-10-02 16:28:54 -07:00
ericrius1	1ac1fcaf69	Light switches work properly now; no extra lights	2015-10-02 16:17:54 -07:00
ericrius1	e6e60e5e7a	Lights should now only be created once at start of running reset master script, no matter how many people there are in the room	2015-10-02 15:58:32 -07:00
James Pollack	1ff5f11e29	merge	2015-10-02 15:56:39 -07:00
James Pollack	9427ba1a5a	ping pong gun	2015-10-02 15:56:26 -07:00
Seth Alves	a737b4024d	Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes	2015-10-02 13:57:24 -07:00
Brad Hefta-Gaub	328467e019	Merge pull request #5909 from imgntn/particle_explorer ... [Scripts] Particle Explorer	2015-10-02 12:40:36 -07:00
ericrius1	0497de47ea	No longer removing non-existent entities from spray paint can; color tweaks to paint stream	2015-10-02 12:40:14 -07:00
James Pollack	1c6e833028	cleanup weird function formatting, remove unused code, improve spacing for logical units	2015-10-02 12:31:55 -07:00
Seth Alves	c0e8b02a2f	fix what happens when a distance grab is blocked because someone else already has it	2015-10-02 12:25:34 -07:00
Brad Hefta-Gaub	9bb2ada0a7	Merge pull request #5964 from ericrius1/sprayPaint ... Added closePaint script and removed no longer used spray paint scripts	2015-10-02 12:21:00 -07:00
ericrius1	4b62048fb1	more light changes	2015-10-02 12:12:36 -07:00
Seth Alves	880d92ee64	try to fix double-distance-grabbing lockout	2015-10-02 11:46:48 -07:00
Seth Alves	5b970e6b1a	try to fix double-distance-grabbing lockout	2015-10-02 11:43:19 -07:00
ericrius1	0d599458e6	Merged from toybox	2015-10-02 11:34:07 -07:00
James Pollack	55178cdc91	Merge remote-tracking branch 'upstream/master' into particle_explorer	2015-10-02 11:31:14 -07:00
James Pollack	2533bfd2ad	initial	2015-10-02 11:30:56 -07:00
Brad Hefta-Gaub	5a0ff4b1a2	Merge pull request #5841 from ericrius1/toybox ... Toybox master reset script	2015-10-02 11:27:43 -07:00
Brad Hefta-Gaub	c6c430ca76	Merge pull request #5977 from jherico/marge ... Fixing 2D overlay mouse interaction	2015-10-02 11:11:04 -07:00
ericrius1	4dd2cf9cf5	Moved master reset script into new directory called unpublished scripts and changed relative pathing	2015-10-02 11:09:43 -07:00