8172 commits

Author	SHA1	Message	Date
Zach Fox	b23aecf6c5	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-03 10:12:58 -07:00
Zach Fox	33b8942ffd	Changes to Avatar/Profile App complete	2019-10-03 09:41:30 -07:00
RebeccaStankus	94e71e1bdd	Still trying get QML gridLayouts to work	2019-10-02 17:14:50 -07:00
RebeccaStankus	b1fd6050c7	Merged Zach's work	2019-10-02 12:55:51 -07:00
RebeccaStankus	47841d9bcd	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-02 12:42:53 -07:00
RebeccaStankus	dc15b55aa5	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-02 12:05:34 -07:00
Zach Fox	6bfca4e587	DEV-2275: Move 'input device muted' banner and make it slightly smaller	2019-10-02 11:48:50 -07:00
Zach Fox	50b06a40d7	Improved random avatar selection logic, plus local avatars	2019-10-01 17:22:24 -07:00
RebeccaStankus	d2e62749c7	Ready for Zach to add default avatar changes	2019-10-01 16:36:06 -07:00
Shannon Romano	38574cd66b	Merge pull request #16245 from luiscuenca/implementPointAt ... DEV-442: Implement directional blending node for point reaction	2019-10-01 11:46:30 -07:00
RebeccaStankus	3167dc9a35	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-01 09:59:14 -07:00
RebeccaStankus	0dfb234089	Finished UI, ready for CR	2019-10-01 09:58:44 -07:00
RebeccaStankus	6658e6377c	Adding 1 simplifiedUI constant import	2019-09-30 15:06:31 -07:00
RebeccaStankus	0f1190df8b	Trying to make QML UI work second launch	2019-09-30 15:03:58 -07:00
RebeccaStankus	9a03058e88	Trying to make QML UI work	2019-09-30 12:09:22 -07:00
luiscuenca	02d889ba6e	account for point target validity	2019-09-30 11:35:00 -07:00
RebeccaStankus	b98d106a3b	mend	2019-09-30 10:39:35 -07:00
RebeccaStankus	b25c874e5f	More work on second launch UI	2019-09-30 10:38:11 -07:00
RebeccaStankus	44d9610048	Working on UI	2019-09-30 09:17:51 -07:00
Sam Gateau	57f8095506	Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script	2019-09-27 12:00:45 -07:00
RebeccaStankus	f4ecd3dcd8	Working on initial/second launch	2019-09-27 09:15:39 -07:00
Sam Gateau	24cc302a8b	second pass of cleaning on the code to make it ready for merge	2019-09-26 16:56:00 -07:00
Sam Gateau	dc40c530a3	INstrumenting the code more...	2019-09-25 17:53:59 -07:00
luiscuenca	0aab2ed07f	Disable head look at when pointing	2019-09-25 12:37:24 -07:00
Sam Gateau	3e3c4c2e70	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-24 18:58:29 -07:00
Sam Gateau	0d9cd69d94	SImplifying Page.js, and adding a REsourceInspector	2019-09-24 18:10:57 -07:00
luiscuenca	ad79393e1f	Implement point at directional blend and API	2019-09-24 17:55:38 -07:00
Sam Gateau	2a78fc7b38	Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button	2019-09-24 14:29:09 -07:00
Sam Gateau	8aaa5deb11	Clean up the sort and filter system	2019-09-24 12:37:01 -07:00
Sam Gateau	d940e70564	Adding a proper SortFilterModel	2019-09-24 00:31:16 -07:00
Sam Gateau	3e17c1007a	understanding the delegateModelGroup mechanism...	2019-09-23 18:14:45 -07:00
RebeccaStankus	982bdf5c98	Prereq work for 'Reduce User Friction'	2019-09-23 16:49:16 -07:00
Sam Gateau	3c2809b9ed	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-21 08:52:13 -07:00
Sam Gateau	4480d56433	Rendering just the overlay layer and improving the resoruceCache inspector to sort	2019-09-20 19:00:03 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
Sam Gateau	ee5de175eb	Better monitoring of the resource loading in flights	2019-09-19 16:56:55 -07:00
Sam Gateau	819c942056	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-19 09:01:19 -07:00
Sam Gateau	a87db2636c	SOme stuff workbetter	2019-09-18 18:25:42 -07:00
Zach Fox	59184edc89	DEV-521: Update Emoji window's search field to display emoji's name during hover	2019-09-18 13:37:46 -07:00
Sam Gateau	c0660329a3	Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family	2019-09-17 18:06:08 -07:00
Sam Gateau	802326d4da	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-12 17:01:37 -07:00
Sam Gateau	133a8b7d5e	a bunch of changes to debug why...	2019-09-11 18:21:44 -07:00
Zach Fox	3cfb4db36e	Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation ... DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation	2019-09-11 15:35:04 -07:00
milad	4c340746c5	removed references to the emoji destroy sound	2019-09-11 12:50:49 -07:00
milad	275350c2fa	removed sound from the out	2019-09-11 12:38:29 -07:00
Zach Fox	e9eb07d388	BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery'	2019-09-11 10:20:59 -07:00
milad	d32438586a	added flag for flying	2019-09-10 16:06:50 -07:00
milad	bb0b51116a	cr1	2019-09-06 11:29:29 -07:00
milad	b352d53083	removed space made on accident	2019-09-06 11:00:14 -07:00
milad	1d8bbc3529	removed startup time var	2019-09-06 10:55:35 -07:00
milad	1576a29916	toggled flag for discconecting from wearable signal	2019-09-06 10:53:17 -07:00
milad	120c678557	added a wearable check for avimojis on startup	2019-09-06 10:51:12 -07:00
milad	531dceae4d	changed status indicator to be similar to nametag and emoji	2019-09-05 10:29:25 -07:00
milad	57a309db53	small formatting changes	2019-09-04 20:58:20 -07:00
milad	408656f6ec	added line break	2019-09-04 17:06:00 -07:00
milad	c73ea11b37	lowecase object	2019-09-04 17:00:30 -07:00
milad	3f2d2996a0	removed comment region sections	2019-09-04 16:59:14 -07:00
milad	252e8a2ed6	removed commented out code	2019-09-04 16:49:46 -07:00
milad	79b7271729	removed startup/unload apis from the 3 main modules	2019-09-04 16:48:24 -07:00
milad	d316f014eb	fixed double scriptEnding being called	2019-09-04 15:51:07 -07:00
Zach Fox	df3f7fcb72	Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix ... Dev-486 : emote indicator should still be showing	2019-09-04 13:11:24 -07:00
milad	5fdcf0ecaf	updated setting name and changed default value to true for show tray	2019-09-04 12:59:17 -07:00
milad	6c9c22a5fb	removed old code	2019-09-03 18:14:15 -07:00
milad	669fef763a	removed logs	2019-09-03 18:11:56 -07:00
milad	44e518f5a1	working fix	2019-09-03 18:06:25 -07:00
Sam Gateau	03c5dfad3d	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
Sam Gateau	cda2943b9a	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-03 12:01:12 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Zach Fox	c561bca79c	BUGZ-1386: Update simplifiedStatusIndicator to use domainID as org name instead of location.hostname	2019-08-30 11:37:52 -07:00
Brad Davis	6aa967f29f	fixing test code	2019-08-29 14:11:22 -07:00
Brad Davis	31340d278a	Add test for local file access	2019-08-29 13:45:43 -07:00
Zach Fox	4098dd9999	BUGZ-1342: Add lock icon to Emote tray when it's locked open; Make tray close when unlocking it	2019-08-27 12:59:57 -07:00
RebeccaStankus	abd4f24770	Added unload check that timeout is not running	2019-08-26 15:15:25 -07:00
RebeccaStankus	96dbd4620d	pull clear timeout into a separate function	2019-08-26 15:08:18 -07:00
RebeccaStankus	f66b696721	Clear timeout on selecting a different emote	2019-08-26 14:39:38 -07:00
RebeccaStankus	c3dfc4e8d8	Restore emote indicator after reaction emote	2019-08-26 14:23:27 -07:00
Zach Fox	701dd679c7	Change the icons'	2019-08-23 15:18:45 -07:00
Zach Fox	27574dd3f3	Prepare for new emote indicator icon	2019-08-23 14:48:49 -07:00
Zach Fox	98626b564c	Couple more changes	2019-08-23 14:40:39 -07:00
Zach Fox	dfcf70b9b5	Tons of Emote/Emoji changes	2019-08-23 14:14:53 -07:00
Zach Fox	44ac3f3a7a	Don't use entity creation library (reduce risk); use remote URL for broadcast image entity URLs	2019-08-22 13:58:35 -07:00
Zach Fox	a086d6fe6d	Fix triggered reactions not showing their icon in the emote indicator	2019-08-22 11:54:28 -07:00
Zach Fox	177590614e	Fix emote bar always visible on MacOS; small logic cleanup	2019-08-22 11:44:09 -07:00
Zach Fox	63d27fb002	Much smaller emoji wrt filesize; Fix emoji toolbar not sticking to window on MacOS	2019-08-22 11:00:15 -07:00
Zach Fox	3766ca8660	Add help/attributions popup to emoji popup window	2019-08-21 11:05:55 -07:00
Sam Gateau	e1e4d9ac6c	Exposing the AA mode of the AA job	2019-08-20 18:15:35 -07:00
Zach Fox	5869ed3f20	Remove Emote App bar when in HMD mode and re-enable conditionally; don't allow keyboard shortcuts to work in HMD	2019-08-20 15:21:12 -07:00
Zach Fox	7f45a7b45c	Show a not found message when the user searches for nonexistent emoji	2019-08-20 15:11:17 -07:00
Zach Fox	1cb4a31e09	Reticle update rate limiter; end reactions on shutdown	2019-08-20 15:02:36 -07:00
Zach Fox	cc9c9ec443	Fixup signal handling causing app errors; add keyboard navigation to emoji window	2019-08-20 14:52:19 -07:00
Zach Fox	8b79dc3020	Fix clapping silence issue	2019-08-20 14:22:13 -07:00
RebeccaStankus	0be3f133de	Removed some Milad notes	2019-08-20 14:17:00 -07:00
RebeccaStankus	a78284871e	more CR feedback changes	2019-08-20 13:59:41 -07:00
RebeccaStankus	cc22386f06	CR feedback changes	2019-08-20 13:29:02 -07:00
Sam Gateau	6cd37ef73c	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-08-20 09:41:08 -07:00
Sam Gateau	c5bd9ecf4f	REfreshing the antialiasing qml na dconfig of the Jitter Job	2019-08-19 18:14:29 -07:00
RebeccaStankus	022d1aee8e	Added check to remove persisting reticle entities on script startup	2019-08-19 15:36:21 -07:00
Zach Fox	b40d5658e3	Moved a timer from JS to QML; progress circle on Emote Indicator	2019-08-19 15:12:48 -07:00
Zach Fox	fd287654f4	Fixup keyboard shortcuts; Modify tooltips	2019-08-19 14:19:25 -07:00
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00