1914 commits

Author	SHA1	Message	Date
Zach Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00
howard-stearns	2ecc71a990	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
Zach Fox	b41fb952ae	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00
Andrew Meadows	f809afae2f	Merge pull request #10363 from jherico/qmlspam ... Removing logspam on toggling scripts window	2017-05-05 08:29:12 -07:00
David Rowe	88dc6b5f61	Fix tablet Web view "back" button not greying out when disabled	2017-05-05 17:24:36 +12:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
howard-stearns	9954380ce3	don't filter out the place you're at anymore	2017-05-04 14:44:48 -07:00
Andrew Meadows	7cb2bff4c5	Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash ... Fix vr 2d vr tablet crash	2017-05-04 10:08:55 -07:00
David Rowe	30604ab901	Fix some typos noticed in passing	2017-05-04 16:56:18 +12:00
David Rowe	9d92ed2b9b	Fix keyboard not appearing in social media snapshot sharing dialogs	2017-05-04 16:55:10 +12:00
David Rowe	8ae3d4e8a0	Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml	2017-05-04 13:10:09 +12:00
Zach Fox	affc7fc654	Merge pull request #10369 from druiz17/url-fix ... Fix tablet webview showing incorrect url.	2017-05-03 16:58:06 -07:00
Zach Fox	d28d89e8ff	Merge pull request #10368 from zfox23/palWebViewtoTabletWebView ... PAL WebView is now a TabletWebView	2017-05-03 16:51:32 -07:00
Dante Ruiz	5390a29859	tabletwebview-url-fix	2017-05-03 23:05:05 +01:00
Zach Fox	eaf819d11d	Remove FIXME	2017-05-03 14:59:07 -07:00
Zach Fox	066b2db73f	Make the change	2017-05-03 14:57:31 -07:00
Brad Davis	8e12c1959d	Removing logspam on toggling scripts window	2017-05-03 09:53:32 -07:00
David Rowe	7fdcb9b1f0	Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 14:59:41 +12:00
David Rowe	7b387c52c3	Fix reliability of keyboard enabling in tablet Web pages	2017-05-03 14:42:06 +12:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
Seth Alves	6b2caf8081	Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash	2017-05-02 09:41:47 -07:00
druiz17	18368cc073	Merge pull request #10343 from druiz17/tabletwebview-fix-links ... fix Tablet webview issues of not loading correct url.	2017-05-02 08:09:22 -07:00
Seth Alves	71deac49c6	reset tablet to homescreen when going from 2d to vr	2017-05-01 17:06:15 -07:00
Howard Stearns	73c24a5240	Merge pull request #10344 from howard-stearns/announcement-styling ... goto announcement card styling	2017-05-01 16:41:39 -07:00
howard-stearns	ca5318f121	remove debugging code	2017-05-01 15:57:22 -07:00
howard-stearns	545fd1355f	cleanup	2017-05-01 15:45:26 -07:00
howard-stearns	61b738e3cd	announcment styling	2017-05-01 15:35:17 -07:00
Dante Ruiz	a08b55d5f5	minimize diff	2017-05-01 23:08:25 +01:00
druiz17	67daa4b0a9	Merge pull request #10335 from druiz17/webview-js ... Implemented of a web app to bring up the tablet webView	2017-05-01 15:03:55 -07:00
Dante Ruiz	b00d7d763a	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 22:45:42 +01:00
Dante Ruiz	64b8237bd6	fix twitter and facebook links	2017-05-01 22:45:13 +01:00
Dante Ruiz	62870d85d3	Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links	2017-05-01 21:58:09 +01:00
Dante Ruiz	bb9eb98625	prevent mouse events from propagating to far	2017-05-01 21:49:57 +01:00
Dante Ruiz	c205bf0980	working on cleaner navigation	2017-05-01 21:23:38 +01:00
Dante Ruiz	763feccbe1	removed tabs	2017-05-01 18:07:42 +01:00
Dante Ruiz	9f33af479d	saving work	2017-05-01 18:04:22 +01:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
druiz17	f60deb0cfc	fixed the twitter link	2017-04-30 22:55:44 -07:00
druiz17	2bf7b12c7d	open webview from tabletwebscreen	2017-04-30 15:27:34 -07:00
Howard Stearns	b6ae0a5bde	add nextTick, and cleanup	2017-04-28 20:06:13 -07:00
howard-stearns	f9debf1388	checkpoint	2017-04-28 16:53:08 -07:00
Dante Ruiz	59f84a60c5	saving work	2017-04-29 00:31:09 +01: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
Howard Stearns	0ad8f4d985	remove debugging	2017-04-28 07:15:22 -07:00
howard-stearns	aed762e986	ux	2017-04-27 17:16:03 -07:00
howard-stearns	e4f259e630	back to non-fake data	2017-04-27 13:01:33 -07:00
howard-stearns	56196c03a3	pr review	2017-04-27 12:56:32 -07:00
howard-stearns	97777a416d	Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar	2017-04-27 12:02:02 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
Andrew Lowry	d3a9114676	Uses spaces instead of tabs for Edit.qml and EditTabView.qml.	2017-04-26 18:29:38 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Dante Ruiz	95d6a451c6	fixed work mapping	2017-04-26 22:14:53 +01:00
Zach Pomerantz	532284f779	fix tablet resolve typo	2017-04-26 16:28:42 -04:00
Dante Ruiz	4df953d510	fixed text issue	2017-04-26 19:14:14 +01:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Seth Alves	c7ab4994ea	Merge pull request #10282 from druiz17/tablet-webview-keyboard ... Added tabletwebview keyboard for HMD	2017-04-25 19:30:49 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Dante Ruiz	851eece0e4	removed comments	2017-04-25 23:26:16 +01:00
Dante Ruiz	b78bae37be	added keyboard for tabletWebview	2017-04-25 23:22:27 +01:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Andrew Lowry	6a218eaca9	Embeds colpick color picker in dat.GUI for particle explorer. ... Cleans up eslint for particleExplorer.js.	2017-04-24 13:35:37 -04:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
Dante Ruiz	cc34cb96e4	making ui for input recorder	2017-04-21 18:15:47 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
howard-stearns	4ea882cad1	faster initial response	2017-04-20 14:56:34 -07:00
howard-stearns	ce7145a388	Announcement cards, debug data.	2017-04-20 14:40:24 -07:00
howard-stearns	bc77eeeabd	scroll, margins	2017-04-20 13:43:55 -07:00
howard-stearns	b8e9fb67b8	old style card fonts, margins, etc.	2017-04-19 16:34:10 -07:00
howard-stearns	2512255dd0	reusable feeds	2017-04-19 16:33:02 -07:00
howard-stearns	3ce238b8a0	make feed self contained	2017-04-19 13:45:58 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
howard-stearns	c5f1455872	go horizontal	2017-04-19 12:47:28 -07:00
David Rowe	9088d1ef9c	Tablet version of recordings browser dialog	2017-04-19 16:15:22 +12:00
samcake	2c16b2bf3a	Expose the runtime from the engine in Stats	2017-04-18 18:12:42 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
Zach Fox	7505b82189	Merge pull request #10046 from Triplelexx/21224 ... 21224 - Allow people to save avatar bookmarks	2017-04-18 11:10:50 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	31b61c3225	removed white space	2017-04-18 00:24:34 +01:00
Dante Ruiz	e46d9da98f	fixed merge conflict	2017-04-18 00:22:35 +01:00
Zach Fox	7a7cfb84e5	Remove HMD keyboard focus toggle on AddressBar input	2017-04-17 10:08:40 -07:00
Zach Fox	a623ced64e	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -07:00
Dante Ruiz	863d64b2fd	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
Dante Ruiz	7189d4d7fa	daving web work	2017-04-14 17:01:23 +01:00
Zach Fox	0543709081	Focus fix	2017-04-13 16:10:36 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -07:00
David Kelly	a12407ddda	Merge pull request #10202 from davidkelly/dk/3934 ... Connection sort change	2017-04-12 10:42:04 -07:00
David Kelly	058a5b14a4	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
David Kelly	9376ac646f	offline people sort change	2017-04-12 08:41:36 -07:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Dante Ruiz	9c79e62004	webview-fix	2017-04-11 18:49:40 +01:00