152 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	0ec7eae58c	fix shapes to property polymorph and persist	2016-05-27 16:59:42 -07:00
howard-stearns	a3f1ece978	Do button mapping in C++ and simplify vive.json accordingly. Vive and ... Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.	2016-05-24 16:10:12 -07:00
howard-stearns	6b606759aa	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes	2016-05-24 11:31:20 -07:00
Brad Hefta-Gaub	b8b39b962d	Merge pull request #7868 from jherico/entity_shape ... Add a generic shape primitive	2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub	49ded9c4df	Merge pull request #7873 from ctrlaltdavid/20917 ... restyle file browser	2016-05-24 08:40:38 -07:00
David Rowe	3391430f0a	Tidy zone flying and ghosting entities editor options ... Move options to top of section from under "skybox" subsection Fix capitalization of labels	2016-05-24 20:28:49 +12:00
howard-stearns	fdcd667d3c	Fix hand controller pointer after input changes.	2016-05-23 13:33:42 -07:00
David Rowe	504516b627	Merge branch 'master' into 20917	2016-05-24 08:03:54 +12:00
Brad Davis	2c703e963c	More shapes	2016-05-22 19:48:59 -07:00
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
Brad Hefta-Gaub	567f7f4b77	Merge pull request #7953 from ctrlaltdavid/20929 ... fix not being able to teleport to user when users window moved right	2016-05-21 09:25:07 -07:00
David Rowe	a294170c74	Fix not being able to teleport to user when users window moved right	2016-05-21 15:50:06 +12:00
Seth Alves	f91a2403be	merge from upstream	2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones ... No fly zones	2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub	5906f88226	Merge pull request #7952 from sethalves/fix-walking-far-grab ... fix distance-grabbing and walking at the same time	2016-05-20 16:54:52 -07:00
Seth Alves	a24d63a39c	make distance-grab work better when avatar is walking	2016-05-20 15:45:00 -07:00
Chris Collins	8dbc6af719	Merge pull request #7944 from Atlante45/fix/edit-js ... fix edit.js to handle userData that's not in JSON	2016-05-20 15:14:13 -07:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
howard-stearns	c299aef8f2	fix 588, 558	2016-05-20 12:15:30 -07:00
Atlante45	0353e562e4	entityProperties.html handles non object userData	2016-05-20 10:18:32 -07:00
David Rowe	17b3101ca5	Merge branch 'master' into 20917	2016-05-20 18:50:01 +12:00
Brad Hefta-Gaub	8ff7af28be	Merge pull request #7925 from sethalves/overlay-or-grab-not-both ... fix mouse-grab moving both an overlay and an entity at the same time	2016-05-19 17:38:32 -07:00
Seth Alves	74520f5c92	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-19 09:49:44 -07:00
Seth Alves	419c744bd4	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
Brad Hefta-Gaub	53956c8210	reduce log spam	2016-05-19 07:50:06 -07:00
Seth Alves	b4df7cada7	don't mouse-grab things through an overlay	2016-05-18 16:16:31 -07:00
Brad Davis	e431fd3d65	Merge pull request #7921 from howard-stearns/turn-off-hand-controller-pointer-when-no-focus ... turn off hand-controller pointer when Interface doesn't have focus	2016-05-18 14:45:35 -07:00
howard-stearns	fa90d823d5	Turn off hand-controller pointer when Interface doesn't have focus.	2016-05-18 11:49:12 -07:00
Brad Hefta-Gaub	52445115dd	Merge pull request #7906 from howard-stearns/improve-hand-controller-edit ... improve hand-controller edit	2016-05-18 11:35:00 -07:00
Brad Hefta-Gaub	9a3b6bf081	Merge pull request #7858 from Atlante45/remove-deprecated-entity-props ... removed dead code for overlays/entities glow level	2016-05-18 09:14:26 -07:00
Seth Alves	3380b2a668	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-17 19:10:33 -07:00
David Rowe	e1d885004f	Fix carat in drop-down boxes	2016-05-18 13:59:13 +12:00
David Rowe	17d41dd7b9	HiFi glyphs font file update with fixed up/down carats ... Update QML and HTML spinboxes accordingly.	2016-05-18 13:25:11 +12:00
Atlante45	4b1497fdf4	Remove dead code highlight entity in edit.js	2016-05-16 16:25:40 -07:00
howard-stearns	3f17852244	Merge branch 'master' of https://github.com/highfidelity/hifi into improve-hand-controller-edit	2016-05-16 12:35:48 -07:00
howard-stearns	acb56d0603	Larger edit handles, and more tolerance in click (vs drag).	2016-05-16 12:35:05 -07:00
Seth Alves	a0c3224705	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-16 10:56:09 -07:00
Brad Hefta-Gaub	cf59fa8a46	Merge pull request #7885 from ctrlaltdavid/20918 ... make users.js movable	2016-05-16 10:16:32 -07:00
Seth Alves	880b52aad2	update attachedEntitiesManager to work better with avatarEntities	2016-05-16 09:52:48 -07:00
Seth Alves	3876a8037c	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-16 09:51:20 -07:00
Atlante45	5acbed647c	Remove glowLevel references in scripts	2016-05-14 14:49:31 -07:00
Brad Hefta-Gaub	87aa90de08	Merge pull request #7878 from howard-stearns/vive-buttons-out-of-pause ... More buttons to get out of away/pause.	2016-05-14 09:12:16 -07:00
David Rowe	33e2cde266	Change default position to be bottom left of HMD recommended rectangle	2016-05-14 12:08:19 +12:00
David Rowe	ccd821118e	Merge branch 'master' into 20918	2016-05-14 11:21:04 +12:00
Brad Hefta-Gaub	987b3483a8	Merge pull request #7876 from sethalves/fix-grab-fixes ... fix grab-fixes	2016-05-13 15:26:31 -07:00
Seth Alves	efe02c0fa1	make lock/unlock button easier to see	2016-05-13 10:57:41 -07:00
Seth Alves	eb19c5be13	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-13 07:04:58 -07:00
David Rowe	1928f51b3e	Restore window position at script start	2016-05-13 13:56:31 +12:00
David Rowe	ec74cb4aec	Maintain offset of bottom with nearest display edge if Interface resized	2016-05-13 13:22:03 +12:00
David Rowe	8445c9fbc7	Update max window height before it scrolls, according to its position	2016-05-13 13:08:45 +12:00