26607 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam Gondelman	814e22364a	coding standard fixes	2015-06-16 11:30:28 -07:00
Sam Gondelman	1ecc954656	coding standard fixes	2015-06-16 10:25:30 -07:00
Sam Gondelman	68a08d969d	code review fixes	2015-06-16 10:19:40 -07:00
Sam Gondelman	4090fd6aa1	attempt to fix build errors	2015-06-15 12:53:14 -07:00
Sam Gondelman	40bd747080	added trigger buttons to hydra, removed hydraMove.js from default scripts	2015-06-15 11:13:07 -07:00
Sam Gondelman	fe576c6baf	hands reset when hydras disconnect	2015-06-15 10:23:24 -07:00
Sam Gondelman	1a8df6509f	userinputmapper supports hydra, but some hydra events still register as mouse events	2015-06-12 18:22:56 -07:00
Sam Gondelman	b4e108cd3b	added zooming to default joystick controls	2015-06-12 10:16:00 -07:00
Sam Gondelman	72cc070f0a	enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot	2015-06-11 18:24:32 -07:00
Sam Gondelman	2bdef6205e	added more available inputs to joystick and keyboardmousedevice	2015-06-11 16:20:46 -07:00
Sam Gondelman	b8b61e7c62	integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js	2015-06-11 15:51:21 -07:00
Brad Hefta-Gaub	24fda9a733	Merge pull request #5085 from SamGondelman/master ... Exposing Input Key Binding To JavaScript	2015-06-11 14:41:34 -07:00
Andrew Meadows	a9e3c5e477	Merge pull request #5095 from jherico/vs2015 ... Supporting building on Visual Studio 2015	2015-06-11 13:38:18 -07:00
Andrew Meadows	a3c5ea1b58	Merge pull request #5088 from sethalves/actions ... spring action with rotation and position target, rework grab script to use it	2015-06-11 13:23:57 -07:00
Seth Alves	8ed9a3ca02	add handedness setting to avatar-hold action. update stick.js to allow use of hydra	2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub	a1ee339765	Merge pull request #5103 from samcake/punk ... TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene	2015-06-11 10:17:38 -07:00
Brad Hefta-Gaub	684e93cf42	Merge pull request #5105 from Atlante45/debug ... Fix zones wireframe rendering	2015-06-11 10:17:28 -07:00
Clément Brisset	37cb757c5f	Merge pull request #5102 from ZappoMan/bugfix ... fix debug rendering transforms	2015-06-11 18:58:34 +02:00
Sam Gondelman	0e8ec81837	fixed lambda capture	2015-06-11 09:41:59 -07:00
ZappoMan	a878559e0c	fix transforms for items with non-default registration point	2015-06-11 09:38:45 -07:00
ZappoMan	47888b4671	fix transforms for items with non-default registration point	2015-06-11 09:34:56 -07:00
Atlante45	f4f5f16758	Fix zones wireframe rendering	2015-06-11 18:34:39 +02:00
ZappoMan	55ede2b398	Merge branch 'master' of https://github.com/highfidelity/hifi into bugfix	2015-06-11 09:10:05 -07:00
Brad Hefta-Gaub	2e746324d7	Merge pull request #5104 from AndrewMeadows/americium ... fix bug where grab.js moves mouse to upper left corner after pressing CTRL	2015-06-11 08:58:56 -07:00
Andrew Meadows	f77f3f1e1e	fix bug where grab.js moves mouse to screen corner ... when CTRL is pressed	2015-06-11 08:43:19 -07:00
Andrew Meadows	7d0000c537	fix warning about returning ref to temp variable	2015-06-11 08:38:03 -07:00
Sam Gateau	7685fe2229	Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool	2015-06-11 06:40:21 -07:00
Clément Brisset	d448a3be7f	Merge pull request #5101 from ZappoMan/fix-attachments ... Get avatar attachments rendering again	2015-06-11 10:35:49 +02:00
Philip Rosedale	b32994b359	Merge pull request #5083 from ctrlaltdavid/20551 ... CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace	2015-06-10 22:32:25 -07:00
Seth Alves	8bd80c511e	make stick follow mouse motion	2015-06-10 21:08:00 -07:00
Seth Alves	ba4fd7adf6	windows didn't like EntityActionFactoryInterface::factory not returning an error	2015-06-10 19:23:01 -07:00
Seth Alves	4216308b9b	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 19:05:25 -07:00
ZappoMan	93c0bd63e9	fix debug rendering transforms	2015-06-10 18:54:07 -07:00
Seth Alves	45c7cd4929	respond to code review, add a simple hold-a-stick script	2015-06-10 18:48:51 -07:00
Brad Hefta-Gaub	5ba9880602	Merge pull request #5100 from AndrewMeadows/inertia ... reset simulation bid counters whenever an object is activated	2015-06-10 17:27:46 -07:00
Brad Hefta-Gaub	c36912ae27	Merge pull request #5098 from jherico/mac_cursor_fix ... Fix doubled cursor on OSX	2015-06-10 17:24:40 -07:00
Seth Alves	eccf4eb8a8	hold action works	2015-06-10 17:05:49 -07:00
ZappoMan	139855f487	handle remove attachment case	2015-06-10 16:13:17 -07:00
Brad Hefta-Gaub	409e099638	Merge pull request #5099 from venkatn93/master ... Sanitizing entityProperties.html	2015-06-10 15:57:59 -07:00
ZappoMan	e06422825a	mostly getting attachments working again	2015-06-10 15:46:54 -07:00
Niraj Venkat	9ed8daa97c	Removing unnecessary functions	2015-06-10 15:33:07 -07:00
Seth Alves	1c0c7f0fe3	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 15:30:28 -07:00
Andrew Meadows	2f32d358c3	merge	2015-06-10 15:27:08 -07:00
Brad Davis	296d2511e4	Merge pull request #5094 from venkatn93/master ... Hyperlink property group and hyperlink UI added	2015-06-10 14:58:10 -07:00
Andrew Meadows	6497ac6c82	renderBoundingBox() for sim-ownership debug	2015-06-10 14:24:00 -07:00
Bradley Austin Davis	1dfc9c89eb	Fix doubled cursor on OSX	2015-06-10 13:57:48 -07:00
Niraj Venkat	182a3e918c	Hyperlink properties now propagate locally and over network	2015-06-10 13:12:18 -07:00
Andrew Meadows	0e12cdc39e	woops, forgot to include this in last commit	2015-06-10 12:41:15 -07:00
Andrew Meadows	8d41960cc3	reset simulation bid counters on object activation	2015-06-10 12:40:14 -07:00
Seth Alves	3dcc6c9b8c	make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.	2015-06-10 12:04:44 -07:00