8142 commits

Author	SHA1	Message	Date
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
RebeccaStankus	e690d4f7ef	Limited distance to rez a point reticle	2019-08-19 13:40:50 -07:00
RebeccaStankus	4787785660	first version of pointing reticle	2019-08-19 13:19:01 -07:00
Zach Fox	05abff1c0b	Merge pull request #16071 from zfox23/helpApp1 ... Help App: Phase 1	2019-08-19 11:16:44 -07:00
RebeccaStankus	44d0e0ba1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 09:16:19 -07:00
Sam Gateau	aeb407698d	bloom ui	2019-08-18 22:15:20 -07:00
Sam Gateau	3ace52629c	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-08-16 17:35:15 -07:00
Sam Gateau	a934b79321	Updating the bloom debug ui	2019-08-16 17:34:16 -07:00
RebeccaStankus	0699433df8	Emoji app updates emoteIndicator	2019-08-16 16:34:08 -07:00
Zach Fox	30d552919a	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-16 14:06:58 -07:00
Zach Fox	a274e5c2b1	Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner	2019-08-16 12:31:50 -07:00
Zach Fox	301dca6937	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 12:14:52 -07:00
Zach Fox	c13697803d	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 12:14:44 -07:00
RebeccaStankus	18a9f3fbfb	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 12:09:17 -07:00
Zach Fox	4ac0c5902d	52px emojis and custom emoji	2019-08-16 12:08:30 -07:00
RebeccaStankus	2357934d49	Working tooltips	2019-08-16 12:08:26 -07:00
Zach Fox	b06b0b51df	Mipmap the emoteIndicator Image	2019-08-16 10:07:22 -07:00
Zach Fox	92c5ca2d75	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 09:58:44 -07:00
RebeccaStankus	73941f1ece	Fixed bug with emote indicator icon not restoring	2019-08-16 09:46:46 -07:00
RebeccaStankus	c64da85344	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 09:11:03 -07:00
RebeccaStankus	a06cb85f9e	Indicator image swapping	2019-08-15 17:20:27 -07:00
Zach Fox	6176214d45	Remove extra log	2019-08-15 17:00:59 -07:00
Zach Fox	a053f9ed9e	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
RebeccaStankus	876ae771d4	Tray buttons swap color on hover	2019-08-15 16:44:50 -07:00
Zach Fox	98eff6ebb6	Mipmap the emoji bar images	2019-08-15 16:32:59 -07:00
RebeccaStankus	64dcb48925	Removed extra file, moved qml images	2019-08-15 16:31:37 -07:00
RebeccaStankus	f93d754f15	Button label characters are now images	2019-08-15 16:25:25 -07:00
RebeccaStankus	2fc603b85e	Replacing button label characters with images	2019-08-15 15:35:41 -07:00
Zach Fox	d29cdffe8c	Toggle reaction bugfix	2019-08-15 14:42:27 -07:00
Zach Fox	2149f1acc7	Reaction logic now nice and stable!	2019-08-15 14:40:33 -07:00
RebeccaStankus	af97384948	Adding icon swaps to emoteIndicator	2019-08-15 14:21:03 -07:00
Zach Fox	0497c10d69	Ensure mask covers non-circular emoji	2019-08-15 13:20:09 -07:00
Clement	5be1cfcb36	Fix linux specific script engine crash	2019-08-15 13:07:43 -07:00
Zach Fox	9ae5eba12a	Remove reliance on QML timer - still need to fix non-circular emoji mask	2019-08-15 13:04:50 -07:00
Zach Fox	dcae607cfb	Applause sound and fixup handler	2019-08-15 12:46:30 -07:00
Zach Fox	38743f924f	Autofocus Emoji search text field	2019-08-15 12:23:29 -07:00
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
RebeccaStankus	078ff223a4	Emote animations start and stop correctly	2019-08-15 12:01:25 -07:00
Zach Fox	143c3e966c	Big optimizations to Emoji window	2019-08-15 10:58:13 -07:00
Zach Fox	2c604d2c5b	Simpler code!	2019-08-15 09:58:45 -07:00
Zach Fox	bfb4c0c49a	Fixup emote indicator	2019-08-15 09:21:42 -07:00
RebeccaStankus	46a8e804b3	Working on tray functionality	2019-08-15 09:11:52 -07:00
RebeccaStankus	bc67241100	Finished changes for CR feedback	2019-08-14 14:09:48 -07:00
RebeccaStankus	0645796e74	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-14 13:28:08 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Sam Gateau	f4c33d8392	Refining the look of the enable button of the TaskPropView	2019-08-14 11:33:30 -07:00
Sam Gateau	5e57e53db2	Address errors sent from running the ENgine Inspector.js	2019-08-14 11:15:52 -07:00
Sam Gateau	859016bf37	Addressing review comments	2019-08-14 10:28:42 -07:00
Zach Fox	52c4d4fe69	better FAQ	2019-08-14 09:31:08 -07:00
Zach Fox	7297ac9a09	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-14 09:11:04 -07:00
Sam Gateau	5c085bd08d	CLean the code of the task::COnfig changes	2019-08-13 18:58:35 -07:00
Sam Gateau	4a93b23d83	Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly	2019-08-13 18:47:57 -07:00
Sam Gateau	9139edc8b1	Maybe fixed the problem, cannot render the gl41 version properly	2019-08-12 00:44:14 -07:00
Sam Gateau	53642763c9	Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse	2019-08-11 21:57:36 -07:00
Sam Gateau	a96ef7b5f0	Exloring the why....	2019-08-09 18:34:36 -07:00
Shannon Romano	1011880698	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation ... (BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away	2019-08-09 17:28:46 -07:00
Sam Gateau	fe08609b0c	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-09 11:25:03 -07:00
Zach Fox	e8b93998da	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-09 09:33:13 -07:00
Shannon Romano	5e5c5a27ab	Merge pull request #16041 from Atlante45/fix/oom ... BUGZ-830: Fix memory leak in the ESS	2019-08-09 09:03:56 -07:00
Sam Gateau	67a13ee7cd	Exploring differences in the polyline rendering	2019-08-08 17:10:46 -07:00
Clement	29d017bb65	CR	2019-08-08 13:49:15 -07:00
sabrina-shanman	71bc1a4258	Make simplifiedUI default to 20:20 vision	2019-08-08 13:03:39 -07:00
Zach Fox	72e14a32f9	Implement the Help App skeleton; Implement Help App Controls; Implement Help App About	2019-08-07 17:13:20 -04:00
Clement	ec9d13700d	Break JS circular ref to help garbage collect	2019-08-07 13:19:53 -07:00
milad	b8c5192d7a	add images	2019-08-06 19:59:10 -07:00
milad	c2fddbf03a	cut down files	2019-08-06 19:55:48 -07:00
Ryan Huffman	609b533cf2	Fix create duplication key conflicting with camera orbit	2019-08-06 17:23:13 -07:00
milad	82f6c29923	updated emoji size info	2019-08-06 13:23:10 -07:00
milad	f1ff9207f9	removing empty js file	2019-08-06 13:20:15 -07:00
milad	c20933b813	removed saved emoji called and also add more info to description	2019-08-06 13:16:58 -07:00
milad	1a95c126c3	working version but taking a snapshot of added emoji code before removing for handoff	2019-08-06 13:13:38 -07:00
Sam Gateau	eb616452ec	An afternounwatchign code	2019-08-05 17:54:46 -07:00
milad	d1efbc051a	working UI	2019-08-04 15:11:55 -07:00
Sam	d84bebcc28	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-02 09:36:58 -07:00
Shannon Romano	2f6d79fb45	Merge pull request #15920 from annabrewer/combine-tone-map-resample ... BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines	2019-08-01 17:39:38 -07:00
Sam	7948fb266e	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-07-31 11:46:09 -07:00
Sam	6e2ffe14a0	better ui	2019-07-31 11:44:42 -07:00
Shannon Romano	75146a104d	Merge pull request #15982 from sabrina-shanman/bug_lod_too-low ... (BUGZ-1040) Fix LOD randomly being too low in simplified UI	2019-07-29 09:45:19 -07:00
Sam	767f413a2c	merging the various job/task/switch congif into one	2019-07-29 00:07:16 -07:00
sabrina-shanman	601b579c42	Set the LOD angle in simplifiedUI to current effective default, to be adjusted later	2019-07-25 17:32:56 -07:00
sabrina-shanman	4b5a45209e	Prefer using LODManager.lodAngleDeg for setting manual LOD	2019-07-25 17:15:22 -07:00
milad	f87e306ad4	adding extra padding to the initial textbox calculation	2019-07-25 16:35:30 -07:00
sabrina-shanman	3a4ce44633	On second thought, do not expose default octree size scale	2019-07-24 17:32:25 -07:00
sabrina-shanman	9d93a2f502	Fix simplifiedUI stuck on wrong LOD value	2019-07-24 16:27:24 -07:00
Anna	1df43fc83a	Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample	2019-07-23 15:41:01 -07:00
Shannon Romano	b799abdac1	Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled ... (BUGZ-955) Disable unnecessary picking (conservative subset)	2019-07-23 14:57:19 -07:00
sabrina-shanman	d48c8d897c	Clarify that a Grabber member function toggles both picks and pointers	2019-07-23 12:58:07 -07:00
sabrina-shanman	abac1787a6	Fix using invalid pick API functions on HMD ray pointer	2019-07-23 12:58:07 -07:00
sabrina-shanman	79d09f68fd	Disable grab.js picks when in HMD	2019-07-23 12:58:07 -07:00
Ryan Huffman	8b2c935f92	Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate ... Make Create app use Ctrl key to duplicate entities instead of Alt	2019-07-23 08:52:22 -07:00
Simon Walton	8fb28bf4e8	Whitespace changes per code review	2019-07-22 10:36:57 -07:00
Simon Walton	63c3452cf2	Restore avatar theft functionality; banner-click to appropriate menu	2019-07-19 16:35:07 -07:00
MiladNazeri	25fc4fbb8f	Merge pull request #15937 from MiladNazeri/sessionDisplayNameChange ... [BUGZ-537] :: removed session display name from nametag	2019-07-16 18:06:05 -07:00
sabrina-shanman	fcaa64b9ef	Fix teleport collision picks always enabled if user never enters HMD	2019-07-16 17:46:59 -07:00
sabrina-shanman	e043d181cd	Disable picks in controllerDispatcher when not in HMD	2019-07-16 17:46:54 -07:00
Anna	b59d967b6c	fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes	2019-07-16 15:44:28 -07:00
Shannon Romano	53a67dcfa9	Merge pull request #15872 from SamGondelman/bias ... DEV-202: Expose shadow bias and max distance to Zone Entity	2019-07-16 15:22:37 -07:00
milad	77ec048947	added change to the statusIndicator for the same thing	2019-07-16 12:23:32 -07:00
milad	53ec19dd57	removed session display name from nametag	2019-07-16 10:27:56 -07:00
PrestonB1123	526b210fcd	remembered that macs exist	2019-07-12 12:39:58 -07:00
PrestonB1123	aaf10cec39	added conditionals to shortcuts to remove overlap	2019-07-12 12:37:40 -07:00
David Rowe	f2d591dbe9	Take no action if Alt is pressed at mouse-down	2019-07-12 21:28:44 +12:00
David Rowe	db1137fa0f	Use Ctrl to duplicate entities instead of Alt	2019-07-12 21:27:33 +12:00
PrestonB1123	07c71cbadb	disabled P shortcut and re-enabled in metaverse	2019-07-11 12:05:15 -07:00
SamGondelman	6ce809fb2a	merge with master	2019-07-11 09:01:30 -07:00
Zach Fox	712d608c15	Better logic in bootstrapper to not load alread running scripts	2019-07-10 13:23:50 -07:00
Zach Fox	85b563461a	DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts	2019-07-10 12:06:08 -07:00
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00
SamGondelman	29dbbc49ad	Merge remote-tracking branch 'upstream/master' into bias	2019-07-09 15:38:13 -07:00
SamGondelman	8fd2251612	mostly working equation?	2019-07-09 13:34:33 -07:00
RebeccaStankus	714a3f6b08	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Shannon Romano	cc57e92a81	Merge pull request #15890 from zfox23/SUI/noAutoLOD ... BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users	2019-07-08 07:57:55 -07:00
Sam Gateau	f2cda426d8	Merge pull request #15884 from samcake/nut ... BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier	2019-07-06 02:18:11 +02:00
RebeccaStankus	352f9590b1	Fixed Qt.resolvedUrl format	2019-07-05 16:23:29 -07:00
Zach Fox	eb79752455	BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users	2019-07-05 12:00:17 -07:00
Samuel Gateau	28fddc2fb3	full stack for windows	2019-07-04 18:13:08 +02:00
Samuel Gateau	12cc69e41c	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-07-04 01:56:06 -07:00
SamGondelman	72f52b069e	cleanup, fix shadow qml	2019-07-03 16:21:47 -07:00
Sam Gondelman	0d9f639331	Merge branch 'master' into bias	2019-07-03 10:20:16 -07:00
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00
Samuel Gateau	3be8b80eff	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-07-03 01:01:26 -07:00
Zach Fox	ba7ed32135	Merge pull request #15874 from MiladNazeri/nameTagInBodyFix ... [Bugz-893] :: Name tag in body fix	2019-07-02 16:56:46 -07:00
milad	c7f5a5064d	removed bad log	2019-07-02 16:41:24 -07:00
milad	83546de9da	removed distance check for redraw to prevent nametag in user's body	2019-07-02 16:40:23 -07:00
SamGondelman	692c776be5	expose shadow bias and max distance wip	2019-07-02 15:18:28 -07:00
RebeccaStankus	d840723fe3	Fixed space before function params	2019-07-02 15:08:34 -07:00
RebeccaStankus	0670147bf8	Fixed paths to included files and collision with 'clamp'	2019-07-02 14:24:02 -07:00
milad	ccc4b0d9e1	added unlit property	2019-07-02 10:33:19 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00