1251 commits

Author	SHA1	Message	Date
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
Bradley Austin Davis	c1d45b0c78	Remove declarative form creation from WindowScriptingInterface	2016-02-03 14:50:59 -08:00
Bradley Austin Davis	f24f2749e1	Make users.js show QML window for edit friends	2016-02-02 15:19:12 -08:00
Ryan Huffman	acf96a401f	Fix marketplace imports failing silently if edit.js not running	2016-01-29 15:48:08 -08:00
David Rowe	d7d4961778	Wire up missing GlobalServices.connected() signal	2016-01-21 20:58:14 +13:00
Brad Davis	746c388f7a	Cleanup of QML windowing and message boxes	2016-01-15 23:14:49 -08:00
Brad Hefta-Gaub	a70adc8a57	Merge pull request #6823 from jherico/tool_window ... Tool window in QML	2016-01-14 16:56:27 -08:00
Brad Hefta-Gaub	6b76cf484d	fix issues with HMD lookout 2D, and cleanup	2016-01-14 08:48:55 -08:00
Brad Davis	b6272b7824	Migrate tool window to overlay/QML	2016-01-13 15:40:37 -08:00
Brad Hefta-Gaub	0f52b82c21	allow scripted addMenu() to specify grouping	2016-01-08 11:21:37 -08:00
Brad Hefta-Gaub	927fe97359	migrate callers of QMessageBox::warning() to OffscreenUi::warning()	2016-01-05 10:17:16 -08:00
Brad Hefta-Gaub	d98c2d1413	migrate callers of QMessageBox::question() to OffscreenUi::question()	2016-01-05 09:39:39 -08:00
Brad Hefta-Gaub	2b5956af99	move alert and confirm to use offscreen ui	2016-01-04 13:57:36 -08:00
Brad Davis	a883891197	Expose the username to scripts (and thus QML)	2015-12-30 22:28:16 -08:00
samcake	5d395ae54f	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-10 18:06:43 -08:00
Brad Davis	645695d5d5	Moving sixense to external plugin	2015-12-10 10:44:23 -08:00
Seth Alves	60b8e65520	get file dialog working on Linux	2015-12-07 06:03:58 -08:00
Atlante45	b45b1cc513	More work on live g-buffer debug	2015-12-04 17:43:00 -08:00
James B. Pollack	52d6fdac1a	Merge pull request #6487 from ctrlaltdavid/20740 ... Get the Leap Motion working again	2015-12-01 15:40:48 -08:00
David Rowe	ce100dbbc5	Fix crash in WebWindowClass in debug build setTitle on open WebWindow	2015-11-30 15:10:51 +13:00
David Rowe	5ecbaa5b93	Fix InputController (Leap Motion) not being updated	2015-11-25 09:43:55 +13:00
David Rowe	e25d4c17e8	Fix InputController (Leap Motion) not able to be created	2015-11-25 09:29:40 +13:00
Sam Gateau	5b92929833	Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client	2015-11-17 09:32:22 -08:00
samcake	8553033d59	Refactoring the mess for the Agent	2015-11-16 19:27:28 -08:00
samcake	71cc36fdd8	removing ms to seconds conversion in MyAvatar	2015-11-16 18:31:24 -08:00
Brad Davis	d099f61170	Updating audio record/playback mechanism to more closely match actual audio input	2015-11-16 14:57:24 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
Brad Hefta-Gaub	5a42991e0c	first pass at cleaning up MyAvatars use of PalmData	2015-10-27 13:51:42 -07:00
Brad Davis	e8be92cab8	Adding input action event	2015-10-23 13:36:06 -07:00
Brad Davis	bea6fdd890	Working on JSON parsing and cleanup ... Conflicts: libraries/controllers/src/controllers/Route.cpp libraries/controllers/src/controllers/ScriptingInterface.cpp libraries/controllers/src/controllers/StandardController.cpp libraries/controllers/src/controllers/impl/RouteBuilderProxy.h	2015-10-20 10:20:28 -07:00
Brad Hefta-Gaub	7669f9ed2c	fix several warnings	2015-10-19 17:26:57 -07:00
Brad Davis	a8e707ced2	Correcting update order to fix mouse	2015-10-18 22:46:14 -07:00
Brad Davis	734a39f962	Breaking up UserInputMapper, restoring some mappings	2015-10-18 18:58:03 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
James B. Pollack	112007e5a9	cleanup	2015-10-15 14:58:05 -07:00
James B. Pollack	8b57b3c0ff	fix memory leak	2015-10-15 14:13:07 -07:00
James B. Pollack	c18aeef6b3	remove redundant call	2015-10-14 17:29:38 -07:00
James B. Pollack	a1e2292e62	remove title bar from docked tool widgets	2015-10-14 17:27:45 -07:00
Brad Davis	e39219c2b5	Fixes and PR comments	2015-10-14 16:51:52 -07:00
Brad Davis	0063f9ae1d	Merging old and new controller interfaces	2015-10-14 15:16:54 -07:00
James B. Pollack	815b263954	convert tabs to spaces	2015-10-14 13:26:19 -07:00
James Pollack	7a8db803eb	move toolwindow tabs to the top	2015-10-14 19:35:37 +01:00
Ryan Huffman	9a9bdbbc44	hack in mappings to interface	2015-10-12 17:59:58 -07:00
Brad Hefta-Gaub	0986f86c34	implement StandardController and expose it to JS as Controller.Standard.*	2015-10-11 14:55:07 -07:00
Brad Hefta-Gaub	63f3156a61	add Controler.Actions	2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub	f55b6115d6	cleanup sanatize name function	2015-10-09 21:11:38 -07:00
Brad Hefta-Gaub	5c5ee8d699	remove debug code	2015-10-09 21:01:44 -07:00
Brad Hefta-Gaub	d3ee9b0f39	more work on exposing device inputs as JavaScript named constants	2015-10-09 20:58:23 -07:00
Brad Hefta-Gaub	37f530f97f	first cut at wiring up devices and inputs to JS	2015-10-09 16:15:29 -07:00
Thijs Wenker	ad5a6fac62	- applying of new qApp accessing method. ... - Some magic constant replacements with Helper "glm::vec3(matrix[3])" -> "extractTranslation(matrix)"	2015-10-07 15:10:40 +02:00
Thijs Wenker	4ab5e0af84	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation ... Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-07 14:48:06 +02:00
Brad Davis	028935f831	Removing deprecated function usage	2015-10-06 20:36:55 -07:00
Brad Davis	19fb4e92a6	Enabling programmatic access to the IPD scale ... Conflicts: interface/src/Application.cpp interface/src/avatar/MyAvatar.cpp interface/src/scripting/HMDScriptingInterface.cpp interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:08:17 -07:00
Thijs Wenker	6e52fcb857	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation ... Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-07 03:11:24 +02:00
Atlante45	76e0006732	Remove forgotten cursorVisible	2015-10-06 15:58:35 -07:00
Atlante45	8a7871e15b	rebase fix	2015-10-06 14:13:28 -07:00
Atlante45	ba5c20b7a6	Header cleanup	2015-10-06 13:56:24 -07:00
Atlante45	dde11c5cd1	More unused	2015-10-06 13:56:23 -07:00
Atlante45	cf3b33a96b	Replace Application::getInstance() with qApp	2015-10-06 13:56:19 -07:00
Thijs Wenker	4e8fc08458	made the changes as suggested by @hyperlogic	2015-10-06 20:48:51 +02:00
Thijs Wenker	953ff6caa7	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation ... Conflicts: interface/src/Application.cpp interface/src/scripting/HMDScriptingInterface.h libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h	2015-10-06 20:06:29 +02:00
Thijs Wenker	f6afb4cb02	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation ... Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:56:22 +02:00
Brad Davis	8090bc8e8d	Revert "Enabling programmatic access to the IPD scale"	2015-10-06 10:16:42 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
Thijs Wenker	8befade007	expose position and orientation of HMD to Javascript. ... - HMD.orientation - HMD.position	2015-10-04 15:08:35 +02:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge ... Support for accessing IPD in scripts	2015-09-29 14:24:53 -07:00
Brad Davis	7b1c04512a	Adding support for accessing IPD in scripts	2015-09-28 16:24:38 -07:00
Ryan Huffman	1a9cd59339	Fix ClipboardScriptingInterface to call methods on main app thread	2015-09-28 15:05:48 -07:00
Brad Hefta-Gaub	0ba1e8c945	remove renderingInWorldInterface signals	2015-09-18 09:49:57 -07:00
David Rowe	c9d799f5e0	Auto refresh entities list upon display of Entities tab	2015-08-27 13:32:00 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -07:00
Brad Hefta-Gaub	13a9dc4df2	cleanup controller interface, add getActionNames() and getDeviceNames()	2015-08-24 15:35:55 -07:00
David Rowe	bb2c48e3ed	Add size and position properties, methods, and events to WebWindow	2015-08-14 14:42:32 -07:00
Brad Hefta-Gaub	b726769f15	Merge pull request #5402 from highfidelity/plugins ... New plugins architecture	2015-08-11 11:11:27 -07:00
David Rowe	90637272c5	Add WebWindow setPosition() method	2015-08-07 17:38:41 -07:00
Sam Gondelman	54f64b62eb	Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins	2015-08-06 14:45:26 -07:00
Bradley Austin Davis	7e60aee1bf	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp	2015-08-06 11:03:37 -07:00
Sam Gondelman	113c4ea28b	exposing palm velocity and angular velocity to js	2015-08-05 12:17:15 -07:00
SamGondelman	52be44d621	uninitialized value	2015-08-04 14:50:38 -07:00
Zander Otavka	e5b8701215	Add toggle event for address bar.	2015-07-31 11:26:04 -07:00
Zander Otavka	c77a91eb63	Expose address bar toggling to scripts.	2015-07-31 11:26:04 -07:00
Brad Davis	f0d0979ade	Fix UI element placement	2015-07-29 09:19:09 -07:00
Bradley Austin Davis	3c6416d6b8	Merge branch 'master' into plugins	2015-07-27 10:09:02 -04:00
David Rowe	3893add148	Fix setting WebWindow's width and height ... Width and height parameters now set the WebWindow's width and height instead of its minimum size, when not part of a tool window.	2015-07-24 10:43:24 -07:00
Bradley Austin Davis	a60e669d3d	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
David Rowe	c1e1caa709	Add ability to update title of WebWindow after it's created	2015-07-23 21:59:19 -07:00
Bradley Austin Davis	408bb082d7	Merge fixes, OSX compile fixes	2015-07-22 13:24:47 -04:00
SamGondelman	4d3b08b5e3	modified sword.js to work with vive controllers	2015-07-20 14:52:49 -07:00
Anthony J. Thibault	56e7af081e	input plugin architecture, fixed sixense	2015-07-15 18:50:44 -07:00
Sam Gondelman	81efd99ae4	merge with hifi/plugins	2015-07-02 10:13:28 -07:00
Bradley Austin Davis	54bbc841e2	Working on mac compilability	2015-07-01 23:03:33 -07:00
Brad Davis	e421141ec5	experimenting with input plugins	2015-06-30 09:52:54 -07:00
Ryan Huffman	4df1bea4ec	Merge pull request #5167 from SamGondelman/hmdControls ... hmdControls.js for movement when wearing an HMD	2015-06-24 14:40:31 -07:00
Brad Davis	3231bbba5a	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp	2015-06-22 09:44:16 -07:00
bwent	c315bcec24	Expose mouseDoublePressEvents to js	2015-06-19 15:52:27 -07:00
Sam Gondelman	aab8161fa4	remove unused function	2015-06-18 18:57:04 -07:00
Brad Davis	48b27acc79	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-18 18:17:59 -07:00
Sam Gondelman	f752534f7c	actionEvent signal, captureActions, began work on hmdControls.js	2015-06-18 09:52:36 -07:00
Brad Davis	ae1c9603b9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
Sam Gondelman	0157997126	fix findDevice	2015-06-17 14:42:11 -07:00
Sam Gondelman	17322645f2	added mouselook script, reticle and icons need changes	2015-06-17 11:17:38 -07:00
Brad Davis	00d8fe75ab	Breaking up overlay into rendering and compositing classes	2015-06-13 17:36:08 -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
David Rowe	01b1e9c4ed	Signal domain changes for those handled by ICE as well as not	2015-06-09 12:33:14 -07:00
Sam Gondelman	0769593ca8	added getters/setters for Inputs and InputChannels	2015-06-09 10:20:36 -07:00
Sam Gondelman	984d449bf9	exposed input key bindings to js to enable key remapping	2015-06-04 16:29:58 -07:00
Bradley Austin Davis	fc825f6632	Fixing the loading of local HTML so it works on both OSX and win32	2015-05-13 09:46:24 -07:00
Brad Davis	8c4f802dbf	Merge remote-tracking branch 'upstream/master' into web-entity ... Conflicts: libraries/entities/src/EntityItemProperties.h libraries/entities/src/EntityTypes.h	2015-05-12 15:56:02 -07:00
ZappoMan	73428ec12d	add support to not displace very large clipboards on import	2015-05-11 14:21:58 -07:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
Brad Davis	a96f69a673	Switching to a wrapper mechanism for VR menus	2015-04-25 16:20:15 -07:00
Brad Davis	fbdb9b143e	Merge branch 'ui-refactor' into m_and_m ... Conflicts: interface/resources/qml/HifiMenu.qml interface/resources/qml/MessageDialog.qml interface/resources/qml/Root.qml interface/resources/qml/TestRoot.qml interface/resources/qml/controls/Dialog.qml interface/src/Application.cpp interface/src/ui/LoginDialog.cpp libraries/ui/src/MessageDialog.cpp libraries/ui/src/MessageDialog.h libraries/ui/src/OffscreenQmlDialog.h libraries/ui/src/OffscreenUi.cpp libraries/ui/src/OffscreenUi.h tests/ui/src/main.cpp	2015-04-24 18:02:12 -07:00
Ryan Huffman	547b0e5ee6	Update style of webview to only be set when 'fusion' exists	2015-04-24 13:42:03 -07:00
Brad Davis	1ff8c67576	More work on menus and some code cleanup	2015-04-24 12:54:11 -07:00
Ryan Huffman	df591f9ad7	Set style of webview	2015-04-24 11:49:33 -07:00
Brad Davis	a9d65f168b	Working on marketplace dialog	2015-04-23 14:23:11 -07:00
David Rowe	349cc3241d	Restore minimized windows to view	2015-04-01 18:59:34 -07:00
David Rowe	49de54de48	Use improved WebWindowClass for friends window	2015-04-01 18:58:59 -07:00
David Rowe	96e888864a	Merge branch 'master' into 20422	2015-04-01 14:56:48 -07:00
David Rowe	e519928320	Move friends window to own class	2015-04-01 11:38:32 -07:00
David Rowe	e06f28b7c5	Merge branch 'master' into 20422 ... Conflicts: examples/users.js interface/src/Application.cpp	2015-03-31 21:01:54 -07:00
ZappoMan	d68143675a	first simple pass at using marketplace windows in preferences	2015-03-31 16:24:27 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI ... Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
Andrew Meadows	2404fb126f	Merge pull request #4527 from sethalves/valgrind ... Valgrind told me to do it	2015-03-30 11:56:17 -07:00
David Rowe	cbf2012bf5	Add menu items that set visibility ... And synchronize visibility settings between Interface and users.js.	2015-03-29 18:35:56 -07:00
Seth Alves	986bc71e93	quiet compiler	2015-03-28 17:10:26 -07:00
David Rowe	be69c0b58f	Add add/remove friends menu item ... This must display the dialog whether or not users.js is running. Both C++ and JavaScript need to open or restore the same dialog, hence a new dialog rather than using WebWindow with its JavaScript baggage.	2015-03-28 13:05:23 -07:00
ZappoMan	baa2f947e5	classifying FSTReader and moving ModelType into that class	2015-03-27 16:30:00 -07:00
David Rowe	90c1da2094	Merge branch 'master' into 20416 ... Conflicts: examples/notifications.js	2015-03-27 12:13:29 -07:00
David Rowe	cb6abfb2e6	Display notification if domain connection refused	2015-03-23 12:05:56 -07:00
Ryan Huffman	d097b4409e	Add title to non-toolbar WebWindows	2015-03-17 10:40:51 -07:00
Ryan Huffman	1e1c60847b	Add WebWindow::getURL	2015-03-17 09:07:01 -07:00
Ryan Huffman	8088b01356	Add WebWindow::raise	2015-03-17 09:06:48 -07:00
Ryan Huffman	46f6c9f888	Add WebWindow::setURL	2015-03-17 09:06:31 -07:00
Ryan Huffman	9d5c0cf4e3	Add layout to WebWindowClass to that it maximizes the webview	2015-03-13 17:25:24 -07:00
Ryan Huffman	1193d86d7b	Update webwindow to use datawebview	2015-03-13 16:39:25 -07:00
Ryan Huffman	53b5c7e971	Update WebWindow to raise when being set to visible	2015-03-13 14:11:01 -07:00
Ryan Huffman	dc3453a878	Add Window.raiseMainWindow()	2015-03-13 14:10:46 -07:00
Ryan Huffman	7ef1964a52	Add user agent for WebWindow	2015-03-13 11:52:02 -07:00
Ryan Huffman	93cdb3a293	Add option for non-tool window WebWindows	2015-03-13 11:51:40 -07:00
Ryan Huffman	c3c2a75f48	Handle .svo drop events and emit svoImportRequested	2015-03-11 15:38:15 -07:00
Ryan Huffman	2f885bb7f2	Move WindowScriptingInterface to DependencyManager	2015-03-11 15:34:29 -07:00
Stephen Birarda	cd382eeea5	expose discoverability changes to js	2015-03-09 17:20:09 -07:00
Stephen Birarda	77a60a3d72	remove discoverability setter until API ready	2015-03-09 16:34:00 -07:00
Stephen Birarda	f81ae30918	fix getUsername for AccountManager include in implementation	2015-03-09 16:32:09 -07:00
Stephen Birarda	2f22c0cd96	cleanup username API from GlobalServicesScriptingInterface	2015-03-09 16:28:01 -07:00
Ryan Huffman	03c03a20f9	Update pasteEntities to use vec3	2015-03-05 13:52:30 -08:00
Ryan Huffman	6848025504	Add exporting by entity ID to Application	2015-03-05 13:36:16 -08:00
Ryan Huffman	71768ef275	Return entity IDs on paste	2015-03-05 12:36:45 -08:00
Ryan Huffman	a922619ebc	Add Clipboard.exportEntities that takes a list of entity IDs	2015-03-05 12:36:10 -08:00
Stephen Birarda	e43da00537	remove xmpp chat support	2015-03-03 10:13:41 -08:00
Andrew Meadows	7b68916010	Merge pull request #4343 from ZappoMan/hangOnExit ... BUG FIX: Hang on exit	2015-02-25 17:02:26 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies ... NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
ZappoMan	a89691fc66	switch GLCanvas back to being owned by Application	2015-02-25 12:11:35 -08:00
Brad Hefta-Gaub	8c26be49d7	Merge pull request #4330 from huffman/edit-off-on-domain-change ... Turn editEntities off on domain change	2015-02-24 20:11:39 -08:00
Andrew Meadows	1b669af79d	Merge pull request #4307 from Atlante45/fix_warnings ... Fix warnings	2015-02-24 12:19:32 -08:00
Philip Rosedale	d74856e01b	add angularVelocity to controller	2015-02-24 11:21:04 -08:00
Ryan Huffman	4641bd0cd9	Add Window.domainChanged signal for scripting	2015-02-24 10:47:37 -08:00
Stephen Birarda	437d5c7bdf	repairs to include locations for QXmpp and SDL2	2015-02-23 09:26:35 -08:00
Atlante45	5230b805d2	Fix warnings	2015-02-18 19:24:29 +01:00
Thijs Wenker	062c2cbcee	HUD LookAt positions could be NULL now if whenever they're out of range ... HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D() HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()	2015-02-12 22:55:44 +01:00
Thijs Wenker	0e66305456	changed HMDScriptingInterface MyAvatar to new way of retrieving this object	2015-02-07 13:37:33 +01:00
Thijs Wenker	e3ca1efe6b	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-07 00:34:38 +01:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Andrew Meadows	5ea785f4ad	Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility ... Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean	2015-02-06 08:58:14 -08:00
Thijs Wenker	27147fde2a	add Write function to the Window.cursurVisible property	2015-02-06 14:45:22 +01:00
Thijs Wenker	9dbcefed2a	Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean	2015-02-04 23:23:27 +01:00
Seth Alves	bcf0846310	merge from master	2015-02-04 11:30:22 -08:00
Thijs Wenker	38aab9570b	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-04 19:55:12 +01:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Brad Hefta-Gaub	de58c4a007	Merge pull request #4217 from Atlante45/master ... Fix for fps bug/field of view	2015-02-03 19:13:52 -08:00
Seth Alves	8489ee04f3	fix a couple of signed vs unsigned comparisons.	2015-02-03 16:11:04 -08:00
Atlante45	27459ba861	Settings update	2015-02-03 12:27:30 -08:00
Ryan Huffman	ba5a96f541	Add Window.setFocus	2015-02-03 11:44:22 -08:00
Seth Alves	c1ae98fa1a	quiet some compiler warnings about signed vs unsigned comparisons	2015-02-02 15:02:29 -08:00
Atlante45	647a935eaa	Remove app->getAvatar	2015-01-29 15:16:40 -08:00
Atlante45	4ef87b9919	Merge branch 'master' of https://github.com/highfidelity/hifi into android ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/ui/PreferencesDialog.cpp interface/src/ui/Stats.cpp libraries/audio-client/src/AudioClient.cpp libraries/audio-client/src/AudioClient.h	2015-01-28 13:13:32 -08:00
Thijs Wenker	46618db697	Merge branch 'master' of https://github.com/worklist/hifi into 20224 ... Conflicts: interface/src/ui/ApplicationOverlay.h	2015-01-28 19:35:17 +01:00
David Rowe	7286a9c5fb	Merge branch 'master' into 20276	2015-01-27 19:08:40 -08:00
Atlante45	20358a87d6	Moved some headers around	2015-01-27 01:43:01 -08:00
David Rowe	22347dd794	Add AudioDevice.deviceChanged() signal and use to update audio menu	2015-01-22 19:11:55 -08:00
Atlante45	38e7bddc73	Merge branch 'android' of https://github.com/birarda/hifi into android	2015-01-21 15:14:07 -08:00
Stephen Birarda	0eced09f1d	intial removal of Audio to audio-client	2015-01-21 11:49:06 -08:00
Atlante45	11ea3e4047	Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess	2015-01-21 11:15:31 -08:00
Thijs Wenker	87b2c362fc	style	2015-01-21 17:19:51 +01:00
Thijs Wenker	719f76d42f	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-21 15:09:11 +01:00
Thijs Wenker	9e51bece63	More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this!	2015-01-21 15:07:32 +01:00
Ryan Huffman	0d9dbaccf7	Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates	2015-01-20 11:44:13 -08:00
Atlante45	6a00dcbf0a	More switches to new Settings	2015-01-20 00:30:29 -08:00
Atlante45	c2b7ff1b54	Totally removed Application's setting memember	2015-01-18 19:10:30 -08:00
Atlante45	1f31828e08	Moved last methog out of Menu ... Also did a bit of Header cleanup	2015-01-18 07:14:52 -08:00
Thijs Wenker	6bad7a6002	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-17 01:35:35 +01:00
Ryan Huffman	ba752040dd	Update WebWindow to redefine EventBridge after refresh	2015-01-16 16:24:19 -08:00
Thijs Wenker	5de4f8f249	Merge branch 'master' of https://github.com/worklist/hifi into 20224 ... Conflicts: examples/libraries/virtualKeyboard.js	2015-01-15 22:59:05 +01:00
Thijs Wenker	12136e5305	cursor follows look at rotation now	2015-01-15 22:25:59 +01:00
Stephen Birarda	e538669343	resolve conflicts on merge with upstream	2015-01-15 13:12:05 -08:00
Stephen Birarda	79d214619d	update lobby for new places API	2015-01-14 18:18:26 -08:00
Thijs Wenker	2611e2f364	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-14 15:40:46 +01:00
Atlante45	f77fab2fe0	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
Thijs Wenker	0f6ad4eba0	HMD.VRMode -> HMD.active , and hooked it to a function which isn't dependent on HMD type, since there will be more HMD's than Oculus supported in the near future.	2015-01-14 00:07:15 +01:00
Thijs Wenker	ca4d493ec9	added HMD.VRMode to HMDScriptingInterface	2015-01-14 00:01:50 +01:00
Atlante45	2a82ff9768	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 ... Conflicts: assignment-client/src/voxels/VoxelServer.cpp interface/src/Application.cpp interface/src/Audio.cpp interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/Util.cpp interface/src/avatar/MyAvatar.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp libraries/networking/src/NodeList.cpp libraries/shared/src/DependencyManager.h	2015-01-13 11:03:14 -08:00
Thijs Wenker	3da5677aaf	added HMD interface to toggle magnifier	2015-01-13 00:43:16 +01:00
David Rowe	6c4932f9d0	Coding standard	2015-01-07 11:24:10 -08:00
David Rowe	40274df279	Add downloads information changed event for JavaScript	2015-01-07 11:20:46 -08:00
David Rowe	8b0d859686	Add method to access downloads information in JavaScript	2015-01-06 15:54:07 -08:00
Philip Rosedale	413cbacbc1	Merge pull request #4043 from ZappoMan/voxelEctomy ... more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 10:07:38 -08:00
ZappoMan	b940dcfdb3	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
Stephen Birarda	51bba4884f	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
ZappoMan	4ea9bbc309	first major pass at voxelEctomy	2014-12-30 18:08:58 -08:00
Atlante45	296c0025de	Switched to auto and changed macro	2014-12-18 15:42:38 -08:00
Stephen Birarda	9f21b41d3f	updates for new DependencyManager API	2014-12-17 18:08:41 -08:00
Stephen Birarda	7beb3a7b62	resolve conflicts on merge with upstream master	2014-12-17 16:57:35 -08:00
Stephen Birarda	369fdc5771	move audio toolbox into its own class	2014-12-16 15:24:57 -08:00
Atlante45	2039895898	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/renderer/GlowEffect.cpp interface/src/renderer/TextureCache.cpp	2014-12-16 14:27:50 -08:00
Atlante45	4d1529f77b	typedefs	2014-12-16 14:02:22 -08:00
Stephen Birarda	3c6c37710d	hook AudioScope to new Dependency Audio	2014-12-16 13:03:46 -08:00
Stephen Birarda	a9eaa4b9f7	more decoupling of Audio from Interface	2014-12-16 12:43:06 -08:00
Stephen Birarda	6fd55e6f42	make Audio class use DependencyManager	2014-12-16 12:31:01 -08:00
DaveDubUK	7ab9dfbfe1	Window.nonBlockingForm-fix	2014-12-16 14:48:28 +00:00
DaveDubUK	9493440d32	Window.nonBlockingForm-fix	2014-12-16 13:33:10 +00:00
DaveDubUK	cd95f7bd23	Window.nonBlockingForm active status was not being tested correctly. Was causing unexpected fail on second attempt to show form	2014-12-16 13:20:11 +00:00
Atlante45	e5e2eb4e8a	Moved GLCanvas in DM and DM to QSharedPointers	2014-12-15 16:20:52 -08:00
Stephen Birarda	1b48cf7f5a	use DependencyManager for AddressManager	2014-12-15 14:54:20 -08:00
Atlante45	25df784f43	Headers cleanup	2014-12-15 10:56:42 -08:00
ZappoMan	74a6fd5ca7	fix joystick pick	2014-12-09 20:03:00 -08:00
Atlante45	88a576f846	fix action events for gamepad;	2014-12-09 19:35:38 -08:00
Atlante45	7026af7b9a	Centrilized Oculus interference in pickRay	2014-12-04 17:26:14 -08:00
Stojce Slavkovski	cc487d76ca	Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 ... Conflicts: examples/libraries/entityPropertyDialogBox.js	2014-11-15 09:50:09 +01:00
Ryan Huffman	604b1b620b	Move dock window to ToolWindow	2014-11-14 10:52:08 -08:00
Ryan Huffman	3658d65028	Remove grid tool from menu	2014-11-13 20:02:19 -08:00
Ryan Huffman	6b2a497810	Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes	2014-11-13 17:48:17 -08:00
Ryan Huffman	03f155bcd8	Add tool window	2014-11-13 17:47:02 -08:00
Ryan Huffman	55612cc596	Add title to WebWindowClass	2014-11-13 17:46:20 -08:00
Stephen Birarda	f9aed39352	don't try to open a joystick if controller is NULL	2014-11-11 18:17:24 -08:00
Ryan Huffman	bedd9c76f2	Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool ... Conflicts: examples/newEditEntities.js	2014-11-11 10:48:49 -08:00
Ryan Huffman	3ec28f8e30	Add WindowScriptingInterface::doCreateWebWindow	2014-11-11 10:15:16 -08:00
Ryan Huffman	a1d771a0be	Rename WebWindow to WebWindowClass	2014-11-11 10:03:14 -08:00
Ryan Huffman	bd61eba664	Remove unused include	2014-11-11 10:00:28 -08:00
Ryan Huffman	3e109ee770	Add WebWindow widget for scripts	2014-11-06 14:57:04 -08:00
Stojce Slavkovski	06da1bd566	add checkbox support in scripting interface	2014-11-06 20:41:08 +01:00
Brad Hefta-Gaub	583b7b1267	Merge pull request #3732 from thoys/20166 ... CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event	2014-11-04 15:51:05 -08:00
Stephen Birarda	f53455ee55	use a ray from the near clip for action ray	2014-11-04 11:40:47 -08:00
Stephen Birarda	8d6b041758	send a pick ray with HFActionEvent, not x,y	2014-11-04 10:01:25 -08:00
Thijs Wenker	af74fc09b9	Adds AudioDevice mute functionality to ScriptEngine	2014-11-01 02:42:22 +01:00
Stephen Birarda	27f7cdb2d4	handle location set/get in AddressManager, handle set to address map	2014-10-28 10:35:56 -07:00
Stephen Birarda	cb7a6cb93c	Merge branch 'master' of https://github.com/highfidelity/hifi into lobby	2014-10-28 08:40:20 -07:00
Stephen Birarda	bb652c0784	rename signal in AbstractControllerScriptingInterface from cancel to back	2014-10-27 16:01:39 -07:00
Stephen Birarda	8e6b6d5294	have controller A button fire action at center of screen	2014-10-27 15:58:42 -07:00
Stephen Birarda	8a9f2d172a	rename HFCancelEvent to HFBackEvent, fire from joystick	2014-10-27 15:51:59 -07:00
Stephen Birarda	7b5115c35f	add a new meta event, HFCancelEvent	2014-10-27 15:37:31 -07:00
Stephen Birarda	c3fe7c7497	send global HFActionEvent from ControllerScriptingInterface	2014-10-27 15:21:47 -07:00