8888 commits

Author	SHA1	Message	Date
RebeccaStankus	092424569d	Added flag to ensure mouse event signals are not connected twice	2019-10-08 12:01:47 -07:00
Zach Fox	9feab869ad	DEV-2350: Prevent duplicate default scripts from running	2019-10-08 14:48:19 -04:00
Zach Fox	42bf2bf30e	All windows 'done' except for final tweaks; debug mode still ON	2019-10-08 13:17:04 -04:00
Zach Fox	b0adf1ef02	Almost done with init screen	2019-10-07 20:29:18 -04:00
Zach Fox	a23bee19e8	Controls screen done	2019-10-07 19:52:22 -04:00
Zach Fox	643dd21f86	Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration	2019-10-07 13:22:08 -04:00
Sam Gateau	d714cc6da6	FIxing some stuff ?	2019-10-04 17:55:37 -07:00
Shannon Romano	921cec872b	Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes ... Fix for Mat4.getForward, getRight and getUp	2019-10-04 17:00:43 -07:00
Anthony J. Thibault	e3f799d039	Fix for Mat4.getForward, getRight and getUp ... It should match the results from the same methods on the Quat class.	2019-10-04 13:59:38 -07:00
RebeccaStankus	31dcbf532f	Missed a Capital letter in a function name	2019-10-04 10:10:54 -07:00
RebeccaStankus	8089653784	CR Feedback changes	2019-10-04 09:43:47 -07:00
Sam Gateau	a5ccd07347	Adding the material fields ui yeah, todo: many errors for undefined fields	2019-10-03 22:43:44 -07:00
RebeccaStankus	2f2b7b0306	Ready for CR Thank you Zach	2019-10-03 17:30:47 -07:00
Sam Gateau	a5c10abcac	Working on improving the material inspector	2019-10-03 17:04:40 -07:00
Zach Fox	0e7dff05fb	Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn	2019-10-03 12:55:02 -07:00
RebeccaStankus	1dd6aebede	Handle minimized window	2019-10-03 12:16:39 -07:00
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
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
Sam Gateau	2c412808e7	More information from the platform on mac	2019-07-02 14:48:25 +02:00
Shannon Romano	89f654175c	Merge pull request #15856 from PrestonB1123/defaultShortcuts ... DEV-173: Re-enable shortcuts	2019-06-28 15:29:53 -07:00
Preston Bezos	1315677aec	fixed doc and removed log spam	2019-06-28 15:02:33 -07:00
Preston Bezos	b9deb7bb58	formatting	2019-06-28 14:42:48 -07:00
Preston Bezos	09830dd40c	removed white space	2019-06-28 14:41:07 -07:00
Preston Bezos	d1470d3323	readded ctrl+n and ctrl+b as shortcuts with a default script	2019-06-28 14:33:03 -07:00
raveenajain	17d127ecf3	modify shadow debugger for new bias input	2019-06-28 10:07:49 -07:00
Shannon Romano	b96db7517c	Merge pull request #15836 from RebeccaStankus/create ... BUGZ-659 Fix create menu paths	2019-06-26 11:52:02 -07:00
MiladNazeri	7d6cff46ff	Merge pull request #15842 from MiladNazeri/refreshNametagLifetime ... [BUGZ 798] :: updated lifetime	2019-06-25 19:32:33 -04:00
RebeccaStankus	d8daee49a8	Fixed bad path to gridControls	2019-06-25 16:31:21 -07:00
milad	72867437be	updated lifetime	2019-06-25 15:38:02 -07:00
RebeccaStankus	e9777dc40f	Merge branch 'master' of github.com:highfidelity/hifi into create	2019-06-25 09:28:43 -07:00
Sam Gateau	8d0b7a81f5	one more	2019-06-24 17:01:11 -07:00
Sam Gateau	b0ebcc745d	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-24 15:36:28 -07:00
RebeccaStankus	6aca2fcf07	Working on new file structure	2019-06-24 14:01:51 -07:00
Zach Fox	cccc241553	Actually fix the bug	2019-06-21 16:19:09 -07:00
Sam Gateau	aa160c4d0f	Improving presentation of stats & debug information	2019-06-21 16:17:28 -07:00
Zach Fox	8044b33d65	This also works	2019-06-21 13:44:31 -07:00
Zach Fox	5067fd4cd2	OK this is definitely working	2019-06-21 13:41:11 -07:00
Zach Fox	21454f6256	Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers	2019-06-21 09:44:54 -07:00
Sam Gateau	69bb9ac0b6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-20 22:23:15 -07:00
Sam Gateau	22cd631a04	Merge And Modifying the Graphics settings and the dev menu	2019-06-20 17:48:36 -07:00
Shannon Romano	334e7414a7	Merge pull request #15811 from RebeccaStankus/migrateEditFiles ... Emergency fix to restore create in non-launcher builds	2019-06-20 17:19:39 -07:00
Zach Fox	3334e06cf4	This fixes it!	2019-06-20 16:52:46 -07:00
Anthony J. Thibault	3a6d8dc383	Disable handTouch.js to prevent finger twitching ... This PR disables handTouch.js. handTouch.js allows the fingers to animate on the surface of an object. However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them. We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality. Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range. This can cause the fingers to bend incorrectly for a moment. Also, three new items were added to the Developer > Show Animation Stats panel. * Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls. * Flow: displays if flow is active of disabled. * Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled. https://highfidelity.atlassian.net/browse/BUGZ-154	2019-06-20 15:52:36 -07:00
Zach Fox	d546550c3f	test this	2019-06-20 15:49:40 -07:00
RebeccaStankus	e7cec0f11f	Fixed dialogs imports	2019-06-20 15:07:39 -07:00
Zach Fox	d49205be74	Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers	2019-06-20 09:45:49 -07:00
Sam Gateau	b5e4a47375	Proper allocation of the resource in forward and starting to remove the ui as we have it	2019-06-19 17:33:26 -07:00
Sam Gateau	b2631e89e9	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-19 17:11:20 -07:00
Shannon Romano	3d72370d1a	Merge pull request #15792 from MiladNazeri/nametagFixes ... Bugz-504: more stable nametag updates	2019-06-19 14:07:19 -07:00
Zach Fox	8fdfdbaae4	Another attempt, still not working	2019-06-19 13:31:21 -07:00
RebeccaStankus	f5fa44dc21	Revert "Changed icons path to be relative" ... This reverts commit e277070423.	2019-06-19 12:06:34 -07:00
RebeccaStankus	e277070423	Changed icons path to be relative	2019-06-19 11:17:52 -07:00
RebeccaStankus	30dd667b17	Changed qml import method	2019-06-19 10:40:32 -07:00
Milad Nazeri	61e4155eda	cr-r1	2019-06-19 07:30:28 -07:00
Zach Fox	7a4aa1e98c	BUGZ-657; BUGZ-713: Add a copy of the system library JS files because lots of system scripts depend on them being in the default scripts location	2019-06-18 17:13:38 -07:00
Milad Nazeri	422c70f300	fixed cache and extra line	2019-06-18 14:35:00 -07:00
Milad Nazeri	6196c6b746	more stable nametag updates	2019-06-18 14:32:11 -07:00
RebeccaStankus	3b53e34c95	fixing paths	2019-06-18 11:35:00 -07:00
Sam Gateau	f30eb919c7	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-18 11:24:04 -07:00
RebeccaStankus	cd508a5475	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-18 09:10:41 -07:00
RebeccaStankus	5a49ac9a22	moved files	2019-06-17 16:45:54 -07:00
Preston Bezos	1801dc9d90	gave previous status a default value	2019-06-17 15:18:16 -07:00
Sam Gateau	e5a772a9b8	Introducing the HUD layer rendering pass into it s own task and file	2019-06-14 17:54:15 -07:00
Sam Gateau	12f8c7486b	getting rescaling to work for forward yop	2019-06-14 00:48:07 -07:00
Sam Gateau	4ba34f9a85	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-13 17:42:52 -07:00
Sam Gateau	5288314d02	Drafting ways to rescale in forward	2019-06-13 17:42:32 -07:00
RebeccaStankus	772bad58ca	Increased bottom margin on muted overlay	2019-06-13 15:55:49 -07:00
Shannon Romano	b4f708f4ad	Merge pull request #15755 from samcake/nut ... BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now	2019-06-13 14:32:36 -07:00
Zach Fox	1a0002db0c	BUGZ-676: Remove references to interstitial from SUI version of progress.js	2019-06-13 13:06:40 -07:00
Sam Gateau	b132a42e89	fixing the scroll view	2019-06-12 22:42:05 -07:00
Preston Bezos	e32d6e96ce	code was backwards	2019-06-12 16:12:24 -07:00
Preston Bezos	2eeec3518d	one last fix	2019-06-12 16:03:03 -07:00
Preston Bezos	3cd3f1a508	one last fix	2019-06-12 15:56:27 -07:00
Preston Bezos	8dcf6e6a03	removed a dead line of code, made a couple formating changes	2019-06-12 15:47:19 -07:00
Preston Bezos	29d795af5b	hopefully good now	2019-06-12 15:36:20 -07:00
Preston Bezos	8fa80f8935	fixed some formatting problems	2019-06-12 14:57:37 -07:00
Preston Bezos	038747e645	Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering	2019-06-12 14:55:37 -07:00
Preston Bezos	34e9acc0b5	better fix for the toolbar remnant	2019-06-12 14:31:43 -07:00
Zach Fox	5077ae1bd7	Merge pull request #15745 from PrestonB1123/hudRemnant ... BUGZ-355: Persistent UI Element	2019-06-12 10:40:37 -07:00
Preston Bezos	6c0bbfae76	hopefully good now	2019-06-12 10:02:33 -07:00
Preston Bezos	266c08227f	turned an else into an else if	2019-06-12 09:29:43 -07:00
Preston Bezos	a79a75702a	reverted a couple of testing changes and added a variable	2019-06-12 09:17:18 -07:00
Preston Bezos	b32a715496	fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1	2019-06-11 16:29:32 -07:00
Brad Hefta-Gaub	0a9552226d	Merge pull request #15713 from sethalves/fix-create-baked-indicator ... case BUGZ-599: CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list	2019-06-10 14:37:29 -07:00
Shannon Romano	1748d0527f	Merge pull request #15698 from samcake/nut ... BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target	2019-06-10 13:10:56 -07:00
amer cerkic	edc1018b2a	simplified the check	2019-06-10 11:12:29 -07:00
amer cerkic	4cad49f561	adding undefined check on the toolbar object	2019-06-10 10:42:31 -07:00
Seth Alves	22d602a334	CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list	2019-06-07 16:36:29 -07:00
Sam Gateau	d406e52d71	Messing around	2019-06-06 16:37:49 -07:00
Sam Gateau	55ff39edaf	Fixing an unecessary logging that was added during debug	2019-06-06 12:29:22 -07:00
Sam Gateau	34bae25d0e	fixing the broken binding dependency for the propitems	2019-06-05 00:33:44 -07:00
Zach Fox	9150cd288f	Add some logging instead of a scary popup	2019-06-04 13:36:00 -07:00
Zach Fox	19b2d35b87	Resolve DEV-99: Remove all menus from top bar	2019-06-04 13:25:03 -07:00
Sam Gateau	2a4d0cfaec	Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset	2019-06-03 18:06:28 -07:00
Zach Fox	25725bb91e	Change 'your avatars' to 'your profile'	2019-05-31 11:46:13 -07:00
Sam Gateau	b88deb52b0	Cleaning up the interface for the Performance PRESET and the associated debug ui	2019-05-30 12:03:44 -07:00
Sam Gateau	a212a8a36a	COnnect the profile tier to the performance setting and assign on first run or after reset...	2019-05-29 17:49:17 -07:00
Sam Gateau	73d1c1888c	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-05-29 15:57:14 -07:00
Dante Ruiz	022aae60cc	Merge pull request #15642 from huffman/feat/ignore-pick-intersection-in-create ... BUGZ-403: Add ignorePickIntersection to Create	2019-05-29 10:53:44 -07:00
Sam Gateau	aedc631c45	Gathering all the needed settings in one place	2019-05-28 21:55:17 -07:00
Sam Gateau	0862e40b41	Adding ui to debug render settings	2019-05-28 18:01:39 -07:00
Ryan Huffman	1894951f54	Add ignorePickIntersection to Create	2019-05-28 16:15:00 -07:00
Sam Gateau	a168109588	trying to clean up the asm for linux and macos	2019-05-28 12:27:26 -07:00
Sam Gateau	42d1b340cd	Trying to unify the getCPUID function in CPUIdent	2019-05-28 00:00:45 -07:00
Sam Gateau	546639fdfe	Adding a script and ui to check the values returned by the PlatformInfo ui	2019-05-26 12:30:50 -07:00
milad	03600f23ba	removed terenary expression	2019-05-24 14:12:36 -07:00
milad	81dd097940	added an extra line	2019-05-24 14:00:32 -07:00
milad	46475c23c1	removed log	2019-05-24 13:59:01 -07:00
milad	27c4841887	Updated Nametag to use the sessionDisplayName or the displayName as default	2019-05-24 13:57:18 -07:00
milad	83171a7cde	Merge branch 'master' of github.com:highfidelity/hifi	2019-05-24 13:55:54 -07:00
Zach Fox	f69e4cd47d	Move default scripts again and make them actually work	2019-05-24 10:05:54 -07:00
milad	fb9ad762a2	merge conflict fix	2019-05-23 22:33:11 -07:00
Zach Fox	dc370d676a	Fix BUGZ-203	2019-05-23 13:07:47 -07:00
Zach Fox	053576e29f	Move SimplifiedUI folder and create new defaultScripts.js	2019-05-23 11:31:42 -07:00
Zach Fox	46ee148a69	Fix a bug and remove magic numbers	2019-05-22 15:24:33 -07:00
Zach Fox	7a88c8362b	naming CR feedback	2019-05-22 15:01:22 -07:00
Zach Fox	3a4bf2e8f7	Fix the janky audio output settings UI	2019-05-22 14:27:06 -07:00
Zach Fox	6f7557b00d	Implement BUGZ-305 and BUGZ-306	2019-05-22 09:56:28 -07:00
Zach Fox	5749392e83	New bg color; Final status indicator design; Fixed HMD icon	2019-05-21 14:10:27 -07:00
Zach Fox	15bdb66943	Integrate Status into top bar; improve Audio settings; improve spacing between settings	2019-05-17 17:25:48 -07:00
Brad Hefta-Gaub	4e86948c25	Merge pull request #15580 from MiladNazeri/simplifiedUINametag ... changed size of always on overlays to be smaller	2019-05-17 14:42:29 -07:00
Zach Fox	e40e34856b	Remove some extra menus from top bar; Only show VR button if headset connected	2019-05-17 13:28:59 -07:00
milad	0d80761cf0	added larger distance for on	2019-05-17 13:23:03 -07:00
milad	06056b9531	updated location in main UI	2019-05-17 13:00:26 -07:00
milad	935d152617	forgot to copy a folder in to the local repo	2019-05-17 12:42:10 -07:00
milad	df098cab2f	changed size of always on overlays to be smaller	2019-05-17 12:36:03 -07:00
Zach Fox	90a5b25600	A bunch of changes here	2019-05-16 14:18:04 -07:00
Zach Fox	966965af5b	Merge pull request #15538 from zfox23/simplifiedUI ... Simplified UI v1	2019-05-14 17:45:30 -07:00
Brad Hefta-Gaub	7440ef3cf3	Merge pull request #15506 from SaracenOne/unify_primitives ... Case 19510: Unify cube and sphere edit menu entries into one.	2019-05-14 15:31:06 -07:00
Zach Fox	f9b51df296	Reduce size of output muted overlay; restore scroll to 0 on settings tab switch	2019-05-14 15:05:26 -07:00
Zach Fox	c57ddf969a	Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI	2019-05-14 09:32:07 -07:00
Zach Fox	89006cd9c5	Hide controls in top left; don't remove certain menus; fixup slider UIT	2019-05-13 17:26:19 -07:00
Shannon Romano	32d3014d0d	Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 ... case 22190: Disable triggering away state when interface focus lost	2019-05-13 13:22:28 -07:00
Shannon Romano	b1060bcb83	Merge pull request #15508 from dback2/materialTargetTooltip ... Case 22467: Fix material target tooltip	2019-05-13 13:08:28 -07:00
milad	51cbadcad1	Removed Selection related logic	2019-05-10 14:41:55 -07:00
Zach Fox	112e13383b	Dock it!	2019-05-10 12:03:29 -07:00
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00
SamGondelman	2bb522eea6	entity icons ignorePickIntersection when not visible	2019-05-09 14:16:59 -07:00
Saracen	b730c457ca	Replace tabs with spaces	2019-05-09 18:08:36 +01:00
Saracen	fd3c69a905	Replace tabs with spaces.	2019-05-09 02:14:00 +01:00
Shannon Romano	4c31c6f6e5	Merge pull request #15453 from SimonWalton-HiFi/avatar-verification ... Avatar verification	2019-05-06 08:04:06 -07:00
unknown	0da318f2cd	fix material target tooltip	2019-05-03 10:37:35 -07:00
Saracen	43ddf7ca23	Unify cube and sphere edit menu entries into one.	2019-05-02 22:40:11 +01:00
Angus Antley	c0da46453b	made correction	2019-04-30 14:34:10 -07:00
Angus Antley	5c6ea082db	changed away script to make you active if you turn on your mic	2019-04-30 14:06:18 -07:00
Simon Walton	ae68478aea	Remove avatarTheftPrototype.js	2019-04-27 23:42:28 -07:00
Simon Walton	1fe8f4332f	Fixes to banner; swap out avatar on client; reviewer comments; other WIP	2019-04-26 18:45:48 -07:00
Simon Walton	f3efee56c0	Merge remote-tracking branch 'upstream/master' into avatar-verification	2019-04-25 13:40:27 -07:00
Simon Walton	de97af5c02	Minimal working version for avatar's client ... Also merge of Wayne's proof-of-concept	2019-04-24 17:42:51 -07:00
Sam Gondelman	1540c5d203	Merge pull request #15401 from SamGondelman/grid ... Case 22229: Create Grid ignorePickIntersection	2019-04-24 12:24:27 -07:00
Shannon Romano	42fb23ed5d	Merge pull request #15435 from samcake/blackProp ... Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci	2019-04-24 09:22:11 -07:00
Shannon Romano	a6ff19c4ee	Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems ... case 22175: remove view/Independent-Mode and view/Entity-Mode menu items	2019-04-24 09:13:59 -07:00
unknown	22c2bfc075	fix material target parentIDChanged	2019-04-22 15:03:12 -07:00
Sam Gateau	6539482cc2	Merge branch 'master' of github.com:highfidelity/hifi into blackProp	2019-04-22 08:46:34 -07:00
Sam Gateau	ba02aa7098	making luci2 better	2019-04-19 16:56:55 -07:00
Sam Gateau	af3d981ad1	Bringing the Luci interface into the new Prop framework and moving some tools there too	2019-04-18 17:44:08 -07:00
Thijs Wenker	386d392144	The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = >	2019-04-18 19:05:40 +02:00
Sam Gateau	3d78592bb8	Adding more style widgets andbringing luci1 into the panels of luci2	2019-04-18 00:19:19 -07:00
Sam Gateau	9873c10353	Better canvas ICon qml and activation of the jobs	2019-04-17 17:58:48 -07:00
Thijs Wenker	dc9f8895f8	Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties ... # Conflicts: # scripts/system/html/js/entityProperties.js	2019-04-18 00:21:11 +02:00
SamGondelman	54d7bde91a	grid ignorePickIntersection	2019-04-17 10:56:55 -07:00
Sam Gateau	92c1fd69c1	Merge branch 'master' of github.com:highfidelity/hifi into blackProp	2019-04-17 10:09:20 -07:00
Sam Gateau	4ce7d75720	FInding a path	2019-04-16 23:38:40 -07:00
Sam Gateau	f6001c178d	Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp	2019-04-16 18:43:30 -07:00
Sam Gateau	f2b747a68d	Adding indentation of the folder in the header and refining background color	2019-04-16 18:15:00 -07:00
unknown	2839879657	Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix	2019-04-16 15:26:47 -07:00
Shannon Romano	ec22f7847e	Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster ... Case 22130: PR 15366 changes from v82 to Master	2019-04-16 15:17:08 -07:00
Sam Gateau	1fd88e8269	Merge branch 'master' of github.com:highfidelity/hifi into blackProp	2019-04-15 14:05:33 -07:00
Thijs Wenker	ef7c34eadd	addressed more CR feedback	2019-04-15 19:04:24 +02:00
Sam Gateau	e7e9715e10	merging up	2019-04-15 09:16:59 -07:00
unknown	d342d93ec9	fix material targets when re-opening properties to same entity	2019-04-12 14:49:59 -07:00
Thijs Wenker	00a024fde2	fixing materialTargets, after the rebase	2019-04-12 20:06:32 +02:00
Thijs Wenker	c283c062c1	CR changes	2019-04-12 19:32:05 +02:00
Thijs Wenker	8b24cf51de	enhance the multi editing experience	2019-04-12 19:32:05 +02:00
Thijs Wenker	8e97c4f3f2	multi-editing support for properties	2019-04-12 19:30:12 +02:00
Thijs Wenker	71770e3f4e	move entity selection update code to its own function	2019-04-12 19:29:36 +02:00
Thijs Wenker	aef4f28194	unused variables / missing semi-colon	2019-04-12 19:26:03 +02:00
Seth Alves	feda884c71	remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts.	2019-04-12 09:21:48 -07:00
Shannon Romano	13fb3148a5	Merge pull request #15352 from dback2/materialTargetMasterFollowup ... Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master	2019-04-11 17:53:05 -07:00
Ryan Huffman	f2474b4d2b	Fix lack of ranges on numerical types in Create	2019-04-11 14:20:52 -07:00
Sam Gateau	081fdf14ef	Merge pull request #15283 from kitely/fix-script-warnings ... case 21978: Eliminated some JavaScript warnings due to missing commas	2019-04-10 11:28:04 -07:00
unknown	ca7cfc0240	only call onMove on lastMouseEvent change	2019-04-10 09:56:35 -07:00
unknown	d63c733b85	move undo edits after creates/deletes	2019-04-08 16:05:13 -07:00
unknown	1537d4351d	CR changes from PR 15325	2019-04-08 14:07:25 -07:00
unknown	b8b9035f9d	fix avatar/shape material targets, refresh material target when parent changes	2019-04-08 13:43:22 -07:00
Thijs Wenker	98e0164964	Merge pull request #15281 from kitely/copy-grandchild-entities ... case 21980: Allow copying grandchild entities	2019-04-08 19:59:46 +02:00
Ryan Huffman	aff80dec26	Merge pull request #15325 from dback2/dynamicMaterialTargetProperties ... Case 20738: add dynamic multiselect for material target property	2019-04-05 17:55:26 -07:00
Shannon Romano	7e354a953b	Merge pull request #15276 from huffman/fix/new-properties-in-create ... Case 20739: Add new web and base properties to Create	2019-04-05 16:55:19 -07:00
Ryan Huffman	a4919320b3	Merge pull request #15277 from dback2/editHandleContinualTranslateFix ... Case 20896: Fix continual edit handle translation when moving	2019-04-05 15:40:57 -07:00
unknown	f2aa155e1e	tweak style, add scrolling	2019-04-05 15:35:37 -07:00
unknown	4f4ec064e4	add dynamic multiselect for material targets	2019-04-05 15:35:37 -07:00
Ryan Huffman	9c4b3f017f	Remove min/max on web entity maxFPS ... Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.	2019-04-05 15:08:48 -07:00
Sam Gateau	9581f5c958	separating the group header container	2019-04-05 08:44:49 -07:00
Sam Gateau	3ddde35d8f	Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp	2019-04-03 16:56:17 -07:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
Sam Gondelman	1cc2cd3194	Merge pull request #15237 from SamGondelman/particleShapes ... Case 21859: Particle Entity emitter shapes, including model	2019-04-03 11:03:33 -07:00
unknown	8dbdee4262	better fix for trailing key events	2019-04-03 09:08:29 -07:00
David Back	93fc8e2e18	fix continual translation when moving	2019-04-02 15:11:32 -07:00
Ryan Huffman	ea2e62c1ca	Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities ... Case 20826: Add damping to new dynamic entities in Create	2019-04-02 14:28:35 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
Wayne Chen	abe5748e60	Merge branch 'master' into newAudioMuteStates	2019-04-01 12:24:46 -07:00
Saracen	90e979bda7	Add option to disable triggering an away state when interface ... focus is lost.	2019-03-31 18:44:16 +01:00
Shannon Romano	c5e7c63d38	Merge pull request #15289 from roxanneskelly/Case20499 ... Case 20499 - Scripts that use AppUI don't call `that.onClosed()` if the script is restarted while the app is open	2019-03-29 17:05:21 -07:00
Shannon Romano	a83b90cdc6	Merge pull request #15044 from sethalves/lock-wearables ... case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables	2019-03-29 10:41:21 -07:00
Wayne Chen	3c65b92ff5	moving text position higher	2019-03-29 10:41:16 -07:00
Wayne Chen	248f9ba375	adding mute overlay back into HMD and have warn when muted disable in desktop	2019-03-29 10:32:13 -07:00
Ryan Huffman	bcb38b6626	Add damping to new dynamic entities in Create	2019-03-29 09:01:42 -07:00
Roxanne Skelly	44b92c542b	Case 20499 - Scripts that use AppUI don't call that.onClosed() if the ... script is restarted while the app is open	2019-03-28 16:05:24 -07:00
Roxanne Skelly	73cf51182e	Merge pull request #15262 from roxanneskelly/Case20832 ... Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.	2019-03-28 12:01:24 -07:00
Oren Hurvitz	a00c9893a1	Eliminated some JavaScript warnings due to missing commas	2019-03-28 16:06:31 +02:00
Oren Hurvitz	69ebf1629d	Allow copying grandchild entities. ... Using Copy/Paste on entities only worked for one level of children, but not for grandchildren.	2019-03-28 11:00:09 +02:00
Ryan Huffman	9abd0943ff	Add new web and other properties to Create	2019-03-27 16:29:04 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Seth Alves	e085a00256	cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open	2019-03-27 10:12:58 -07:00
Seth Alves	d25d290394	refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term	2019-03-27 10:12:58 -07:00
Seth Alves	e6c279ee5b	unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers	2019-03-27 10:12:58 -07:00
Seth Alves	fa36f12145	lock wearables when adjust-wearables page is opened	2019-03-27 10:12:57 -07:00
Seth Alves	4fe94a4b32	when new wearables are added or removed, rerun getWearablesLocked() and update UI	2019-03-27 10:12:57 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
Seth Alves	84385e6061	work around fb-21767 with a timer	2019-03-26 09:40:22 -07:00
Seth Alves	4303dd589f	make sure equip attachment-points pulled from settings are reasonable before using them	2019-03-26 09:40:22 -07:00
Seth Alves	195472bd43	make equipping of clonables more reliable	2019-03-26 09:40:22 -07:00
Wayne Chen	c54e8f5569	showing ptt text always + hmd mode switch fix	2019-03-25 17:32:03 -07:00
Roxanne Skelly	90b9de8623	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832	2019-03-25 14:48:26 -07:00
Roxanne Skelly	1608b24be1	ase 20832 - Inventory app login and cancel buttons don't work on logout	2019-03-25 14:48:17 -07:00
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -07:00
Wayne Chen	390ce9bb26	wip for getting AvatarInputsBar to switch accordingly	2019-03-22 15:34:06 -07:00
Wayne Chen	7b5deb692c	fixing x value change	2019-03-22 14:54:18 -07:00
Wayne Chen	1f71a291a5	displaying offset values	2019-03-22 14:54:18 -07:00
Wayne Chen	554a144b0e	adding tool to change avatar inputs properties	2019-03-22 14:54:17 -07:00
Wayne Chen	584fa1f17b	more wip	2019-03-22 14:54:17 -07:00
Wayne Chen	6cf8b06c6d	more wip on adding qml to adjusting ui position	2019-03-22 14:54:16 -07:00
Wayne Chen	cb715c3e55	fixing typos	2019-03-22 14:54:16 -07:00
Wayne Chen	b6ebdb5315	alpha to max value of detecting transparency	2019-03-22 14:54:16 -07:00
Wayne Chen	4cbe8cd4d1	Adding alpha to entities to enable transparency	2019-03-22 14:54:15 -07:00
Wayne Chen	ee1a14505a	adding constants, removing entity creation in cpp	2019-03-22 14:54:15 -07:00
Wayne Chen	44ed9e607b	cancelling out roll and pitch	2019-03-22 14:54:15 -07:00
Wayne Chen	87de95c63b	adding test script for creating avatar input bar	2019-03-22 14:54:14 -07:00
Wayne Chen	d0116abc52	separating out bubble icon qml - adding support for transparency	2019-03-22 14:54:13 -07:00
Wayne Chen	d834c5aca1	adding test script for creating avatar input bar	2019-03-22 14:16:29 -07:00
Wayne Chen	77b7cc2457	separating out bubble icon qml - adding support for transparency	2019-03-22 14:16:29 -07:00
Wayne Chen	d382893e75	staging avatar inputs for ignore radius	2019-03-22 14:16:28 -07:00
Roxanne Skelly	efffb8b819	Merge pull request #15239 from roxanneskelly/Case20617 ... Case 20617 - People app filter bar breaks when deleting connections	2019-03-22 11:31:46 -07:00
r3tk0n	86ffa44771	Swap flying binding to other hand.	2019-03-21 17:05:20 -07:00
Thijs Wenker	9a14cfc7df	make sure that onWebEventReceived has the correct context in VR	2019-03-21 23:46:33 +01:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00
r3tk0n	08bc47d722	Disable tablet button on off hand (translation hand).	2019-03-21 15:06:03 -07:00
r3tk0n	8f5a8d0caa	Fix typo that broke fargrab. Grip or Trigger on off hand will now manipulate.	2019-03-21 14:38:11 -07:00
Roxanne Skelly	87d75ec75c	Case 20617 - People app filter bar breaks when deleting connections	2019-03-21 12:08:42 -07:00
John Conklin II	4483e3c069	Merge pull request #15168 from danteruiz/fix-notifications-scaling ... Case 21501: Notification bar text fails to render when avatar is scaled very small	2019-03-21 09:47:55 -07:00
SamGondelman	3ff0770441	model emitters!	2019-03-20 21:25:14 -07:00
Thijs Wenker	20c3a36308	Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed ... Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]	2019-03-20 19:43:37 +01:00
Roxanne Skelly	640b05304a	Case 21392 - Excise unneeded code from marketplacesInject.js	2019-03-19 16:24:07 -07:00
Thijs Wenker	19c51b25d1	don't ignore updates that originate from entityPropertiesTool itself	2019-03-20 00:18:21 +01:00
r3tk0n	c9ade7ccb8	Add grip to fargrab.	2019-03-15 16:09:01 -07:00
danteruiz	5dab4c0010	remove white-space	2019-03-15 10:47:48 -07:00
Thijs Wenker	aeb56ff22a	EntityList -> re-focus the rename field rather then re-selecting the text fully ... EntityProperties -> ignore selection updates when nothing is changed and window is focused	2019-03-14 01:26:06 +01:00
danteruiz	1e354fb280	fix notications scaling	2019-03-12 17:18:15 -07:00
Sam Gateau	f2fc9c0102	Multiple task view	2019-03-12 16:40:28 -07:00
Wayne Chen	0279373d11	Merge branch 'master' into ptt	2019-03-11 17:09:37 -07:00
Wayne Chen	84b177996b	removing dead code	2019-03-11 16:43:26 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
Wayne Chen	36c2358dc0	Merge branch 'master' into muteWarningModified	2019-03-11 14:35:13 -07:00
Shannon Romano	864c37d310	Merge pull request #15155 from sethalves/fix-clonables ... Fix cloneables	2019-03-11 14:17:20 -07:00
Seth Alves	e515e9cc66	fix cloneEntity function	2019-03-11 12:38:54 -07:00
Seth Alves	2fb5e1ebc2	quiet some logging	2019-03-11 12:36:29 -07:00
Roxanne Skelly	e4e8a61328	Case 21326 - missing marketplaceInject.js ... The re-addition of marketplaceInject.js didn't merge from 80 for some reason.	2019-03-11 10:46:51 -07:00
r3tk0n	ec0cf3ee3a	Fix typo.	2019-03-11 09:58:20 -07:00
Sam Gateau	530b871eef	Getting the group styled and scrollview working all together	2019-03-11 00:08:31 -07:00
Wayne Chen	3dcc53a945	Merge branch 'master' into ptt	2019-03-10 17:14:54 -07:00
Sam Gateau	6da3165754	Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp	2019-03-08 18:45:36 -08:00
Sam Gateau	a303f803eb	BReaking group	2019-03-08 18:14:38 -08:00
Shannon Romano	ca87e217bd	Merge pull request #15097 from wayne-chen/audioSettingsModified ... Case 21562: Audio settings screen	2019-03-08 16:22:52 -08:00
Wayne Chen	18b86d550d	adding PushToTalk action	2019-03-08 16:07:48 -08:00
r3tk0n	5f48a6d104	Fix typo.	2019-03-08 16:07:47 -08:00
r3tk0n	24d6646e8d	Fix activation / deactivation criteria for PTT controller module.	2019-03-08 16:07:47 -08:00
r3tk0n	3b274c2b6e	Enable pushToTalk.js controller module.	2019-03-08 16:02:16 -08:00
r3tk0n	f6add9cafd	Add pushToTalk.js controllerModule.	2019-03-08 16:02:15 -08:00
Wayne Chen	b7d44403e1	updating compile failure + icons/settings update	2019-03-08 16:02:15 -08:00
Wayne Chen	7cb17b2d6e	laying groundwork for audio app + fixing deadlocks	2019-03-08 16:02:14 -08:00
r3tk0n	15d49fd9a9	Initial implementation (deadlocks still occurring in Audio.cpp)	2019-03-08 16:02:14 -08:00
Roxanne Skelly	e94d248ac5	Merge pull request #15126 from howard-stearns/domainUnlimited ... unlimited certified copies in a domain	2019-03-08 10:23:42 -08:00
Sam Gateau	1b371c07ff	Merge branch 'master' of github.com:highfidelity/hifi into blackProp	2019-03-08 09:47:59 -08:00
Sam Gateau	5b8116bec4	make the group foldable	2019-03-07 17:52:11 -08:00
Shannon Romano	e776cf2627	Merge pull request #15127 from danteruiz/fix-websurface-module ... Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called	2019-03-07 16:04:57 -08:00
Shannon Romano	45ab5efcef	Merge pull request #15121 from danteruiz/fix-stylus-gizmo ... Case 21603: Tablet x button is nearly impossible to hit with stylus	2019-03-07 16:03:13 -08:00
Shannon Romano	b567fd6cac	Merge pull request #15105 from danteruiz/disable-entity-scaling ... Case 20830: Disable entity scaling while grabbing	2019-03-07 16:01:34 -08:00
Shannon Romano	37727c8b60	Merge pull request #14938 from dback2/draggableNumberDisabled ... Case 20662: Entity Properties - fix disabling draggable numbers	2019-03-07 15:33:21 -08:00
danteruiz	87cfbe48d1	fix webSurfaceIntersection	2019-03-07 13:11:18 -08:00
danteruiz	05dc30a740	more requested changes	2019-03-07 10:49:37 -08:00
danteruiz	9ca3805499	making requested changes	2019-03-07 10:27:16 -08:00
Howard Stearns	97bfa538ff	unlimited certified copies in a domain	2019-03-07 09:51:20 -08:00
Sam Gateau	f7896b6407	Better propGroup	2019-03-06 22:24:43 -08:00
Sam Gateau	26b581fc74	Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp	2019-03-06 18:42:11 -08:00
SamGondelman	96eb137df2	fix debugAvatarMixer.js	2019-03-06 15:53:25 -08:00
Roxanne Skelly	a54171d60c	Merge pull request #15104 from roxanneskelly/79hero-master ... merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master	2019-03-06 13:06:45 -08:00
Shannon Romano	fc2f1ff994	Merge pull request #14955 from thoys/fix/create/reloadCrash ... Case 18299: Remove workaround for Interactive window crash now that it is fixed	2019-03-06 12:46:00 -08:00
Sam Gateau	c540016af6	This is working !!!!	2019-03-05 20:22:19 -08:00
Sam Gateau	206bc0addb	Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp	2019-03-05 17:48:58 -08:00
danteruiz	272ca5dc1c	disable entity scaling	2019-03-05 16:23:40 -08:00
Roxanne Skelly	fae6393663	Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42'	2019-03-05 15:11:25 -08:00
Roxanne Skelly	3ef02085ff	Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'	2019-03-05 15:07:49 -08:00
Sam Gateau	4959452c79	Dynamic creation of the propItem in the propGRoup!	2019-03-05 14:27:32 -08:00
Sam Gateau	e4518ba234	Fixing the bins and exploring the REpeater	2019-03-04 23:44:14 -08:00
Sam Gateau	3d2614498b	ANd fuck	2019-03-04 18:07:02 -08:00
Wayne Chen	19ac8cae31	culling mute state	2019-03-04 14:18:10 -08:00
Wayne Chen	4187104b17	culling mute state	2019-03-04 14:12:09 -08:00
Seth Alves	216b53dcb0	attempt to take background noise into account when triggering mute warning	2019-03-04 13:47:55 -08:00
Seth Alves	f83f2b8226	keep muted warning in center of view for HMD	2019-03-04 13:47:55 -08:00
Seth Alves	3ecd86caee	add a way to disble muted warning from audio panel. ... fix positioning of warning. hide warning when removing timer.	2019-03-04 13:47:55 -08:00
Seth Alves	d54d0280c2	rework audioMuteOverlay.js	2019-03-04 13:47:54 -08:00
Wayne Chen	90a6e0d9b0	changing mute warning position	2019-03-04 11:42:43 -08:00
Seth Alves	bbad6af0d6	attempt to take background noise into account when triggering mute warning	2019-03-04 11:08:07 -08:00
Seth Alves	76aa6fb1b9	keep muted warning in center of view for HMD	2019-03-04 11:08:06 -08:00
Seth Alves	38256df0f2	add a way to disble muted warning from audio panel. ... fix positioning of warning. hide warning when removing timer.	2019-03-04 11:08:06 -08:00
Seth Alves	3f52361753	rework audioMuteOverlay.js	2019-03-04 11:08:06 -08:00
Shannon Romano	6d297d91f6	Merge pull request #15073 from danteruiz/fix-tablet-button-rotation ... Case 21512: Very difficult to use the close button on the tablet (0.81.0)	2019-03-04 10:49:16 -08:00
Sam Gateau	fe23ef1485	Adding the prop library	2019-03-03 23:35:40 -08:00
r3tk0n	12ffa41984	Prevent HUD and Web Surface lasers from interrupting FarGrab.	2019-03-02 13:55:06 -08:00
Simon Walton	83c9381575	Convert avatarPriority to trivalued (inherit, crowd, hero) ... Also tweaks from original reviewer comments.	2019-03-01 17:25:46 -08:00
Sam Gateau	cc9a3e2541	Merge pull request #15052 from amerhifi/quest-demo ... case 21485: removing quest-demo specific changes	2019-03-01 15:03:44 -08:00
Jason Najera	d41c2d296b	Merge pull request #15043 from r3tk0n/fargrab-manipulation ... FarGrab Entity Rotation with Off-Hand	2019-03-01 14:42:59 -08:00
danteruiz	618a1d5b83	fix tablet button and gizmos rotation	2019-03-01 14:31:12 -08:00
Jason Najera	6346df54af	Merge pull request #15061 from r3tk0n/away_bubble_protection ... [MS#21495] Enable Bubble/Shield on Away	2019-03-01 11:17:48 -08:00
amer cerkic	6ebc57994b	Merge branch 'master' into quest-demo	2019-03-01 10:23:41 -08:00
Shannon Romano	33e061b09b	Merge pull request #15022 from danteruiz/fix-tablet-scaling ... Case 21424: Tablet does not properly resize when scaling avatar.	2019-03-01 09:37:47 -08:00
SamGondelman	8d5a3debfa	fix chat.js textSize	2019-02-28 15:28:18 -08:00
r3tk0n	1476251dcb	Enable bubble on AFK, respect user setting upon return from AFK.	2019-02-28 15:21:24 -08:00
amerhifi	35dc13e06a	Merge branch 'master' into quest-demo	2019-02-28 14:06:47 -08:00
danteruiz	f715dbe243	fix tablet scaling	2019-02-28 13:32:12 -08:00
r3tk0n	a72b02cd25	Clean up code and add comments.	2019-02-28 13:08:05 -08:00
r3tk0n	3a5698236b	Swap FarGrab from superpower to alternative version from PR#15043	2019-02-27 10:57:35 -08:00
r3tk0n	1ec887ffc2	Fix teleportation play area indicator not hiding on cancel.	2019-02-27 10:51:38 -08:00
r3tk0n	fcdfae5a67	Fix notion of hand dominance.	2019-02-27 08:39:35 -08:00
r3tk0n	7c515ccd45	Add 2x rotation multiplier.	2019-02-26 19:16:45 -08:00
r3tk0n	ca740c6254	Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab.	2019-02-26 18:44:00 -08:00
r3tk0n	52d80476a8	Fix activation criteria.	2019-02-26 17:55:16 -08:00
r3tk0n	9559f9ffd3	Add off-hand controller manipulation to fargrab.	2019-02-26 17:52:18 -08:00
SamGondelman	4d591e0624	fix web interaction and debug print filling logs	2019-02-26 16:30:31 -08:00
r3tk0n	a093fe5c4f	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-26 15:08:57 -08:00
r3tk0n	2077e012db	Fix case of repeated manipulations with fargrab.	2019-02-26 15:00:44 -08:00
r3tk0n	f3b65d06ad	Fix frame of reference for rotations.	2019-02-26 12:46:46 -08:00
r3tk0n	2a04d2b9c5	Closer...	2019-02-26 12:39:51 -08:00
r3tk0n	0b651a8d63	Fix fargrab rotation with dominant hand, need to fix activation criteria next.	2019-02-26 11:29:06 -08:00
Shannon Romano	badd0b8bd3	Merge pull request #14968 from davidkelly/dk/20726 ... Guard against accidentally calling wrong api/v1/places endpoint	2019-02-25 17:16:33 -08:00
r3tk0n	52b62784d6	Incremental, broken progress.	2019-02-25 14:10:48 -08:00
amer cerkic	0775392759	adding market place back to the default scripts	2019-02-25 14:05:54 -08:00
r3tk0n	a66c76bf38	Fixing typos.	2019-02-25 13:47:31 -08:00
r3tk0n	5d3a778b0b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation	2019-02-25 13:10:47 -08:00
r3tk0n	d79681470e	Saving changes before merging master...	2019-02-25 13:10:25 -08:00
r3tk0n	c6a3496b25	Add utility functions for adjusting target rotation and position.	2019-02-24 12:36:44 -08:00
Sam Gateau	dab0df1113	Trying to fix the damn gamma	2019-02-22 18:03:23 -08:00
amer cerkic	f04fdb2187	added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user	2019-02-22 09:11:24 -08:00
amer cerkic	9097d9c57c	working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.	2019-02-21 16:33:25 -08:00
r3tk0n	58906d84eb	Add grip button polling.	2019-02-21 15:22:21 -08:00
shanzzam	adb6f559dc	Changing twitter handle from inc to VR	2019-02-20 18:31:32 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
David Kelly	2202b69575	Guard against accidentally calling wrong api/v1/places endpoint ... spaces	2019-02-20 13:09:29 -07:00
r3tk0n	7092513b7d	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 17:42:58 -08:00
Simon Walton	8033e93eda	Add avatar-priority boolean to zone entities ... RC-79 version	2019-02-19 17:38:37 -08:00
Dante Ruiz	6189aff6b3	Merge pull request #14933 from danteruiz/pick-manager-perf ... Case 21271: Remove unnessary picks for quest	2019-02-19 14:20:56 -08:00
r3tk0n	ebbf48a11b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
r3tk0n	03058775f6	Remove debug prints.	2019-02-19 11:27:13 -08:00
r3tk0n	f52b096bb9	Change far grab to chorded input 'superpower'	2019-02-19 11:26:42 -08:00
John Conklin II	051ab61b66	Merge pull request #14951 from SamGondelman/ssao ... Case 20993: Fix AO	2019-02-19 11:19:03 -08:00
SamGondelman	27f05db825	fix ao	2019-02-18 01:12:00 -08:00
SamGondelman	1163cbea70	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00
SamGondelman	7677e3bf44	just in case	2019-02-16 20:41:57 -08:00
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
danteruiz	b00746c096	Trim picks in use during quest:	2019-02-15 16:24:17 -08:00
Thijs Wenker	46768c2a6e	remove the code that prevented the crash from happening, since it is not reproducible anymore	2019-02-16 00:42:19 +01:00
David Back	e46b947913	properly disable draggable numbers, fix disable script and collision sound	2019-02-15 15:31:11 -08:00
Roxanne Skelly	1154414a07	remove unneeded marketplaceInject.js	2019-02-15 12:36:35 -08:00
David Back	158e255319	Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities ... Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js	2019-02-15 11:25:42 -08:00
David Back	af25a7bf6e	Merge pull request #14919 from dback2/selectAllClearAll ... Case 19930: Entity List - add select/clear all to entity type dropdown	2019-02-15 10:12:30 -08:00
David Back	e944e284a6	design feedback	2019-02-14 17:37:58 -08:00
David Back	f6baa2432a	design feedback	2019-02-14 17:27:05 -08:00
David Back	46ff3a8405	add select/clear all buttons to entity type dropdown	2019-02-14 16:16:33 -08:00
Ryan Huffman	e800a6e030	Update hard-coded vec3 zero with Vec3.ZERO	2019-02-14 15:56:17 -08:00
Shannon Romano	453c081d9b	Merge pull request #14901 from huffman/fix/dropdown-close-on-click ... Case 19999: Update edit.js to auto close dropdowns when clicking outside	2019-02-14 14:48:03 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
SamGondelman	b418e43ef2	ctrlaltdavid's minitablet fix	2019-02-12 13:15:58 -08:00
Ryan Huffman	2728654d35	Fix duplicating non-dynamic grabbed entities in edit.js	2019-02-12 10:09:28 -08:00
Ryan Huffman	fcfb1b7a4a	Update edit.js to auto close dropdowns when clicking outside	2019-02-12 10:06:25 -08:00
Sam Gateau	afb6c838eb	REverting all the changes from the brown branch not used	2019-02-11 20:13:37 -08:00
Sam Gateau	8a4f7fe2b6	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-11 18:57:33 -08:00
SamGondelman	a9767e4c22	working on mini tablet	2019-02-11 15:46:29 -08:00
Ryan Huffman	16b48046c6	Fix not being able to type text into particle url field	2019-02-11 15:27:30 -08:00
SamGondelman	f53ccf7363	fix create, working on mini tablet	2019-02-11 14:54:53 -08:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub	8faff57033	Merge pull request #14830 from thoys/fix/create/zoneShapeVisualizersIgnorePickray ... MS20909: ignore pickRay for zone shape visualizers	2019-02-08 19:12:58 -08:00
John Conklin II	b46fb7cfe7	Merge pull request #14860 from thoys/fix/create/entityListUnderscoreFirstSorting ... Case 19385: local compare in entity list sorting	2019-02-08 14:56:32 -08:00
Sam Gateau	48d671c6c3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-07 18:54:19 -08:00
SamGondelman	e74ff18bef	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
Cristian Duarte	babb972d89	Merge remote-tracking branch 'hifi/master' into android_handshake	2019-02-07 14:44:22 -03:00
Sam Gateau	632d6e8a73	Merge pull request #14863 from danteruiz/android-apps-directories ... Case 20877: Support CMake time configuration of QmlFileSelectors	2019-02-07 09:30:49 -08:00
Dante Ruiz	f07b5c8490	update urls	2019-02-06 14:25:25 -08:00
Sam Gateau	8ec9c8502d	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-06 12:09:38 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -08:00
Shannon Romano	61459d5756	Merge pull request #14775 from roxanneskelly/QmlMarketplace ... Qml marketplace	2019-02-06 11:20:49 -08:00
Thijs Wenker	2247dd3471	local compare in entity list sorting	2019-02-06 18:24:40 +01:00
Sam Gateau	d8f6583047	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-06 09:01:38 -08:00
Sam Gateau	35491bf5b0	Multisampling works in 4.1	2019-02-06 00:05:17 -08:00
danteruiz	30bd9774b2	script engine to load platform specific files	2019-02-05 13:11:54 -08:00
Sam Gateau	4089f8c5b0	Adding Color filter to the tone mapper	2019-02-04 23:45:35 -08:00
Roxanne Skelly	78aa1783a0	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-04 15:04:55 -08:00
Roxanne Skelly	e23c589de7	QmlMarketplace - fix issue with footer not appearing in marketplaces list	2019-02-04 15:04:18 -08:00
Roxanne Skelly	39ad36a4d0	QmlMarketplace - bugfixes and Markup rendering of descriptions ... * Render markup in descriptions (bold, italic, quote, etc.) * Back button from marketplaces list now works properly * Layout fixes	2019-02-01 15:27:17 -08:00
SamGondelman	c6080d0795	fix edit selection + log problem	2019-02-01 14:37:42 -08:00
SamGondelman	ba8320f561	fix 2d overlay deletion	2019-02-01 14:31:26 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
Thijs Wenker	80f5cbc8ab	also ignore picking on the material entity	2019-01-31 22:14:15 +01:00
Thijs Wenker	ca4695377f	also ignore picking on the material entity	2019-01-31 22:12:35 +01:00
Thijs Wenker	15066faaf7	ignore pickRay for zone shape visualizers	2019-01-31 19:45:29 +01:00
Thijs Wenker	fbdae18245	ignore pickRay for zone shape visualizers	2019-01-31 19:38:20 +01:00
Gabriel Calero	6a665835e7	Merge remote-tracking branch 'upstream/master' into android_handshake	2019-01-30 17:06:41 -03:00
SamGondelman	7d47bfa2e4	david's comments	2019-01-30 11:50:32 -08:00
SamGondelman	834e44dd3a	make polyline's with faceCamera not depend on normal	2019-01-30 11:02:24 -08:00
Ryan Huffman	9c8e21ec6b	Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren ... MS20893 [CreateApp] Ignore children of mismatching entityHostTypes	2019-01-30 09:55:39 -08:00
Thijs Wenker	132d293c3c	skip child entities of mismatching entityHostType when copy/delete/duplication of entities	2019-01-30 03:15:32 +01:00
r3tk0n	1751864042	Fix this references in module run function.	2019-01-29 16:13:11 -08:00
Roxanne Skelly	0fdbca8ade	QmlMarketplace Bugfixes ... * Fix upgrades * Certificate 'View in Marketplace' wasn't working * command-line hifiapp:MARKET wasn't launching * Home link wasn't disappearing where it should * Log In button on marketplace wasn't working * Other minor UI bugfixes	2019-01-29 16:07:27 -08:00
Jeff Clinton	08a3e65f66	Merge pull request #14789 from danteruiz/recenter-hmd-log-window ... Case 20771: Make sure that the script log is in the correct location when switching to and from HMD	2019-01-29 13:03:43 -08:00
r3tk0n	4d2ee07512	Change deactivation criteria as per conversation between Joshua and Mukul.	2019-01-29 12:02:23 -08:00
SamGondelman	9aae9d13f6	fix tablet home button	2019-01-28 22:19:31 -08:00
SamGondelman	a8dbe5e761	working on build errors	2019-01-28 21:10:24 -08:00
SamGondelman	6ad0b3412a	showKeyboardFocusHighlight + fixes	2019-01-28 20:43:47 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
SamGondelman	445608e163	fix entity selection tool	2019-01-28 15:30:19 -08:00
Roxanne Skelly	a4d105f24f	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-28 15:17:08 -08:00
Roxanne Skelly	2fe78383ed	QmlMarketplace - Fix issues found during test ... * command line --url hifiapp:MARKET was not bringing up correct marketplace * Search field was not being cleared when 'home' button was clicked after a search * tablet button was not lit when marketplace was launched	2019-01-28 15:14:49 -08:00
Shannon Romano	1aa6221f57	Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips ... MS20333: [CreateApp] add missing Material Entity tooltips	2019-01-28 14:18:46 -08:00
Dante Ruiz	20d933ce6e	recenter log window when enter and exiting hmd mode	2019-01-28 13:58:29 -08:00
John Conklin II	c95b681092	Merge pull request #14696 from thoys/feat/create/showZonesInCreate ... MS20292 - [CreateApp] Make it easier to see zones while you're editing them	2019-01-28 11:41:42 -08:00
Jeff Clinton	9d09c777d2	Merge pull request #14778 from thoys/fix/create/ignoreScriptedKeyEventsFromJSONEditor ... MS20501 [CreateApp/Properties] ignore scripted key events from the JSON Editors	2019-01-28 11:40:48 -08:00
Thijs Wenker	b75c4ae3b6	fix spelling	2019-01-28 20:26:04 +01:00
Roxanne Skelly	d3cffa50d6	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-28 11:11:28 -08:00
Jeff Clinton	a80d842107	Merge pull request #14777 from thoys/fix/create/entityListColumnSortOrder ... MS19766: [CreateApp/Entity List] Default column order, always move empty values to bottom on initial sort of column	2019-01-28 09:25:33 -08:00
Thijs Wenker	bfb93e67b7	materialRepeat will clamp when disabled.	2019-01-28 16:46:35 +01:00
Thijs Wenker	ef1018c49b	- EntityShapeVisualizer.updateSelection -> EntityShapeVisualizer.setEntities (for a more generic use) ... - GridPattern -> Material - Replaced stringified compare with deep compare - Copied+modified zone icon (consistent color, removed sharp edges)	2019-01-28 16:10:29 +01:00
Thijs Wenker	c1eeab6542	Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate	2019-01-28 14:32:27 +01:00
Shannon Romano	1584311689	Merge pull request #14745 from sabrina-shanman/material-inspector ... (case 20748) Add material inspector to Luci.js	2019-01-25 17:35:07 -08:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
Roxanne Skelly	dfac0d88a2	QmlMarketplace - Add 'logged out' behavior, fix issue with search scope ... display	2019-01-25 16:41:13 -08:00
Roxanne Skelly	6123c4ec96	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-25 13:45:04 -08:00
Jeff Clinton	efb278b258	Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch ... fix for continuous color picker update loop	2019-01-25 10:38:14 -08:00
Thijs Wenker	e2dc86261e	add missing Material Entity tooltips	2019-01-25 05:16:04 +01:00
Thijs Wenker	992ce9f875	ignore scripted key events from the JSON Editors	2019-01-25 04:41:36 +01:00
Thijs Wenker	85e26e949b	fix issue where empty values are always on bottom on default ascending columns	2019-01-25 04:02:19 +01:00
Thijs Wenker	ae2e85d802	entity list, default column sort orders, when in default order always move empty values to bottom	2019-01-25 03:22:27 +01:00
Roxanne Skelly	cfaf01b22a	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-24 17:21:16 -08:00
Roxanne Skelly	c1ff51a02d	QML Marketplace ... Checkpoint full functionality	2019-01-24 17:20:42 -08:00
r3tk0n	80abfbab5e	Modify teleport to 'superpower' spec.	2019-01-24 14:22:01 -08:00
r3tk0n	690f67c9d9	Add variable for teleport deadzone on y-axis.	2019-01-24 14:21:18 -08:00
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
Thijs Wenker	b2f1657096	grid pattern	2019-01-23 19:28:34 +01:00
David Back	89032698eb	newline	2019-01-22 18:24:09 -08:00
David Back	ea5705907b	fix shape type and compound shape URL properties/tooltips	2019-01-22 18:22:13 -08:00
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
r3tk0n	d3c1843d45	Disable toggleAdvancedMovementForHandControllers.js until such time the Controller.Standard.RY binding can be fixed.	2019-01-21 15:40:12 -08:00
Roxanne Skelly	8010d86210	QML Marketplace support ... Support QML UI for the Marketplace as some devices do not handle web on 3d surfaces. Checkpoint code	2019-01-21 13:39:16 -08:00
Thijs Wenker	93516423bb	zone visualizer prototype	2019-01-21 17:25:06 +01:00
sabrina-shanman	556a2ec3b6	Add material inspector to Luci.js	2019-01-18 18:15:44 -08:00
Shannon Romano	11b8ae6d44	Merge pull request #14710 from sethalves/mouse-grab-with-traits ... case 15962: case 20481: Mouse grab with traits	2019-01-18 11:56:41 -08:00
Seth Alves	c8e9bff03a	fix releaseGrab call on grabbed entity when a nearGrab ends	2019-01-17 13:34:36 -08:00
Seth Alves	b1c34eb9ec	update queryAACube during grab rather than only when grab is released	2019-01-15 16:01:44 -08:00
Seth Alves	b5326936d8	grab.js will now ignore click-to-equip entities	2019-01-15 14:17:51 -08:00
Seth Alves	e8676f63c6	release grab if scripts are reloaded before grab is released	2019-01-15 13:44:03 -08:00
Seth Alves	2515c7f73e	remove old-style grabbing scripts	2019-01-15 13:43:52 -08:00
Seth Alves	174c79d66d	use new-style far-grabbing code for mouse grabs	2019-01-15 13:43:51 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
Thijs Wenker	6cabc86130	fix for continuous color picker update spam / only update color picker from properties when entity selection has changed	2019-01-14 18:54:28 +01:00
Anthony Thibault	5d606981de	Added HMD Avatar Alignment Type ... Adds a new API to set this type, and an option to the Avatar App. * "eye" - Match the user eyes with the avatar eyes. The previous default behavior. If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down. * "head" - Match the user head with the avatar head. The new default behavior. This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.	2019-01-08 18:35:28 -08:00
Thijs Wenker	24022f0ccc	add missing Text properties to Create App	2019-01-08 20:38:31 +01:00
John Conklin II	00a9367f14	Merge pull request #14662 from dback2/addGridEntitiesToCreate ... Add grid entities to create	2019-01-08 10:12:34 -08:00
Jamil Akram	4c6b14bf72	Merge pull request #14642 from dback2/propertyRangeAudit ... Entity property range/step audit	2019-01-08 09:42:59 -08:00
John Conklin II	ed4f2d9c10	Merge pull request #14439 from AndrewMeadows/shaped-zones ... Case 15518: shaped zones	2019-01-08 09:06:45 -08:00
David Back	d9e229d38e	remove add Grid entity button, fix color	2019-01-07 18:20:20 -08:00
David Back	90e2feb977	replace placeholder icon with real icon from Alan	2019-01-07 18:20:20 -08:00
David Back	7581c77be8	update tooltips, use Cube icon for now	2019-01-07 18:20:20 -08:00
David Back	e0e9a7de15	tabs	2019-01-07 18:20:20 -08:00
David Back	9013eee352	add grid entities to create - icons pending	2019-01-07 18:20:19 -08:00
David Back	3aa245036b	Merge branch 'master' into propertyRangeAudit	2019-01-07 15:36:18 -08:00
Thijs Wenker	7823b3d4a3	clarifying comments	2019-01-07 21:08:41 +01:00
Thijs Wenker	7d9cad3e8e	CreateApp - Fix active colorPicker to update on selection update	2019-01-07 20:35:09 +01:00
David Back	5aa5b997fe	remove logs	2019-01-07 11:33:08 -08:00
David Back	2f99729905	add rect case, fix step rounding	2019-01-07 11:31:04 -08:00
David Back	56007c8512	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-07 10:50:45 -08:00
Shannon Romano	8acae02203	Merge pull request #14660 from thoys/feat/create/newFirstClassImageProperties ... MS20170: Update Image/Text Entity properties in Create with new properties	2019-01-07 10:45:15 -08:00
David Back	d25948fbd3	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-07 10:36:27 -08:00
Jeff Clinton	75d26dc45f	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars	2019-01-07 08:58:09 -08:00
Thijs Wenker	26f46e87a3	new property tooltips	2019-01-05 02:16:12 +01:00
Thijs Wenker	48dc7ee938	New color/text entity properties	2019-01-05 01:56:28 +01:00
David Back	5ea84fb952	CR fixes	2019-01-04 15:39:27 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Andrew Meadows	a642af23b7	enable shapeType=ellipsoid and expose zone shapeType to UI	2019-01-04 12:37:23 -08:00
David Back	eff9d11437	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-04 11:07:28 -08:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -08:00
Seth Alves	b2f25629eb	don't allow scaling of others' equipped entities	2019-01-03 08:19:18 -08:00
Seth Alves	306c54c060	fix code that allows adjusting of own avatar entities while forbidding adjusting those of others	2019-01-03 08:17:52 -08:00
Seth Alves	bf46960dc3	fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities	2019-01-03 08:17:52 -08:00
Seth Alves	54a5805b5c	add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities	2019-01-03 08:17:52 -08:00
Seth Alves	9bf9e379a3	fix far-grab initial rotation and entity-method call	2019-01-03 08:17:52 -08:00
Seth Alves	613f290226	don't attempt to grab other's avatar-entities	2019-01-03 08:17:52 -08:00
Seth Alves	895e8cdba1	fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again	2019-01-03 08:17:52 -08:00
Seth Alves	0967a94557	get grabbing and scaling to get along better	2019-01-03 08:17:52 -08:00
Seth Alves	905af34564	disable traits-based grabbing by default	2019-01-03 08:17:52 -08:00
Seth Alves	6a547d042c	port over PR-14276	2019-01-03 08:17:52 -08:00
Seth Alves	1c1e648b8b	port over PR-14429	2019-01-03 08:17:52 -08:00
Seth Alves	9900040ece	enable trait-based grabbing by default	2019-01-03 08:17:52 -08:00
Seth Alves	70b68294ff	port over PR-14464	2019-01-03 08:17:52 -08:00
Seth Alves	6f25c59a0c	turn-off nearEntityGrab when scaleEntity is active	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
David Back	937aa718ae	remove selected particle property defaults	2019-01-02 18:22:55 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
Ryan Huffman	f3d2d7c95b	Merge pull request #14638 from huffman/fix/entity-list-text-mb ... Fix texture MB column not sorting correctly in entity list	2019-01-02 13:32:05 -08:00
unknown	f8f13e974d	property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties	2019-01-02 11:12:10 -08:00
Jeff Clinton	032178673a	Merge pull request #14634 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities (#2)	2019-01-02 09:00:56 -08:00
Brad Hefta-Gaub	440f517b88	Merge pull request #14602 from samcake/punk ... Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera	2018-12-27 15:43:17 -08:00
Ryan Huffman	9c60b09c6b	Fix texture MB column not sorting correctly in entity list	2018-12-27 14:50:12 -08:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
sam gateau	26c9d7a94e	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:22:19 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
sam gateau	49df69e609	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:17:02 -08:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
Sam Gateau	8fba8062c3	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-19 20:01:48 -08:00
Wayne Chen	c36b3a4b07	fix	2018-12-19 12:46:41 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
sam gateau	d8e7305f4a	Removing hili for now	2018-12-18 09:16:40 -08:00
Sam Gateau	76f204b5aa	Exploring the hologram	2018-12-18 00:45:12 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
Sam Gateau	30277213c6	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-13 20:40:50 -08:00
sam gateau	94ae345daf	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-13 08:45:29 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
SamGondelman	770da220d7	cleanup entity properties more and start polyline work, remove lines	2018-12-12 16:47:35 -08:00
Wayne Chen	0a0b7bf1ad	removing onUsernameChanged signal to alter login settings	2018-12-12 16:26:35 -08:00
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Sam Gateau	8599a340ed	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-11 19:02:48 -08:00
Shannon Romano	efedc1f0b5	Merge pull request #14563 from danteruiz/teleport-settings ... Adding menu settings to disable teleporting	2018-12-11 21:08:23 +00:00
Zach Fox	826644ef08	Merge pull request #14559 from zfox23/MS20161_updatesDot ... Fix MS20161: Fix INVENTORY notification dot state	2018-12-11 13:03:26 -08:00
Jeff Clinton	e88e15fd94	Merge pull request #14560 from zfox23/MS4382_handshakeSparkles ... Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-11 11:51:54 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Zach Fox	75ba1cb3c7	I forgot to clear dot immediately	2018-12-11 10:30:12 -08:00
sam gateau	9ffe38f40c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-10 15:13:58 -08:00
Zach Fox	3b9777d5d5	Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-10 14:08:38 -08:00
Zach Fox	ab6aeae91a	Fix MS20161: Fix INVENTORY notification dot state	2018-12-10 13:01:28 -08:00
Zach Fox	ed99da2165	Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page	2018-12-10 11:15:27 -08:00
sam gateau	4ab003091a	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-10 08:30:53 -08:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub	26ccfb2533	Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning ... Mini tablet tuning	2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub	1e9faa7754	Merge pull request #14276 from ctrlaltdavid/M19345 ... Make create apps not grab tablet if editing an entity with hand	2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub	0425ae1231	Merge pull request #14239 from ElderOrb/FB19219 ... FB19219 - Make avatarapp to handle wearables update via drag&drop	2018-12-09 17:20:13 -08:00
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Sam Gondelman	ccdf1c8614	Merge branch 'master' into NOverlays4	2018-12-07 14:27:34 -08:00
Sam Gondelman	4c5ff0dc3e	Merge branch 'master' into NOverlays3	2018-12-07 14:26:59 -08:00
John Conklin II	2d52fffa4b	Merge pull request #14460 from huffman/fix/lifetime-slider-alt ... Change lifetime back to a regular input field	2018-12-07 13:43:08 -08:00
Ryan Huffman	a42a771df5	Merge pull request #14540 from huffman/feat/hide-certified-urls ... Add hiding of certified properties in Create	2018-12-07 13:42:23 -08:00
Thijs Wenker	3a259d8525	Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2 ... # Conflicts: # scripts/system/html/js/entityProperties.js	2018-12-07 20:24:21 +01:00
Ryan Huffman	bf844e0472	Add hiding of certified properties in Create	2018-12-07 11:05:52 -08:00
Ryan Huffman	f42c31ca36	Update number property to reuse numberdraggable emit function	2018-12-07 11:02:31 -08:00
Ryan Huffman	c9ab5c23ea	Add support for min/max/step/defaultValue on number field	2018-12-07 11:02:31 -08:00
Ryan Huffman	818339823c	Add new number type in Create	2018-12-07 11:02:31 -08:00