5146 commits

Author	SHA1	Message	Date
Sam Gondelman	bdef05a326	Merge pull request #12221 from highfidelity/revert-12203-21703 ... Revert "Display both lasers on tablet and Web surfaces"	2018-01-22 12:27:00 -08:00
John Conklin II	8d028d4bd4	Merge pull request #12220 from RebeccaStankus/API-Debugger-UI ... Updated UI to fit Toolkit Standards	2018-01-22 10:30:48 -08:00
John Conklin II	8b461b960f	Merge pull request #12223 from zfox23/commerce_sendMoney2 ... Commerce: Pixel-perfect "Send Money" UI	2018-01-22 09:39:23 -08:00
Seth Alves	45a00bebc0	Merge pull request #12217 from luiscuenca/sortOrderFix ... Fix sortOrder param on tablet buttons	2018-01-21 10:40:25 -08:00
David Back	c722b4b04d	Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab	2018-01-19 18:20:49 -08:00
David Back	c4359de859	entity edit tools wip update	2018-01-19 18:20:36 -08:00
ZappoMan	f6062ebfcc	new icon and button layout	2018-01-19 16:00:08 -08:00
John Conklin II	455090d2b9	Revert "Display both lasers on tablet and Web surfaces"	2018-01-19 15:15:52 -08:00
John Conklin II	db5bf68431	Merge pull request #12203 from ctrlaltdavid/21703 ... Display both lasers on tablet and Web surfaces	2018-01-19 15:15:44 -08:00
RebeccaStankus	5db5f24043	Updated UI to fit Toolkit Standards	2018-01-19 14:52:44 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
David Rowe	7898aa2c4b	Code review	2018-01-20 10:32:42 +13:00
Stephen Birarda	018bcc623b	Merge pull request #12213 from birarda/feat/hide-error-decrypting-notification ... suppress Interface notification for DS decryption error	2018-01-19 14:10:10 -07:00
David Rowe	94e6a68d41	Code review	2018-01-20 09:50:24 +13:00
Zach Fox	9d6e62d6bf	Merge pull request #12163 from ElderOrb/FB11109 ... FB11109 Preview disabled image swap (Commerce only)	2018-01-19 11:40:05 -08:00
Ryan Downe Karpf	f1b18ccc00	Merge pull request #12184 from ctrlaltdavid/21700 ... Add Window browseChanged signal as replacement for openFileChanged	2018-01-19 10:45:27 -08:00
Ryan Downe Karpf	08b4c6eb40	Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow ... reduce calls to isPointOnDesktopWindow in controllerModules	2018-01-19 10:44:57 -08:00
Brad Davis	d6f7b23b2d	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 10:37:41 -08:00
luiscuenca	27ea74f5bf	Fix sortOrder param on tablet buttons	2018-01-19 11:22:37 -07:00
David Back	4ed117b66d	Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab	2018-01-19 10:14:44 -08:00
Zach Fox	8c52f92de8	Merge pull request #12208 from zfox23/fixBubbleButtonFlash ... Fix the Space Bubble button flash behavior; Rate limit sound	2018-01-19 09:29:17 -08:00
David Rowe	fb684909ce	Merge branch 'master' into 21703	2018-01-19 17:25:12 +13:00
David Rowe	45bc6b8dab	Dominant hand gets the highlight if both start pointing simultaneously	2018-01-19 16:41:23 +13:00
David Rowe	e0e6fc711b	Replace Pointers API function setNonHoverItems() with setDoesHover()	2018-01-19 16:05:09 +13:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Zach Fox	c6429f4f33	Path towards pixel perfection	2018-01-18 17:05:36 -08:00
Stephen Birarda	a97b4b010d	suppress Interface notification for DS decryption error	2018-01-18 16:54:04 -08:00
Clément Brisset	37504eca15	Merge pull request #12186 from ctrlaltdavid/21702 ... Add Window.protocolSignature() as a replacement for location.protocolVersion()	2018-01-18 15:20:03 -08:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
David Rowe	8c2427dd58	Rename Window.protocolVersion() to Window.protocolSignature()	2018-01-19 09:06:16 +13:00
Zach Fox	13d8d643f7	Also rate limit the bubble sound	2018-01-18 12:05:16 -08:00
Zach Fox	1bda3faaf2	Fix the Space Bubble button flash behavior	2018-01-18 11:23:49 -08:00
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08:00
Andrew Meadows	82cab5e4a1	add scripted/qml debug UI for render LOD	2018-01-18 08:53:45 -08:00
David Rowe	403dd3d7d0	Only first laser highlights	2018-01-18 22:31:12 +13:00
David Back	26bf78fb5d	first pass new entity selection edit tools wip	2018-01-17 18:30:31 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
David Rowe	5878e36ea8	Display both lasers	2018-01-18 14:24:23 +13:00
Zach Fox	5ce768f402	Merge pull request #12151 from zfox23/commerce_sendMoney1 ... Commerce: P2P Transfer Iteration 1	2018-01-17 16:41:56 -08:00
humbletim	49bb9420cc	Merge branch 'master' into Leopoly_Phase1_003_Asset-Request	2018-01-17 17:11:33 -05:00
Dante Ruiz	8f22c719b3	Merge pull request #12099 from sethalves/run ... allow avatar walk-speed to be set from javascript	2018-01-17 13:53:13 -08:00
Seth Alves	8edded7059	Merge pull request #12164 from ctrlaltdavid/21695 ... Remove old ToolWindow code	2018-01-17 13:43:59 -08:00
Zach Fox	1d747bc0e4	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-17 11:56:00 -08:00
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
Seth Alves	1e847cf32e	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 08:08:13 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Seth Alves	d3084dc0df	defang	2018-01-17 07:11:27 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
David Rowe	2883e24285	Add Window.protocolVersion() as a replacement for location's	2018-01-17 12:00:35 +13:00
Seth Alves	511f94a4fc	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-16 14:01:54 -08:00
David Rowe	85bda1da8e	Add Window browseChanged signal as replacement for openFileChanged	2018-01-17 09:57:20 +13:00
Clément Brisset	1949471dad	Merge pull request #12182 from highfidelity/stable ... Merge stable (RC62) to master	2018-01-16 11:01:07 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Seth Alves	f6ce254059	put run.js back in defaultScripts	2018-01-12 15:30:44 -08:00
Seth Alves	508a3b37cd	fix icon. button lights up when run in enabled	2018-01-12 15:28:42 -08:00
David Rowe	1fa31d3c10	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Zach Fox	1e608b13b2	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
Seth Alves	1e92615459	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 13:21:45 -08:00
Zach Fox	d25ef074e1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-11 12:35:18 -08:00
Anthony Thibault	8d5e7dbeff	Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings ... Fix for black screen when clicking Settings from Snap app	2018-01-11 09:58:10 -08:00
John Conklin II	da2c56dbc9	Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings ... RC62: Fix for black screen when clicking Settings from Snap app	2018-01-11 09:48:03 -08:00
Seth Alves	c09f644612	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 09:09:11 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
Brad Davis	560fd38547	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
Anthony J. Thibault	1deb75daf7	Fix for black screen when clicking Settings from Snap app ... (cherry picked from commit d5e3b97c93)	2018-01-10 16:31:51 -08:00
Anthony J. Thibault	d5e3b97c93	Fix for black screen when clicking Settings from Snap app	2018-01-10 16:03:53 -08:00
Zach Fox	c15b1669b1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 15:53:23 -08:00
Seth Alves	ddc730f49f	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-10 13:49:07 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Zach Fox	f366fdf695	Beginnings of nearby	2018-01-10 09:58:23 -08:00
Seth Alves	3816c732c0	Merge branch 'run' of github.com:sethalves/hifi into run	2018-01-10 08:11:55 -08:00
Seth Alves	8cf94547e4	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-10 08:11:46 -08:00
Brad Davis	fb59a0a56f	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 20:02:55 -08:00
Zach Fox	5469025113	More more more	2018-01-09 15:53:25 -08:00
Nissim Hadar	bb04b68e42	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 15:51:46 -08:00
Nissim Hadar	0b1e321ccf	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 15:25:03 -08:00
Brad Hefta-Gaub	a7b56da570	Merge pull request #12103 from ZappoMan/emoteApp ... first cut at an emote app	2018-01-09 15:23:14 -08:00
Zach Fox	530df5447d	Even more proress	2018-01-09 15:19:50 -08:00
Dante Ruiz	125eb9ce44	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -08:00
Nissim Hadar	4ecb056210	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 13:44:13 -08:00
ZappoMan	4f1dc2f184	fix CR comments	2018-01-09 13:42:51 -08:00
Nissim Hadar	8042b4b3fb	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 13:28:14 -08:00
Zach Fox	0bc483f7a6	Merge pull request #12096 from ElderOrb/FB5648 ... 5648 play audio notification to confirm purchase upon rezzing	2018-01-09 12:32:28 -08:00
Brad Davis	d6dd29b952	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 11:43:03 -08:00
Nissim Hadar	e94982a470	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 10:10:27 -08:00
Thijs Wenker	88d353a642	Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable ... Make zones, lights, and particles not grabbable when created in edit.js	2018-01-09 18:26:13 +01:00
Seth Alves	72ac1dd216	walk by default, put old walk speed back	2018-01-09 08:50:20 -08:00
Alexander Ivash	7e87cb38e1	adjusted code to PR comments	2018-01-09 11:10:23 +03:00
ZappoMan	1fd9eae2b5	make second click stop animation if still playing, and shrink animation files	2018-01-08 17:57:12 -08:00
ZappoMan	0d1b34f487	make animation 60fps	2018-01-08 17:32:22 -08:00
Seth Alves	6626f55652	fix run script	2018-01-08 15:52:50 -08:00
Nissim Hadar	7811ddb904	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-08 15:39:09 -08:00
Seth Alves	e0bbf9ee41	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 15:28:02 -08:00
Seth Alves	ad389e5072	make avatar walk-speed adjustable from js. add a tablet button to control walking vs running	2018-01-08 15:27:41 -08:00
Nissim Hadar	46b494c802	Removed the Stage functionality - it is now implemented as a script.	2018-01-08 14:34:46 -08:00
Nissim Hadar	569cf1a30e	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-08 14:16:03 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Nissim Hadar	8e03ecedb9	Added user data for lat/lon.	2018-01-08 11:50:49 -08:00
Liv Erickson	d1e176ee9d	Update menu to reflect non-grabbable entity types, include particles	2018-01-08 11:31:09 -08:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08:00
Alexander Ivash	9a63fc94f0	5648 play audio notification to confirm purchase upon rezzing	2018-01-08 21:14:44 +03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
ZappoMan	1dc24072dc	cleanup a few things in emote App	2018-01-08 09:04:07 -08:00
ZappoMan	c4d0872bbf	first cut at an emote app	2018-01-07 22:28:50 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
Nissim Hadar	f742ab7952	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-05 23:14:51 -08:00
Nissim Hadar	9e5eba4d3a	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-05 23:11:40 -08:00
Liv Erickson	4e582975b6	cleanup	2018-01-05 18:03:20 -08:00
Liv Erickson	f563b8ca2e	Make zones and lights not default grabbable	2018-01-05 17:49:43 -08:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
Andrew Meadows	b28684f15e	Merge pull request #12087 from ctrlaltdavid/21661 ... Laser auto-on with tablet and Web overlays	2018-01-05 14:08:01 -08:00
David Rowe	5431b7137b	Code review	2018-01-06 08:27:24 +13:00
luiscuenca	d0bc881bb2	Load script manually	2018-01-05 12:20:41 -07:00
Melissa Brown	933720fb10	Merge pull request #12012 from Delanir/Case10633 ... Cases 10632 and 10633 Particle Explorer UI	2018-01-05 10:46:41 -08:00
luiscuenca	108748ca96	smooth transitions and slower back to default	2018-01-05 09:55:50 -07:00
David Rowe	69dff9ac09	Remove unused code	2018-01-05 16:16:55 +13:00
David Rowe	4b2ed44322	Reduce incidence of tablet screen being rotated w.r.t. model	2018-01-05 16:16:42 +13:00
David Rowe	936b5f3571	Laser on tablet bezel as well as screen and "x" button	2018-01-05 16:15:59 +13:00
Nissim Hadar	e797a77262	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # interface/resources/qml/js/Utils.jsc	2018-01-04 15:58:08 -08:00
David Rowe	67eb282815	Don't swap hands if both triggers are squeezed	2018-01-05 12:12:36 +13:00
David Rowe	27bed8d1f1	Tidying	2018-01-05 11:05:49 +13:00
David Rowe	fb09a9724e	Change laser hand with trigger squeeze	2018-01-05 11:04:09 +13:00
David Rowe	9f7a2b18e6	Use laser from dominant hand if both hands are pointing at the tablet	2018-01-05 10:04:39 +13:00
David Rowe	02f4085368	Fix magic number	2018-01-05 09:00:53 +13:00
luiscuenca	367e2266f7	Fix eslint	2018-01-04 12:04:52 -07:00
luiscuenca	ef0164c272	Fix tabs	2018-01-04 11:43:51 -07:00
luiscuenca	28d9409bf0	Fix default hand poses	2018-01-04 11:37:37 -07:00
David Rowe	6095a90e69	Don't display default lasers when Shapes app is active	2018-01-04 21:09:38 +13:00
David Rowe	6c16fcfe65	Fix tablet laser when Shapes app is running	2018-01-04 16:37:20 +13:00
David Rowe	7236ac17e2	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13:00
David Rowe	efa6f1f02f	Use "Prefer Stylus Over Laser" setting	2018-01-04 15:00:17 +13:00
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Zach Fox	8d4a6f01cb	Fix bugs related to inspecting entities with hand controllers	2018-01-03 16:03:37 -08:00
Gabriel Calero	fc62b2d34a	Fix ktx_cache path for android. Load the least js scripts for android	2018-01-03 16:42:18 -03:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13:00
Zach Fox	917db14879	Add a link to My Purchases from Wallet Home	2018-01-02 15:26:11 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -08:00
Zach Fox	25e76c668b	Fix marketplacesInject.js for local Metaverse	2018-01-02 12:22:40 -08:00
nissim.hadar	b6bbf1abe1	Added sun intensity modulation as a function of altitude.	2017-12-29 23:47:42 -08:00
Nissim Hadar	7260b4ff7b	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/entities/src/EntityPropertyFlags.h	2017-12-29 15:16:14 -08:00
Nissim Hadar	87e896ab20	Zone inheritance ready for testing.	2017-12-29 15:13:46 -08:00
luiscuenca	47dbb0c168	load script manually	2017-12-29 15:35:44 -07:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00