32 commits

Author	SHA1	Message	Date
Anthony J. Thibault	80eb247b9c	WIP checkin ... * AnimManipulator: added absolute and relative position and translation support * Rig: added _overrideFlags and _overridePoses for script overrides.	2015-11-16 18:49:47 -08:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Zander Otavka	055133b82e	Refactor inheritance for billboard overlays. ... BillboardOverlays is now Image3DOverlay. Billboard3DOverlay is the base class for both Image3DOverlay and Text3DOverlay, and it is PanelAttachable.	2015-08-04 14:22:21 -07:00
Seth Alves	f9d46b0cb5	interface decides on entityIDs rather than bouncing a temporary id through the entity server	2015-05-19 14:25:23 -07:00
Chris Collins	9ca0df0796	Small fixes to scripts ... -merge duplicate gun scripts -fix url of sit	2015-01-08 16:05:32 -08:00
Chris Collins	816e369c08	More Script updates ... More Script updates	2015-01-06 22:32:45 -08:00
ZappoMan	2bcad6ab2b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-08-28 21:19:56 -07:00
Atlante45	1acce5c725	fix sitting points on domain switch	2014-08-25 18:02:30 -07:00
ZappoMan	314e299ba5	get sit points working	2014-08-25 13:03:38 -07:00
ZappoMan	027b1d58cc	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: interface/src/Application.h interface/src/entities/EntityTreeRenderer.h interface/src/models/ModelTreeRenderer.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.h	2014-08-08 14:26:56 -07:00
Atlante45	b360b6c55d	PR cleanup + JS API	2014-08-05 17:07:03 -07:00
ZappoMan	77e1867b11	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: assignment-client/src/Agent.cpp assignment-client/src/Agent.h examples/editModels.js interface/src/Application.h	2014-07-31 10:34:23 -07:00
Atlante45	0bad10b09c	Add isLoaded to Overlays	2014-07-29 13:25:42 -07:00
Atlante45	f2dbaaf65c	Clean sitting targets when changing domain	2014-07-29 13:13:16 -07:00
Atlante45	6c21c44beb	Bumped up the search radius to 50	2014-07-29 11:52:25 -07:00
Atlante45	56f335bb65	Make sure models are in range before adding them	2014-07-29 11:51:24 -07:00
ZappoMan	2baac96665	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp	2014-07-15 10:04:40 -07:00
Atlante45	e067a013a0	Made sitting point more consistant	2014-07-11 11:22:38 -07:00
Atlante45	a9ceec4627	Switched sit.js spheres to billboards	2014-07-11 10:50:46 -07:00
Atlante45	2347bd7eed	Sitting position persists between sessions	2014-07-11 10:47:48 -07:00
ZappoMan	2c5209d1e7	virtual entities checkpoint	2014-07-03 09:07:11 -07:00
Atlante45	5bea267cd2	make sitting points semi transparent	2014-06-27 10:54:57 -07:00
Atlante45	4281168fe9	Hide seat once you are seated	2014-06-27 10:03:50 -07:00
Atlante45	aad666be62	more sitting work	2014-06-27 09:48:27 -07:00
Philip Rosedale	c72e41dcd2	added Oculus angular velocity, moved sit icon up	2014-06-25 22:27:54 -07:00
Philip Rosedale	9af2b2b4dc	removed commented code	2014-06-25 15:24:21 -07:00
Philip Rosedale	556578b8dc	first pass - hair as vertlet strands	2014-06-24 09:30:11 -07:00
Mika Impola	da3a272475	Fixing the BUG #19748: Sit.js doesn't handle overlays correctly.	2014-06-02 21:47:31 +03:00
Philip Rosedale	9d59251d27	add keyboard shortcut (“.”) to toggle sitting, so that Oculus user can sit	2014-05-30 10:47:51 -07:00
Mika Impola	cc1bd5d63b	Fixed cropping of the image.	2014-05-17 21:24:29 +03:00
Mika Impola	fd3e871242	Updating button position when window is resized.	2014-05-17 21:04:27 +03:00
Mika Impola	aac73c3665	Script to make your avatar sit down.	2014-05-15 21:44:45 +03:00