55519 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Olivier Prat	1433ae4b34	Merged from 21274	2017-06-05 11:12:57 +02:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
Stephen Birarda	6a89726a6a	Merge pull request #10593 from birarda/log-api-session-id ... print the metaverse session ID to the debug log	2017-06-01 18:02:17 -07:00
Brad Davis	3fdad14ca4	Merge pull request #10571 from jherico/ktx_tests ... FileCache refactoring and test, plus KTX unit tests	2017-06-01 16:09:14 -07:00
Stephen Birarda	0f22b07026	move session ID logging later in app startup	2017-06-01 16:07:36 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
Stephen Birarda	06b3ecfdc3	also log metaverse session ID during ctor of AccountManager	2017-06-01 15:50:56 -07:00
Seth Alves	4c69ec4365	Merge pull request #10588 from druiz17/recorder-fix ... Changed the input recorder to store actions by strings	2017-06-01 14:34:09 -07:00
Dante Ruiz	725388043f	removed double semi-colons	2017-06-01 22:30:50 +01:00
Stephen Birarda	3d98f1b3ee	print metaverse session ID to debug log	2017-06-01 13:46:37 -07:00
Zach Fox	4e929f6d92	Merge pull request #10581 from zfox23/snapshot_fixForUrlShare ... Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't	2017-06-01 11:51:14 -07:00
Dante Ruiz	0e82b33d6d	final changes	2017-06-01 19:00:31 +01:00
David Kelly	017955dca8	Merge pull request #10587 from davidkelly/dk/5028 ... Don't allow sorting on non-sortable columns in PAL	2017-06-01 10:49:11 -07:00
Dante Ruiz	c686acc071	fixing build issue	2017-06-01 18:20:56 +01:00
Dante Ruiz	23a9209285	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 18:06:37 +01:00
David Kelly	b6b2f92af2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028	2017-06-01 09:58:07 -07:00
Andrew Meadows	e27199601f	Merge pull request #10585 from samcake/orange ... Fixing warnings	2017-06-01 09:33:16 -07:00
samcake	257813ec38	comment the code	2017-06-01 09:19:02 -07:00
Dante Ruiz	36002e8b92	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 17:01:59 +01:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Sam Cake	07eb1d89e1	fixing the warning on macosx about the non portable file name	2017-05-31 23:59:44 -07:00
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
Sam Cake	0372deebff	Last warnings?	2017-05-31 22:09:30 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
Zach Fox	53701371ab	Fix some bugs :(	2017-05-31 16:43:21 -07:00
Dante Ruiz	cca0fa6600	fixed some input recorder design issue	2017-06-01 00:23:37 +01:00
David Kelly	c29091f0b1	Merge pull request #10582 from davidkelly/dk/4996 ... remove extra activity logger call	2017-05-31 15:18:17 -07:00
Zach Fox	70fdb4a168	Fix incorrectly sharing old snapshots	2017-05-31 14:47:07 -07:00
Zach Fox	fd92afff8c	Ensure old snaps don't accidentally get shared for_url	2017-05-31 14:47:07 -07:00
Brad Davis	a77491ccb1	FileCache refactoring and tests	2017-05-31 13:45:59 -07:00
David Kelly	e1700915f7	remove extra activity logger call	2017-05-31 13:28:57 -07:00
Howard Stearns	b552566bf8	Merge pull request #10580 from manapa01/Default-Discoverability-Mode ... Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 13:00:15 -07:00
Seth Alves	e80704f3c9	Merge pull request #10578 from thoys/fix/grabableDynamic ... Edit.js: Fix hidden dynamic property while clone-able is active	2017-05-31 12:54:36 -07:00
Zach Fox	8d02a93727	Merge pull request #10576 from zfox23/snapshot_AddErrorImage ... Add placeholder image when previous snapshot can't be loaded	2017-05-31 11:19:32 -07:00
Thijs Wenker	5c5aaf3254	Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates	2017-05-31 20:18:42 +02:00
Patrick Manalich	7b69a5dbd5	Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 10:46:04 -07:00
Zach Fox	0441d8c703	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
Dante Ruiz	7fcdc61244	add head puck offset preference	2017-05-31 18:20:35 +01:00
Dante Ruiz	f4328af66f	made final requested changes	2017-05-31 17:12:27 +01:00
Dante Ruiz	41869430f7	made some changes that were requested	2017-05-31 01:29:32 +01:00
Dante Ruiz	b3401d9762	making some final changes	2017-05-30 23:55:45 +01:00
Dante Ruiz	9c787eb784	removed commented code	2017-05-30 22:59:12 +01:00
Dante Ruiz	a0ba1a64b5	Merge branch 'master' of github.com:highfidelity/hifi into head-puck	2017-05-30 22:52:57 +01:00
Dante Ruiz	4c4811dca8	finished the head puck	2017-05-30 22:52:39 +01:00
Ryan Huffman	4a52f4090d	Merge pull request #10552 from huffman/fix/multiple-nic-lockup ... Fix SendQueue not setting lastReceiverResponse when recv handshake ack	2017-05-30 13:05:01 -07:00
Stephen Birarda	9fa900bac8	Merge pull request #10568 from thoys/fix-doc-headers ... Fix markdown headers	2017-05-30 12:29:27 -07:00
Thijs Wenker	68ad8fa981	visual headers	2017-05-30 21:12:51 +02:00
Stephen Birarda	60125eb1d7	Merge pull request #10567 from highfidelity/openssl-win-installer-update ... OpenSSL installer update	2017-05-30 12:03:20 -07:00