1003 commits

Author	SHA1	Message	Date
beholder	24a12a2f8f	7722 Add onHover Outline to Tablet "X" Button	2017-09-26 22:31:56 +03:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
Atlante45	8583be41ce	Don't refresh if not connected to the Asset Server	2017-09-21 18:57:09 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00
vladest	6297448e90	Build fix	2017-09-19 19:49:19 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00
vladest	1cde504c74	Memleak fix. Cleanup	2017-09-16 22:57:26 +02:00
vladest	a8d24d9161	Cleanup	2017-09-16 22:41:18 +02:00
vladest	3ceeb0d83e	Rework all c++ calls	2017-09-16 22:04:53 +02:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Atlante45	7d9daea0f6	Transmit baking errors to interface for display.	2017-09-13 09:54:54 -07:00
Anthony J. Thibault	72e0c844e4	Merge branch 'master' into feature/ant-man	2017-09-08 14:08:26 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
Stephen Birarda	55d44a8c8f	Merge pull request #11285 from Atlante45/feat/baking-enabled ... Wire "Use baked" checkbox	2017-09-01 16:25:49 -07:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
Atlante45	764e5d2e4c	Move constant to central location	2017-08-31 13:08:18 -07:00
Atlante45	da2bede6fe	Hide .baked items from the Asset Browser	2017-08-31 13:08:18 -07:00
Zach Fox	dbb7023fc1	Fix warnings	2017-08-30 15:26:25 -07:00
vladest	b547b2573e	Added logged in property	2017-08-30 23:15:39 +02:00
Zach Fox	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
vladest	78aa5820d0	Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings	2017-08-27 11:56:28 +02:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
Atlante45	28c9aa031c	Setup script model status	2017-08-25 10:54:34 -07:00
vladest	26026cb2b5	Added logout. Truncate username to 8 characters	2017-08-25 17:37:10 +02:00
Zach Fox	3c7fadb1ce	Final touch	2017-08-24 14:30:42 -07:00
Zach Fox	56950e4614	It's working!	2017-08-24 14:17:39 -07:00
Zach Fox	baad5f195e	I'm locking something wrong	2017-08-24 12:53:48 -07:00
Zach Fox	d370eeea2f	Just gotta test	2017-08-24 11:07:58 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
Zach Fox	92e8f84dc5	I understood last night at midnight	2017-08-24 09:43:35 -07:00
Zach Fox	657beef70f	I understand again...getting started again	2017-08-23 17:42:02 -07:00
Zach Fox	52ef0f2037	More progress	2017-08-23 16:37:13 -07:00
Zach Fox	88c24c16d7	I finally understand - initial progress	2017-08-23 15:02:07 -07:00
Zach Fox	69364f2ecd	Initial progress	2017-08-22 17:10:57 -07:00
Zach Fox	edb64b047f	It compiles!	2017-08-22 16:00:44 -07:00
Zach Fox	ec2a27e68c	Progress	2017-08-22 15:02:06 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00
Anthony J. Thibault	963ddce7bc	Use eye-height to match user and avatar scales, follow fixes ... Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.	2017-08-21 17:42:24 -07:00
vladest	3783b8a57c	Merge branch 'master' into tablet_login_button	2017-08-19 17:27:46 +02:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez	65f876acf3	enabled version check	2017-08-18 10:49:40 -07:00
vladest	2e5e0c94f1	Added login button to Tablet	2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez	4c28b9f09a	attempt to check version of interface	2017-08-17 18:16:41 -07:00
vladest	1a32a6fac3	Merge branch 'master' into audio_devices_split	2017-08-17 17:20:11 +02:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
vladest	15f8bc0141	Keep old function names for compatibility	2017-08-16 22:17:34 +02:00
vladest	4e5c650621	Modified some usecases for async dialogs	2017-08-16 21:41:18 +02:00
vladest	273261ee57	Reworked WindowScriptingInterface browse method for async methods	2017-08-15 23:12:35 +02:00
vladest	8afdb27c1b	Reworked WindowScriptingInterface save method for async methods	2017-08-15 22:55:44 +02:00
vladest	51a5c30353	Reimplement asset browsing for async	2017-08-15 17:05:55 +02:00
vladest	e9ed05c3ba	Reimplement snapshot dir browser for async	2017-08-15 15:55:36 +02:00
vladest	560696e41c	Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2	2017-08-11 20:39:17 +02:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Ken Cooke	1fc050fdef	Fix _devices access via shared_ptr	2017-08-07 08:11:43 -07:00
Brad Davis	1ecca9fd29	Merge branch 'master' into zzmp-audio/peak-values	2017-08-06 17:21:00 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	3149c3e16c	warnings	2017-07-25 10:16:50 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Brad Davis	5b5e94700e	Additional audio fixes	2017-07-21 09:52:44 -07:00
Brad Davis	d1c2218a31	Temporary patch for deadlock	2017-07-21 09:52:36 -07:00
David Rowe	091b666d7e	Fix noise reduction checkbox not always working	2017-07-20 12:06:19 +12:00
Brad Davis	d43432bd71	Cleanup dead code, fix startup behavior	2017-07-17 18:54:52 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
Ken Cooke	50deee1d38	Replace tabs with spaces	2017-07-12 12:29:25 -07:00
Tingjin	80916b62bb	Remove unnecessary code ... Remove two lines of unnecessary code.	2017-07-11 20:52:28 -07:00
Ken Cooke	d6eb731f3a	Merge branch 'master' into audio/peak-values	2017-07-10 21:55:11 -07:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Zach Pomerantz	631e5a7b04	add override to AudioInputDeviceList::newDevice	2017-06-29 17:34:01 -04:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Zach Pomerantz	5353437f59	add peakValues to scripting API	2017-06-27 17:51:45 -04:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
druiz17	91ce9235ea	Merge pull request #10747 from zzmp/audio/select-log ... Log audio selections	2017-06-23 07:54:03 -07:00
Zach Pomerantz	a82cc0ec09	retab	2017-06-23 09:35:48 -04:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub	f7d42c782d	Merge pull request #10764 from thoys/feat/ac-location-jsapi ... Expose location scripting interface to Agent (AC script)	2017-06-21 10:22:48 -07:00
Thijs Wenker	47643e1efe	Expose location API to Agent scripts (side-effect, agents now can teleport)	2017-06-21 06:31:36 +02:00
Zach Pomerantz	497ee3a522	add Audio.inputLevel	2017-06-19 17:07:43 -07:00
Zach Pomerantz	4bff925506	rm unused bools	2017-06-19 17:01:39 -07:00
Zach Pomerantz	3d80774317	clean up select_audio_device	2017-06-19 15:57:24 -07:00
Zach Pomerantz	837f37220a	log selected_audio_device	2017-06-19 15:11:02 -07:00
Zach Pomerantz	5f236bd025	simplify device settings	2017-06-19 15:11:02 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Zach Fox	416ebaa2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 10:08:10 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Zach Pomerantz	969582c23d	clean audio device names	2017-06-14 09:04:22 -04:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	79563b7d83	fix header on AudioDevices.h	2017-06-13 14:55:20 -04:00
Zach Pomerantz	9b131ee4af	rm old AudioDevice interface	2017-06-13 14:55:10 -04:00
Zach Pomerantz	4a39798a97	sticky audio selection	2017-06-13 14:38:52 -04:00
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
Zach Pomerantz	7d3bf75f0b	wip: sticky devices	2017-06-12 18:48:26 -04:00
Zach Pomerantz	b5dab39f83	sticky mic meter / noise reduction	2017-06-12 18:41:32 -04:00
Zach Pomerantz	8dac83d3fe	add reverb to qml Audio	2017-06-12 18:11:08 -04:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Chris Collins	4b6c13bc1f	Merge pull request #10646 from ZappoMan/debugAudioProblems ... Fix for no-audio on clean install	2017-06-10 11:32:42 -10:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00
howard-stearns	51982b1294	display textures in plugins	2017-06-07 14:39:18 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Zach Pomerantz	67288528da	add Audio.context	2017-06-06 17:55:06 -04:00
Zach Pomerantz	9395de1873	add nop notify signals to Audio(Devices)	2017-06-05 14:57:44 -04:00
Seth Alves	552b69bb1c	cleanups	2017-06-01 13:47:19 -07:00
Seth Alves	eca05d9c42	more use of head input	2017-06-01 10:57:53 -07:00
Zach Pomerantz	954e4979f8	expose Audio.devices.input/output	2017-05-31 20:14:58 -04:00
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -07:00
Zach Pomerantz	4a3f2e1d09	use subclass for interface's Audio interface	2017-05-28 19:25:37 -04:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
Seth Alves	3823ece153	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-25 10:57:46 -07:00
Seth Alves	bdbc6ddcc1	change some code to look at head-controller position rather than hmd position	2017-05-25 10:50:41 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Vladyslav Stelmakhovskyi	d522864141	Remove debug prints	2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Vladyslav Stelmakhovskyi	368334e07e	Merge branch 'master' into audio-source-sync	2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi	d18ac6dd49	Reimplemented Tablet Audio screen using C++ model	2017-04-28 23:02:28 +02:00
Zach Fox	3221214283	New Snap FTUE flow	2017-04-27 14:01:07 -07:00
Zach Fox	880bcf3b1e	Checkpoint	2017-04-27 14:01:06 -07:00
Howard Stearns	88c3b4d9d3	Merge pull request #10258 from howard-stearns/watch-for-announcements ... watch for announcements	2017-04-27 14:00:39 -07:00
howard-stearns	ce7f3197f6	watch for announcements	2017-04-21 14:27:38 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
Andrew Meadows	1137bd1436	pull qApp spaghetti out of Avatar class ... some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer	2017-04-18 11:52:21 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Zach Fox	e6edce5352	Entirely remove addressBarToggle()	2017-04-17 12:13:01 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Ryan Huffman	150dcd7dec	Merge remote-tracking branch 'upstream/master' into stable-merge	2017-03-30 14:22:27 -07:00
Howard Stearns	3a7edebb94	Adjust reporting of availability to metaverse.	2017-03-29 16:12:50 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Delamare2112	4f7cbd5b7c	Add limitless connection and scripting interface	2017-03-29 12:47:58 -07:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
Zach Fox	6c4b23195b	One-line warning fix...I swear I've done this before	2017-03-20 13:26:50 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
Zach Fox	beb848373b	Update from zfox23/PALv2 branch	2017-03-13 10:15:06 -07:00
Seth Alves	fffff817a3	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 10:20:40 -08:00
Dante Ruiz	c6c0c6d382	toolbar becomes visible after taking a snapshot	2017-03-09 22:54:22 +00:00
Vladyslav Stelmakhovskyi	6d9e7de6dc	Implemented AssetBrowser in Tablet view	2017-03-06 21:45:55 +01:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Seth Alves	d7bb6f105b	make tablet part IDs available through qApp	2017-02-17 15:43:20 -08:00
Seth Alves	39e1edafd2	merge from upstream	2017-02-17 13:16:12 -08:00
Seth Alves	5ddcbae934	save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet	2017-02-17 11:51:23 -08:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
Brad Hefta-Gaub	74f10a1e7f	Merge pull request #9603 from huffman/feat/trace-thread-script ... Add thread names and scripts to chrome traces	2017-02-09 13:00:05 -08:00
Thijs Wenker	6957ac5f8b	Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread	2017-02-09 01:31:07 +01:00
Ryan Huffman	9d4fdfa38a	Add Test.profileRange	2017-02-03 09:19:10 -08:00
Seth Alves	0b51b1d566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 11:00:02 -08:00
Anthony J. Thibault	5eb7849a80	Support for Window.geometryChanged signal.	2017-01-25 16:43:35 -08:00
Seth Alves	ff8d13ecc7	get button-states for toolbar buttons working again	2017-01-25 15:38:54 -08:00
Seth Alves	98f1664a46	use a setting to decide which UI is enabled	2017-01-25 14:17:45 -08:00
Seth Alves	f18094f565	make use of tablet or HUD depend on a single variable. avoid some duplicated code	2017-01-25 12:00:34 -08:00
David Rowe	74b878a276	Fix threading of message box updates	2017-01-25 17:48:58 +13:00
Anthony J. Thibault	432bb27119	The tablet Help button should be active if window is visible	2017-01-23 18:37:08 -08:00
Seth Alves	69252deb2e	close the tablet when going to a new domain	2017-01-23 16:28:56 -08:00
Dante Ruiz	a319db3cb4	removed duplicate code	2017-01-20 00:57:48 +00:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
Seth Alves	9de8144f0d	merge from upstream	2017-01-13 10:17:03 -08:00
Seth Alves	f9a36d68ad	Merge pull request #9363 from ctrlaltdavid/21127 ... Make Clara.io downloads convert textures to PNG	2017-01-13 10:14:43 -08:00
Dante Ruiz	7d84aae670	closing tablet when taking snapshot	2017-01-12 17:29:38 +00:00
David Rowe	b41f8c754d	Add updateable message box to JavaScript API	2017-01-12 15:46:53 +13:00
Seth Alves	bacc796730	Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again	2017-01-11 09:54:26 -08:00
Brad Davis	31f39d7eef	Allow scripts to inject tracing events	2017-01-10 14:06:39 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Brad Davis	be6b098e1b	Implement test scene loading	2016-12-22 13:12:59 -08:00
Brad Davis	e58623bcc0	Working on test/trace script interface	2016-12-22 11:46:40 -08:00
Seth Alves	dc996bee95	merge from upstream	2016-12-20 08:06:01 -08:00
Ryan Huffman	90e121ba47	Extend HMD scripting interface to check subdevices	2016-12-16 15:05:17 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Anthony J. Thibault	d4f9d21ce8	Pass tablet QQuickItem to TabletScriptingInterface ... Also, moved TabletScriptingInterface to script-engine library for easy access, baby.	2016-12-14 14:04:48 -08:00
Anthony J. Thibault	db0b2ba7d3	Fleshing out TabletScriptingInterface. ... Added TabletProxy and TabletButtonProxy	2016-12-14 12:08:41 -08:00
Anthony J. Thibault	d94da76b72	Added TabletScriptingInterface	2016-12-14 12:08:40 -08:00
Seth Alves	d97be52542	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2016-12-12 16:24:17 -08:00
Brad Davis	2a43f5fbef	Add test mode to interface	2016-12-12 14:51:11 -08:00
Seth Alves	369f61e172	bring over some previous tablet-ui work	2016-12-08 16:54:39 -08:00
Anthony J. Thibault	89ae3b3d6e	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" ... This reverts commit efe9571ab8, reversing changes made to 333e9ec7f4.	2016-12-05 15:18:03 -08:00
Zach Fox	30dade242c	GIFs: Quality improvements; duration tweaks; processing notif (#9139)	2016-12-01 14:53:18 -08:00
Seth Alves	efe9571ab8	Merge pull request #8691 from highfidelity/out-of-body-experience ... Room Scale HMD comfort features.	2016-12-01 11:09:39 -08:00
howard-stearns	5188de924f	allow for SnapshotReview dialog to be up during a change of href for all ... media capture	2016-11-22 11:09:43 -08:00
Zach Fox	a81289a0d7	Huge progress today. Buggy behavior with multiple snapshots remains	2016-11-18 14:39:29 -08:00
Zach Fox	f726ea546f	code cleanup; simultaneous gif and still capture	2016-11-18 14:39:29 -08:00
Zach Fox	704476c197	Initial progressgit add -A!	2016-11-18 14:39:28 -08:00
Ryan Huffman	7e9df928f4	Add jsdoc comments to Menu	2016-11-16 10:49:50 -08:00
Andrew Meadows	6bb3dd6830	Merge hifi/master into hifi/out-of-body-experience	2016-11-14 15:08:04 -08:00
Ryan Huffman	3fcc2d3fa5	Add jsdoc to Clipboard	2016-11-14 13:52:16 -08:00
howard-stearns	4d18a3cc3d	expose menu enablement to javascript	2016-11-10 15:01:06 -08:00
Anthony J. Thibault	839b1a3c5e	Added some jsdoc comments to the C++ source	2016-11-09 18:09:10 -08:00
Andrew Meadows	38e4ac0ae9	Merge master into out-of-body-experience	2016-10-26 16:59:31 -07:00
Brad Hefta-Gaub	a25d50387e	gak	2016-10-24 14:47:10 -07:00
Andrew Meadows	51a9a99381	Merge hifi/master into hifi/out-of-body-experience	2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub	0f8967970a	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub	a282d83546	more work on extra lasers	2016-10-24 07:46:04 -07:00
Anthony J. Thibault	60f728585a	away.js now shows hand controllers in away mode. ... * controllerDisplayManager is now part of default scripts. * Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers and sendLocalMessage. * removed previous version of controllerDisplayManger from tutorial.	2016-10-21 10:40:39 -07:00
Brad Hefta-Gaub	8a071f18b3	more work	2016-10-20 11:18:20 -07:00
Andrew Meadows	d54c07ed14	Merge 'master' into 'out-of-body-experience'	2016-10-12 13:35:27 -07:00
Ryan Huffman	216cf2b4bc	Update tutorial to work with HMD + Hand Controllers only	2016-10-07 10:30:18 -07:00
Anthony J. Thibault	2fdd5e4368	Build fixes for change in getMyAvatar() from DepenencyManager ... It now returns a smart_ptr, not a raw pointer.	2016-10-05 17:57:48 -07:00
Anthony J. Thibault	cc7a6ada38	Merge branch 'master' into out-of-body-experience	2016-10-05 17:16:39 -07:00
Clément Brisset	d18394f249	Merge pull request #8596 from huffman/feat/my-avatar-self-id ... Add ability to parent overlays to MyAvatar for use across servers	2016-10-05 12:03:01 -07:00
David Kelly	621e3fc000	Expose triggerOption to scripts, plus _physicsEnabled ... Now any menu item can be triggered. Plus you can do a Window.isPhysicsEnabled to detect when we are done loading assets and such. Whee!	2016-09-30 09:06:17 -07:00
Anthony J. Thibault	98ffea2fb9	Merge branch 'master' into out-of-body-experience	2016-09-22 18:08:23 -07:00
Brad Hefta-Gaub	5d3d4bdbd9	add support for redirection on domain at max capacity	2016-09-21 18:12:38 -07:00
Ryan Huffman	23450e929b	Add special avatar id for attaching overlays	2016-09-13 16:33:58 -07:00
Anthony J. Thibault	86351ca21c	Teleport bugs ... * made HMD.setPosition thread safe * changed script to use HMD.position = foo;	2016-09-09 17:32:02 -07:00
Andrew Meadows	97623f489c	expose setting HMD sensorToWorld from JS script	2016-09-09 16:32:57 -07:00
SamGondelman	99176588cc	remove old webwindowclass that relied on qwebkit	2016-09-06 17:36:59 -07:00
SamGondelman	716647037e	removed unused code	2016-09-06 17:36:54 -07:00
Brad Davis	20deae3242	Working on Qt 5.6 compatibility	2016-09-06 17:35:04 -07:00
Howard Stearns	89b00883dd	Merge pull request #8428 from highfidelity/discovery ... Snapshot of Snapshot-Discovery to master	2016-08-23 14:32:10 -07:00
howard-stearns	d0b58d8f8e	move thread safety into Application from caller	2016-08-22 12:49:51 -07:00
howard-stearns	80afc6a3b4	pr review comments	2016-08-22 10:59:21 -07:00
howard-stearns	a3d64dbd9c	code cleanup	2016-08-19 14:14:31 -07:00
howard-stearns	f6670a6374	new optional aspect-ratio argument to snapshot chain (javascript through ... c++ display plugin). When non-zero, it pulls out the largest piece from the center that maintains that ratio. Snapshot button uses 1.91.	2016-08-18 16:29:42 -07:00
howard-stearns	4492c4e64e	Allow javascript to safely open the correct login window (or answer that ... it is unneded).	2016-08-18 14:19:36 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
howard-stearns	347b20e506	expose to scripts the ability to show dedicated qml windows such as ... preferences	2016-08-17 09:54:15 -07:00
howard-stearns	2a099d5577	expose to scripts the ability to open the feed	2016-08-17 09:53:26 -07:00
howard-stearns	2b75240771	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-16 11:14:36 -07:00
Brad Davis	5b09748c00	Merge pull request #8431 from imgntn/assetbutton ... Open Asset Browser with Button from Edit.js Toolbar	2016-08-13 12:04:21 -07:00
Zander Otavka	62f4e3536b	Expose showing asset server to script interface	2016-08-12 15:18:30 -07:00
howard-stearns	e6746acf4c	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-11 15:40:26 -07:00
Atlante45	f0ff975248	UI wiring	2016-08-08 15:39:25 -07:00
David Kelly	c8f3a898d2	First cut of a snapshot uploader ... Will need to test end-to-end shortly, etc...	2016-08-08 15:27:27 -07:00
howard-stearns	fed775ff83	simple snapshot confirmation	2016-08-04 15:52:39 -07:00
David Kelly	1d7cdff2bc	Snapshot button plus script ... Minor change to allow snapshots to not notify (though the old way with CTRL+S still does). Added button to do it, saves them to disk. The plan is for us to add UI to share (or not) the snapshot. That's why we are not going through the notifications. Also, the script makes sure to hide/unhide hud and overlays. Next we will upload the pick to AWS via data-web (if you are logged in), and _then_ make the share UI.	2016-08-01 18:21:01 -07:00
humbletim	3e0ef7d43a	make Assets.getMapping(path) actually return the mapping	2016-07-28 10:13:30 -04:00
Ryan Downe Karpf	91714aaca6	Merge pull request #8258 from AlexanderOtavka/edit-model-ui ... Edit model dialog improvements	2016-07-22 17:11:52 -07:00
Anthony J. Thibault	837b19ed1b	fix for pushing avatar into floor when exiting away mode. ... * Removed MyAvatar.reset() access from JavaScript * Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation. * Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history. * Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes are facing the same direction as the current HMD orientation. away.js now uses the above new API's instead of MyAvatar.reset()	2016-07-19 14:42:24 -07:00
Zander Otavka	71f62c02fc	Add basic implementation of customPrompt ... Still missing the warning and diabling of dynamic checkbox when the static mesh is selected.	2016-07-15 17:35:55 -07:00
Brad Davis	ffdaadf13c	Make toolbars work even when debugging a script	2016-07-14 17:40:02 -07:00
Stephen Birarda	345478eb36	add removeButton API to ToolbarScriptingInterface	2016-07-13 15:06:31 -07:00
Brad Davis	6336362d40	Fixing decoration inflation	2016-07-12 17:23:13 -07:00
Brad Hefta-Gaub	b8d79ec263	Merge pull request #8179 from SamGondelman/snapshotFix3 ... Various snapshot improvements	2016-07-12 15:28:51 -07:00
SamGondelman	04184ee1fb	added snapshot notification in desktop mode	2016-07-05 17:21:57 -07:00
howard-stearns	ff55644fe8	stateful hud toolbar buttons	2016-06-30 16:24:11 -07:00
Sam Gondelman	3c809ef40c	Merge pull request #8123 from AlexanderOtavka/first-person-hmd ... Automatically enter first person when in HMD mode	2016-06-24 15:58:38 -07:00
Zander Otavka	dd023e16fd	Tabs -> spaces	2016-06-24 13:16:24 -07:00
Zander Otavka	d45694836f	Add signal for display mode change in HMD	2016-06-24 11:57:12 -07:00
howard-stearns	d3735322a5	Whitespace.	2016-06-22 13:03:13 -07:00
Brad Davis	37e9f66639	Additional toolbar work	2016-06-20 15:41:21 -07:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Bradley Austin Davis	6ad1008a56	Allow explicit overlay alpha from scripts	2016-06-15 17:24:32 -07:00
Bradley Austin Davis	bc838ac0b4	Fix vive json	2016-06-15 11:41:28 -07:00
Bradley Austin Davis	0b0977f362	Support keyboard suppresion, control suppresion while in keyboard mode	2016-06-15 10:48:48 -07:00
Bradley Austin Davis	71bf9384ce	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-15 10:45:51 -07:00
Brad Davis	9640727f51	Hand laser rendering support in HMD plugins.	2016-06-13 13:04:11 -07:00
David Rowe	5553c9f87f	Code review	2016-06-14 07:46:41 +12:00
David Rowe	58f89c88a2	Remember last directory used for Window.browse() and Window.save() ... Use last directory if not specified in method call. Default to desktop.	2016-06-11 16:45:17 +12:00
David Rowe	7a8954d851	Merge branch 'master' into clipboard-dimensions	2016-06-02 12:55:23 +12:00
David Rowe	2f3fa80b96	Add Clipboard.getContentsDimensions() JavaScript method	2016-05-26 09:52:22 +12:00
Brad Hefta-Gaub	2eef07e414	cleanup and dead code removal	2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub	12a1857280	check point with protocol refusal working	2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub	1cf8236860	Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck	2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub	1d9981e624	first cut at support for verifying all protocol version compatibility	2016-05-24 13:31:19 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Ryan Huffman	01944f5100	Remove unused DependencyManager include	2016-05-18 15:38:54 -07:00
Ryan Huffman	dd093e3fcd	Make AccountManager a DependencyManager singleton	2016-05-18 15:38:54 -07:00
Brad Davis	40316498a4	Enable script debugging	2016-05-09 17:02:40 -07:00
Stephen Birarda	ed1ddc2a8b	remove code to update/store wallet balance	2016-05-06 11:54:49 -07:00
Seth Alves	49566c8f26	fix memory leak in AssetMappingModel	2016-04-25 10:07:08 -07:00
Brad Hefta-Gaub	d87d631871	Merge pull request #7708 from zzmp/feat/render-rates ... Add renderRates.js to visualize rates over time	2016-04-21 15:59:58 -07:00
Zach Pomerantz	2c7cf3ea83	Fix RateScriptingInterface headers	2016-04-20 14:32:25 -07:00
Zach Pomerantz	ad225b3aed	Fix RatesScriptingInterface ctor	2016-04-20 13:58:06 -07:00
Zach Pomerantz	1fe12e7029	Mv Rates to RatesScriptingInterface.h	2016-04-20 13:26:23 -07:00
Brad Hefta-Gaub	8f3d48190a	switch to QRect instead of vec4	2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub	54777c9cd5	Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD	2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub	04df84974c	handle repositioning of qml windows	2016-04-15 19:50:12 -07:00
Brad Hefta-Gaub	c7f58dc17c	first cut at exposing recommend overlay rectangle	2016-04-14 20:47:31 -07:00
Atlante45	4ed8573f74	CR	2016-04-14 17:28:24 -07:00
Atlante45	e45939d18f	Make sure ResourceCacheSharedItems deals with strong refs	2016-04-12 13:51:11 -07:00
Atlante45	afdfef1482	Make sure we don't use raw resource ptr	2016-04-12 13:51:11 -07:00
Seth Alves	5fa9f662fc	Merge pull request #7542 from birarda/refresh-on-asset-connect ... refresh/close the asset browser dialog on domain switch	2016-04-01 18:08:59 -07:00
Stephen Birarda	194226103c	refresh the Asset Browser when switching domains	2016-04-01 11:13:59 -07:00
Brad Davis	97e96f7b67	PR comments	2016-03-31 13:19:26 -07:00
Stephen Birarda	29cd487f84	fixes for styling and logging from CR	2016-03-15 14:38:08 -07:00
Atlante45	03efde5b3c	Change text in case of drag and drop.	2016-03-15 13:53:13 -07:00
Atlante45	4a90ec303c	Fix drag&drop	2016-03-15 11:22:42 -07:00
Ryan Huffman	1b81b4f01b	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-15 10:19:20 -07:00
Ryan Huffman	7947bd7724	Fix message typo enter => entering	2016-03-15 10:11:53 -07:00
Atlante45	98851679c5	Remove unused AssetMappingItem	2016-03-15 09:14:22 -07:00
Stephen Birarda	72c64532f5	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-15 09:12:49 -07:00
Ryan Huffman	4b6dd4636f	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-13 21:32:25 -07:00
Ryan Huffman	6c27bd9eb2	Update upload flow and make asset list dynamically sized	2016-03-13 21:04:07 -07:00
Philip Rosedale	7e581cc831	Merge pull request #7325 from hyperlogic/tony/smooth-hands ... Smoother hand motion when using hand controllers	2016-03-11 15:08:59 -08:00
Stephen Birarda	66e572f226	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-11 14:44:49 -08:00
Stephen Birarda	e51aedeb35	fix error handling for diff request types	2016-03-11 11:36:52 -08:00
Brad Davis	75c3fd18c9	Expose HMD worn to scripting	2016-03-11 11:00:58 -08:00
Ryan Huffman	631aad80f9	Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation	2016-03-11 09:53:08 -08:00
Anthony J. Thibault	807d31743c	Removed Hand, HandData & PalmData ... Instead, we just store two controller::Poses in MyAvatar. Existing behavior and scripting APIs have been preserved. The hand controller debug drawing is slightly different, but still works.	2016-03-10 19:33:31 -08:00
Stephen Birarda	625032f748	fix for add to world after upload name change	2016-03-10 17:10:49 -08:00
Stephen Birarda	979fda7c8b	add trimming for upload mapping	2016-03-10 16:57:39 -08:00
Stephen Birarda	96a112290f	use mapping for overwrite prompt	2016-03-10 16:56:22 -08:00
Atlante45	35f5ebb938	Don't allow folder overwrite	2016-03-10 16:44:39 -08:00
Ryan Huffman	ad0fb18d81	Add / to beginning of mapping on upload if missing	2016-03-10 16:02:41 -08:00
Ryan Huffman	2d4864ed33	Merge branch 'atp' of github.com:birarda/hifi into atp-more	2016-03-10 15:40:07 -08:00
Atlante45	a6ccfb1685	CR	2016-03-10 15:11:39 -08:00
Atlante45	63571a7c36	Make sure Upload is not clicked several times	2016-03-10 14:59:20 -08:00
Atlante45	548d826a4e	Couple bug fixes	2016-03-10 14:59:20 -08:00
Atlante45	7d7a683b18	Add uploadFile method that prompts the user	2016-03-10 14:59:20 -08:00
Ryan Huffman	3e5e2eef17	Add mapping sorting, copying, and isKnownMapping	2016-03-10 08:18:32 -08:00
Brad Davis	28103cf5ef	Migrate composition of the overlay and pointer to the present thread	2016-03-07 17:14:41 -08:00
Stephen Birarda	f44cf3903c	re-instate verified domain ownership for full automatic networking ... This reverts commit 34408c8144.	2016-03-01 13:04:37 -08:00
Stephen Birarda	34408c8144	Revert "verified domain ownership for full automatic networking"	2016-02-25 17:02:08 -08:00
Clément Brisset	2e7c7eace5	Merge pull request #7179 from birarda/domain-security ... verified domain ownership for full automatic networking	2016-02-25 15:24:09 -08:00
Stephen Birarda	6cab831ea0	re-gen the interface keypair while being denied from domain	2016-02-23 14:52:12 -08:00
Brad Hefta-Gaub	9c3abd3eb7	some cleanup and standardization in how headPose is gathered	2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub	7be5811f34	tweak to UI size, clean up screen to overlay	2016-02-19 13:22:37 -08:00
Brad Hefta-Gaub	8b8b99c7e0	HMD mouse checkpoint	2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub	0d873c7732	consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface	2016-02-15 16:11:25 -08:00
Brad Hefta-Gaub	df6437236e	some CR feedback	2016-02-12 16:13:12 -08:00
Brad Hefta-Gaub	1160ecb335	improvements in HMD UI behavior	2016-02-12 10:51:33 -08:00
Bradley Austin Davis	0a99086617	Moving to QML based dialogs	2016-02-03 14:51:02 -08:00