74198 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thijs Wenker	c155304209	Merge pull request #2 from huffman/feat/avatarTools/avatarPackager ... Add start of marketplace uploading and project file list	2018-12-13 22:30:58 +01:00
Ryan Huffman	78c4c2599e	Add start of marketplace uploading and project file list	2018-12-13 13:27:31 -08:00
Thijs Wenker	96673bb5b9	show project page	2018-12-12 21:15:44 +01:00
Thijs Wenker	c0bd9121fb	open avatar projects	2018-12-12 19:55:14 +01:00
Thijs Wenker	3943fe2861	avatar packager initial	2018-12-10 21:29:03 +01:00
Sam Gondelman	da296cf45e	Merge pull request #14390 from SamGondelman/NOverlays ... Case 19886: Convert "clientOnly" to new hostType property and add local entities	2018-12-06 12:27:56 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Jeff Clinton	43f84a9577	Merge pull request #14426 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null	2018-12-06 11:18:39 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
Ryan Huffman	13c3b410d8	Merge pull request #14495 from dback2/draggableNumberFixes76-master ... Draggable numbers - RC76 fixes to master	2018-12-06 09:47:38 -08:00
Jeff Clinton	b9156d68e5	Merge pull request #14508 from amantley/restingHandsBug ... removed the code that turns off inactive hands in MyAvatar.cpp	2018-12-06 09:42:34 -08:00
Jeff Clinton	e65e8d29a1	Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake ... Ensure that hand is in grasp pose during desktop handshake animation	2018-12-06 09:41:29 -08:00
Jeff Clinton	e8c1c4a27b	Merge pull request #14536 from danteruiz/fix-audio-switching ... Respect changed audio settings when switch displays (Master)	2018-12-06 09:13:47 -08:00
Jeff Clinton	7f242b8c0e	Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master ... [RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus	2018-12-06 09:11:49 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
Dante Ruiz	3123bb37e4	fix audio switching issue	2018-12-05 10:34:47 -08:00
Antonina Savinova	2dcfea5f7c	Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak ... Fix minor avatar-mixer memory leaks	2018-12-05 10:29:29 -08:00
Brad Hefta-Gaub	77e1c98264	Merge pull request #14528 from sethalves/fix-delete-home ... work around menu-item name hash collision for Home	2018-12-04 15:04:25 -08:00
John Conklin II	725cf6c526	Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets ... Head and Hand offsets for Vive Trackers now function as expected	2018-12-04 14:25:02 -08:00
Adam Smith	763e6d1a95	Merge pull request #14444 from SamGondelman/actionData ... Case 19861: Fix: Shouldn't be able to write actionData from script	2018-12-04 11:25:00 -08:00
Adam Smith	864e9ca8ae	Merge pull request #14443 from SamGondelman/hud ... Case 19660: Fix HUD crash	2018-12-04 11:10:43 -08:00
John Conklin II	e4b68f1d38	Merge pull request #14455 from samcake/one ... case 20041: Package all the graphics related objects and functions in Application in the Graphics Engine	2018-12-04 10:46:45 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Seth Alves	541d0ab4d6	work around menu-item name hash collision for Home	2018-12-03 17:33:04 -08:00
Clément Brisset	56ac34f9d1	Merge pull request #14506 from Atlante45/fix/misc-agent ... Fix various AC bugs	2018-12-03 14:18:12 -08:00
Clément Brisset	62f21822ce	Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash ... Fix Agent crash on shutdown	2018-12-03 14:17:35 -08:00
Thijs Wenker	f38f39c84d	ignore shortcuts in TEXTAREA elements	2018-12-03 19:42:57 +01:00
Zach Fox	2776839dff	Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval ... Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-12-03 10:27:32 -08:00
David Back	a05e831333	Merge branch 'master' into draggableNumberFixes76-master	2018-12-03 09:42:58 -08:00
Anthony Thibault	c0bf832e39	Head and Hand offsets for Vive Trackers now function as expected ... In the Settings > Controller... > Calibration menu, when using head or hand trackers The provided Y and Z offsets should function correctly now. This gives you the ability to adjust the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms rather then the backs of your palms.	2018-12-02 16:18:36 -08:00
Shannon Romano	3c43f44119	Merge pull request #14462 from huffman/fix/key-light-angle ... Swap key light directions in Create	2018-11-30 19:28:53 -08:00
Shannon Romano	0d2b0903d8	Merge pull request #14469 from huffman/fix/draggable-input-tabbable ... Fix draggable inputs not being tabbable	2018-11-30 19:28:11 -08:00
Shannon Romano	5afff69b78	Merge pull request #14505 from huffman/fix/create-empty-rgb-field ... Fix empty rgb field in Create going black	2018-11-30 18:19:44 -08:00
Clément Brisset	0dac8580ee	Merge pull request #14492 from Atlante45/fix/audio-mixer-crash-master ... Fix audio mixer crash	2018-11-30 17:03:36 -08:00
Zach Fox	051b7cfbb8	Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-11-30 16:12:21 -08:00
Shannon Romano	f3c0118602	Merge pull request #14454 from NissimHadar/19991-MacAppData ... case 19991 - implement AppData for Mac	2018-11-30 11:38:21 -08:00
Shannon Romano	1f29423a58	Merge pull request #14423 from vladest/qml_warning_fix ... Fix QML achoring warnings on Layouts	2018-11-30 10:50:30 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
amantley	88a9a96346	removed the code that turns off inactive hands in MyAvatar.cpp	2018-11-30 10:08:05 -08:00
Shannon Romano	0bf5be57f8	Merge pull request #14488 from danteruiz/limit-avatar-entity-data ... don't save joint information for avatar entities in avatarbookmarks.json	2018-11-30 09:49:01 -08:00
Shannon Romano	41ce976869	Merge pull request #14481 from danteruiz/master-mallets ... fixing keyboard mallets dimensions (Master)	2018-11-30 09:46:32 -08:00
Shannon Romano	dacf43d70c	Merge pull request #14483 from danteruiz/keyboard-toggle-option ... Keyboard menu option in general settings	2018-11-30 09:43:10 -08:00
Shannon Romano	1b24d051f7	Merge pull request #14432 from ctrlaltdavid/M17988 ... Fix memory accumulating while Interface is minimized	2018-11-30 09:39:14 -08:00
Shannon Romano	08bbe27522	Merge pull request #14489 from ctrlaltdavid/M17990-a ... Remove unused avatar attachment constant	2018-11-30 09:37:40 -08:00
Jeff Clinton	04f09d70e3	Merge pull request #14464 from ctrlaltdavid/M17406 ... Fix fax grab to near grab transition and haptic pulses	2018-11-30 09:18:51 -08:00
NissimHadar	8973b7caea	Merge branch 'master' into 19991-MacAppData	2018-11-29 17:45:58 -08:00
NissimHadar	87c863584d	Just to remove conflict.	2018-11-29 17:43:19 -08:00
Clement	c53c52c7a0	Fix various Agent bugs	2018-11-29 17:42:04 -08:00
Sam Gateau	1dcddb9541	Merge pull request #14440 from NissimHadar/19942-MacInstall ... 19942 Mac installation procedure	2018-11-29 14:38:07 -08:00
Ryan Huffman	59b7cdf318	Fix empty rgb field in Create going black	2018-11-29 14:10:22 -08:00