3531 commits

Author	SHA1	Message	Date
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
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
Seth Alves	635c83dad1	reset gravity and ignore-for-collisions after grabs have released	2015-10-05 13:39:01 -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
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
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
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
James Pollack	55178cdc91	Merge remote-tracking branch 'upstream/master' into particle_explorer	2015-10-02 11:31:14 -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
James Pollack	c6fa132dc2	cleanup	2015-10-02 10:44:26 -07:00
James Pollack	82828fdd14	reduce gravity and gun force so ball goes through less objects	2015-10-02 10:41:49 -07:00
James Pollack	d1cbcf5554	roll back to full width window and set a min for emitRate so interface doesnt crash	2015-10-02 10:32:08 -07:00
ericrius1	f6c888599e	Fixed a bug where particles weren't moving with can.	2015-10-02 10:22:48 -07:00
James Pollack	ea20fc9786	hack for it to work as a tool window	2015-10-02 10:08:10 -07:00
ericrius1	9f5a3066b8	changed masterResetEntity back to masterReset	2015-10-02 10:07:43 -07:00
ericrius1	71fe9b216c	Removed extraneous masterReset script, and extra call to lightSwitches in correct script	2015-10-02 10:02:28 -07:00
ericrius1	a6df6c53f1	fixed more syntax errors	2015-10-02 09:55:41 -07:00
ericrius1	36f7bba87e	Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing	2015-10-02 09:53:30 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
James B. Pollack	7c9d7ffefd	single sysytem particle explorer with one way bindings is feature complete	2015-10-01 23:49:33 -07:00
James B. Pollack	d1432c51d5	Merge branch 'master' into particle_explorer	2015-10-01 21:21:52 -07:00
James Pollack	4b1b53e189	end of dat	2015-10-01 19:01:10 -07:00
James B. Pollack	a3c91b12b9	Update cat.js	2015-10-01 18:56:38 -07:00
James B. Pollack	0ce6a305bd	Update cat.js	2015-10-01 18:52:08 -07:00