4221 commits

Author	SHA1	Message	Date
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
David Rowe	455db1ac82	Tighten up handle scaling to keep handle 1-1 with hand/laser	2017-09-15 19:11:04 +12:00
Cain Kilgore	794f3ca69f	Indentation	2017-09-15 06:09:03 +01:00
Cain Kilgore	e86b37f949	Added script for testing	2017-09-15 06:07:50 +01:00
David Rowe	1f63425e9f	Don't kick particle effects when apply physics	2017-09-15 13:58:58 +12:00
David Rowe	4b63d8b7d9	Don't kick polylines when apply physics	2017-09-15 13:48:01 +12:00
David Rowe	f02d057a83	Fix not kicking off physics if hand is inside entity	2017-09-15 13:43:53 +12:00
Anthony J. Thibault	f534ee5ad9	laser offset fix	2017-09-14 16:37:45 -07:00
David Rowe	9da3ed0ceb	Emissive Create palette models	2017-09-15 11:24:33 +12:00
David Rowe	b0c951a2c4	Merge branch 'master' into vr-edit-a	2017-09-15 11:09:39 +12:00
David Rowe	c6af82dedc	Increase maximum number of undo levels to 1000	2017-09-15 09:55:14 +12:00
David Rowe	f1572a165a	Fix history crash	2017-09-15 09:54:55 +12:00
Thijs Wenker	af4bc59307	clone local avatar entities	2017-09-14 23:31:51 +02:00
David Rowe	378793d18e	Proper color circle	2017-09-15 08:48:47 +12:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Anthony J. Thibault	7959988622	Merge branch 'master' into feature/ant-man	2017-09-14 10:37:45 -07:00
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00
David Rowe	f22e2de525	Interim method for disabling controllerDispatcher lasers, grabbing, etc.	2017-09-14 17:21:45 +12:00
David Rowe	299a8078e3	Revert handControllerGrab.js related changes	2017-09-14 17:08:26 +12:00
Anthony J. Thibault	9a9f4a0d24	Fix controllerModules with appropriate IPD scale changes	2017-09-13 18:23:54 -07:00
Anthony J. Thibault	8fb69a9867	Merge branch 'master' into feature/ant-man	2017-09-13 18:23:11 -07:00
Anthony J. Thibault	745d2ff395	Remove handControllerGrab.js, see controllerDispatcher.js instead.	2017-09-13 17:36:56 -07:00
David Rowe	a4ecb69ea6	Merge branch 'master' into vr-edit-a	2017-09-14 12:26:20 +12:00
David Rowe	8e25ccac79	Tidying	2017-09-14 12:20:33 +12:00
David Rowe	6d42e82711	Condense create and clone to have one history entry	2017-09-14 11:52:36 +12:00
David Rowe	d501a8f7cc	Fix scaling and changing hands history	2017-09-14 11:32:58 +12:00
druiz17	1b288ef860	make garbbing radius the same as master	2017-09-13 16:15:36 -07:00
David Rowe	1e2a3a13da	Fix grip-delete entity history	2017-09-14 09:31:32 +12:00
Anthony J. Thibault	a505a16232	Don't rescale tablet, in desktop mode, when sensorToWorldScale changes.	2017-09-13 14:22:49 -07:00
Anthony J. Thibault	ae2d0e89b4	Fixes for desktop tablet	2017-09-13 14:18:00 -07:00
David Rowe	18ce5ba30f	Add undo/redo for physics	2017-09-14 08:53:20 +12:00
Anthony J. Thibault	de5f0ad987	WebTablet.js: calcSpawnInfo works more consistently.	2017-09-13 12:01:41 -07:00
Anthony J. Thibault	9a1fa9b2f2	Fix for stylus intersection with tablet and home button for scaled tablets	2017-09-13 09:52:20 -07:00
David Rowe	709e7e7d90	Add undo/redo for clone	2017-09-13 15:25:40 +12:00
David Rowe	003c1c7bc5	Add undo/redo for group/ungroup	2017-09-13 15:16:16 +12:00
David Rowe	8c9026c892	Add undo/redo for scaling	2017-09-13 14:13:48 +12:00
David Rowe	97b2988005	Miscellaneous fixes	2017-09-13 14:13:23 +12:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
David Rowe	d718ea6928	Add undo/redo for move	2017-09-13 09:17:28 +12:00
Dante Ruiz	d90f6320a9	Merge pull request #8 from sethalves/controller-dispatcher-1 ... Controller dispatcher 1	2017-09-12 10:54:10 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07:00
Seth Alves	e9918ca599	add profiling to controller-dispatcher	2017-09-12 10:52:52 -07:00
Seth Alves	a9aa6df93e	Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1	2017-09-12 10:44:29 -07:00
Seth Alves	315f874824	add profiling to controller-dispatcher	2017-09-12 10:44:09 -07:00
Seth Alves	2850029f26	add profiling to controller-dispatcher	2017-09-12 10:00:32 -07:00
David Rowe	922b712b35	Add undo/redo for coloring entities	2017-09-12 21:58:09 +12:00
David Rowe	93a5cae7d2	Add undo/redo for deleting entities	2017-09-12 21:39:30 +12:00
David Rowe	3bb3e57f71	Add undo/redo for creating entities	2017-09-12 20:59:03 +12:00
David Rowe	68c4a2f7f6	Add History object to handle history	2017-09-12 20:53:15 +12:00
David Rowe	afb47dcfb2	Add undo and redo buttons to Tools menu	2017-09-12 20:43:11 +12:00
Anthony J. Thibault	bb5e808051	Fix for some of tablet size issues, on switching domains.	2017-09-11 18:59:52 -07:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
druiz17	684aef23dc	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-11 15:08:37 -07:00
druiz17	a46e41607c	fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown	2017-09-11 15:07:14 -07:00
David Rowe	be049009c8	Improve sizing of scale handles	2017-09-11 17:51:58 +12:00
David Rowe	ec6cae4105	Fix physics "grabbable" setting being applied without gravity	2017-09-11 17:04:50 +12:00
David Rowe	acf6a433a9	Don't scale z-axis of text and Web entities	2017-09-11 16:38:06 +12:00
David Rowe	18f4a3bf35	Fix hiding UI when hand is inside entity that camera isn't	2017-09-11 15:43:19 +12:00
David Rowe	ce15d0ecd0	Fix color picker circle and slider images clipping at oblique angles	2017-09-11 15:18:42 +12:00
David Rowe	bd95274a72	Merge branch 'master' into vr-edit-a	2017-09-09 20:16:09 +12:00
David Rowe	6f4f8e583b	Don't kick off physics for Text and Web entities	2017-09-09 20:15:15 +12:00
David Rowe	a7e04fcba6	Don't color particle effects	2017-09-09 20:14:09 +12:00
David Rowe	561c3e4653	Make polylines and polyvoxes able to be colored	2017-09-09 17:24:07 +12:00
Seth Alves	9c098f1a0c	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-08 17:10:02 -07:00
druiz17	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -07:00
Seth Alves	a1ffc7abd0	distance from controller to object is sometimes decided by pickray	2017-09-08 17:04:09 -07:00
druiz17	42ef397b5e	fixed include path	2017-09-08 15:13:19 -07:00
Anthony J. Thibault	72e0c844e4	Merge branch 'master' into feature/ant-man	2017-09-08 14:08:26 -07:00
druiz17	5d1a5eea4c	added test file	2017-09-08 13:45:45 -07:00
druiz17	b3e2c7ac56	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-08 13:30:48 -07:00
druiz17	e33012e522	laser on tablet update	2017-09-08 13:30:30 -07:00
Sam Gateau	ed8aa8b74d	Merge pull request #11160 from Zvork/outline ... Outline effect	2017-09-08 12:32:01 -07:00
druiz17	dbb91e5953	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-08 11:50:43 -07:00
druiz17	f0c12e50dd	some small bug fixes	2017-09-08 11:50:19 -07:00
Daniela	e453bf8d55	Refactoring.	2017-09-08 17:58:16 +01:00
Daniela	08688dc9ed	Refactoring.	2017-09-08 17:56:11 +01:00
Daniela	758f049f30	Correct offset for teleport pad.	2017-09-08 14:02:26 +01:00
Daniela	10e29d1cf0	Decrease offset for teleport pad. Add Bubble orientation and scale correction.	2017-09-08 12:45:29 +01:00
David Rowe	03ddf04140	Merge branch 'master' into vr-edit-a	2017-09-08 16:51:12 +12:00
David Rowe	70581ebbc1	Fix handle scaling's scaling and positioning of entities	2017-09-08 10:43:43 +12:00
Anthony J. Thibault	d0f9a20a01	Fix for tablet grabbing at small scales	2017-09-07 15:10:15 -07:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub	b316f366fc	Merge pull request #11198 from druiz17/oculus-tablet-position ... fixed tablet spawn position for oculus menu button	2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00
Olivier Prat	796c59b9c2	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-09-07 10:13:53 +02:00
David Rowe	8fdc2313cc	Tidying	2017-09-07 18:36:01 +12:00
druiz17	636e906191	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 17:15:18 -07:00
druiz17	cc7a222374	fixing Hifi-Hand-Drop for equipEntity	2017-09-06 17:15:05 -07:00
David Rowe	83a8cb5fe0	Merge branch 'master' into vr-edit-a	2017-09-07 10:53:41 +12:00
David Rowe	e94d2034c7	Don't grab entity behind entity just created and grip-click-deleted	2017-09-07 10:44:03 +12:00
David Rowe	8ca97d91c5	Make able to pick color from locked entities	2017-09-07 10:26:12 +12:00
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
David Rowe	2661fb6647	Tidying	2017-09-07 08:48:03 +12:00
Daniela	0ac7e00612	Add Avatar resize compatible teleport.js pad scale	2017-09-06 19:45:03 +01:00
Olivier Prat	17e992bd14	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-09-06 19:08:37 +02:00
Olivier Prat	fe357671e1	Removed qmlc files	2017-09-06 19:06:40 +02:00
Olivier Prat	25ff132fc7	Debugging scripts working again with correct occlusion management	2017-09-06 19:05:15 +02:00
Dante Ruiz	a5553d5e1c	fixed text scale for notifications	2017-09-06 09:26:48 -07:00
Dante Ruiz	b4f7cb961a	Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man	2017-09-06 08:38:08 -07:00
Dante Ruiz	15c853567d	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 08:34:28 -07:00
David Rowe	3cc0db8b40	Fix app icon occasionally being disabled at Interface start	2017-09-06 23:38:38 +12:00
David Rowe	808f37a824	Prevent entities from jittering or drifting when grab a moving set	2017-09-06 22:54:51 +12:00
David Rowe	6c35a008f1	Fix scaling entities that have physics	2017-09-06 22:32:22 +12:00
David Rowe	7b19b39bce	Make physics work with multiple entities per HiFi's current capabilities	2017-09-06 18:36:06 +12:00
David Rowe	52bf8ac9a1	Merge branch 'master' into vr-edit-a	2017-09-06 13:33:33 +12:00
David Rowe	6838461b07	Display notification message when don't have rez permissions	2017-09-06 12:44:57 +12:00
Anthony J. Thibault	af8b147321	away.js - works better with sensor scale.	2017-09-05 17:34:35 -07:00
David Rowe	61fc32714a	Handle domain and permission changes; disable app icon appropriately	2017-09-06 12:23:36 +12:00
Dante Ruiz	a34dae4aad	adding scale to notifications	2017-09-05 17:12:40 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
Anthony J. Thibault	74f974c68f	Merge branch 'master' into feature/ant-man	2017-09-05 16:27:41 -07:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Anthony J. Thibault	3d3bb2853a	Updated naturalDimensiosn for touch controller config ... Totally untested! I don't have an oculus. I'm sure it will work tho. ;)	2017-09-05 15:39:35 -07:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display ... Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
David Kelly	4bdfe092cf	Regression in injection script	2017-09-05 12:28:31 -07:00
Dante Ruiz	cefa65de5e	some more small changes	2017-09-05 12:06:32 -07:00
Dante Ruiz	28694dcf8a	small change to contextOVerlays in farActionGrab	2017-09-05 11:46:06 -07:00
beholder	c0e7e5a8b2	7385 - Collect Stats on "Exit VR" button	2017-09-05 21:26:35 +03:00
Olivier Prat	b619b2311d	Merged with master	2017-09-05 10:27:53 +02:00
David Rowe	310750fc0f	Close the app when the user changes avatars	2017-09-04 13:30:51 +12:00
David Rowe	2cd6f7fd54	Fix cursor not working when change dominant hand	2017-09-04 12:59:05 +12:00
David Rowe	44b365df6d	Merge branch 'master' into vr-edit-a	2017-09-03 10:57:32 +12:00
David Rowe	1cbc807016	Further haptic and audio tweaks	2017-09-02 21:23:30 +12:00
David Rowe	c93acbecaa	Move hover haptic pulses to dominant hand	2017-09-02 21:23:13 +12:00
David Rowe	039ceed74c	Modify equip and create sounds	2017-09-02 21:01:37 +12:00
David Rowe	5408daea73	Increase drop tool haptic pulse and decress hover haptic pulses	2017-09-02 20:49:50 +12:00
David Rowe	c7461a9646	Fix hover colors of menu buttons and header "back" icon	2017-09-02 20:36:22 +12:00
David Rowe	939b2ef11a	Fix laser enabling / disabling while inside an entity	2017-09-02 19:39:37 +12:00
David Rowe	d3819cfee3	Better names for overlay methods	2017-09-02 19:24:37 +12:00
David Rowe	9f9a0b0c58	Hide UI if hand is inside entity that camera is outside of	2017-09-02 19:09:36 +12:00
David Rowe	296d270098	Enable entities inside an entity to be manipulated	2017-09-02 19:06:43 +12:00
David Kelly	8723ff2df2	Merge pull request #11294 from zfox23/commerce_walletPassphraseModal ... Commerce: Wallet Passphrase Input Modal	2017-09-01 17:46:09 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
Seth Alves	8ccacf34f4	Merge pull request #11290 from Menithal/21484 ... WL21484 - Add an additional parameter for entity animations to "allow translation"	2017-09-01 15:34:07 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Anthony J. Thibault	26e9e6e580	Fixes for stylus ranges and grab radii	2017-09-01 11:19:51 -07:00
Dante Ruiz	9bd368c0a9	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-01 08:27:09 -07:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
druiz17	2948061904	code cleanup	2017-08-31 22:30:30 -07:00
David Rowe	269f1769be	Merge branch 'master' into vr-edit-a	2017-09-01 14:45:59 +12:00
David Rowe	110413b025	Fix action after color picker failure	2017-09-01 14:36:44 +12:00
David Rowe	734ce66df3	Add audio and haptic feedback	2017-09-01 14:30:22 +12:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
Dante Ruiz	7cf27c18d3	code cleanup and fix broken features	2017-08-31 18:06:55 -07:00
Anthony J. Thibault	a1b94fd9d2	Bug fixes for laser offset and avatar hold action	2017-08-31 17:26:00 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Anthony J. Thibault	98c89cbe78	Fixes for stylus size and offset	2017-08-31 14:45:59 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Anthony J. Thibault	a0eb8152a6	fix for tablet spawn position	2017-08-31 13:15:46 -07:00
Anthony J. Thibault	1a01209020	Fixes for scaling tablet at high frame rates	2017-08-31 13:02:31 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
David Kelly	396f108182	forgot this the first time	2017-08-31 12:18:46 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
Anthony J. Thibault	9c6b8a6826	Fixes for scaling tablet	2017-08-31 11:28:05 -07:00
Zach Fox	164eeaae64	Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:41:44 -07:00
David Rowe	8205b0d9d2	Merge branch 'master' into vr-edit-a	2017-08-31 15:45:15 +12:00
David Rowe	652fbaa9b7	Refactoring	2017-08-31 15:30:04 +12:00
David Rowe	3dacd1fcda	Tidy options settings code	2017-08-31 13:55:00 +12:00
David Rowe	5299596254	Code tidying	2017-08-31 13:36:48 +12:00
Anthony J. Thibault	6e6687c3a6	Change tablet dimensions as sensorToWorldScale changes	2017-08-30 18:21:25 -07:00
David Rowe	3f0872465f	Rename new code items	2017-08-31 13:20:37 +12:00
David Rowe	c6f987c00c	Remove old code	2017-08-31 13:05:50 +12:00
Dante Ruiz	47699d4439	fixed edit.js	2017-08-30 16:52:59 -07:00
David Rowe	63074ad928	Fix button press distance	2017-08-31 11:44:52 +12:00
David Rowe	e8af4bdb2d	Fix up hover state of toggle button after pressing	2017-08-31 10:54:20 +12:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Dante Ruiz	3960ec7d5a	finish main handControllerGrab refactoring	2017-08-30 15:20:03 -07:00
David Rowe	59505b4334	Fix up colors and highlighting of group/ungroup and toggle buttons	2017-08-31 09:30:11 +12:00
David Rowe	db27b97ec7	Add zero indicators to Physics options' sliders	2017-08-31 08:24:38 +12:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Dante Ruiz	ff134b338b	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-30 08:25:53 -07:00
David Rowe	13ac963bcc	Default collisions to on	2017-08-30 20:51:25 +12:00
David Rowe	5cf40fd208	Style Physics options toggle buttons	2017-08-30 20:47:33 +12:00
David Rowe	42d2045bae	Style Physics options presets pick list	2017-08-30 17:20:32 +12:00
howard-stearns	5b264a867a	fix wallet login (and share code with snapshot login)	2017-08-29 16:05:01 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Dante Ruiz	49608f1253	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-29 15:19:16 -07:00
Dante Ruiz	ed52136fc5	finished equiping locked clone-able entities	2017-08-29 15:18:28 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
David Rowe	e18e11a07b	Style Physics options sliders	2017-08-30 09:01:46 +12:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
Zach Fox	91f4e59f61	Misc fixes. Get started.	2017-08-29 12:33:44 -07:00
David Rowe	33765e14fa	Update general layout of Physics options	2017-08-29 21:06:29 +12:00
David Rowe	666c163637	Fix Color tool's "Swatches" label	2017-08-29 20:30:04 +12:00
David Rowe	758442999d	When picking a color highlight only single entity in a group	2017-08-29 18:03:31 +12:00
David Rowe	78876d39b4	Make all buttons raise when hovered	2017-08-29 17:58:37 +12:00
David Rowe	04a545da37	Style color slider	2017-08-29 16:54:45 +12:00
David Rowe	62e3c211eb	Style color circle	2017-08-29 15:46:43 +12:00
Dante Ruiz	4b592687b7	finished webEntityLaserInput, now working on cloning	2017-08-28 17:35:34 -07:00
David Rowe	67eb92da8f	Style color swatches	2017-08-29 10:51:36 +12:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
Sam Gateau	a98d861600	Merge pull request #11242 from SamGondelman/tabletLayer2 ... Web overlays and entities are always non anti-aliased	2017-08-28 09:10:14 -07:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
David Rowe	9abcf9525c	Use Settings values to determine whether or not swatches are populated	2017-08-28 15:51:11 +12:00