19056 commits

Author	SHA1	Message	Date
Seth Alves	0b358a2ac7	finish hooking up new-model dialog	2017-02-10 13:29:06 -08:00
Seth Alves	e851ece343	merge from upstream	2017-02-10 12:09:00 -08:00
Seth Alves	3171ce1602	hook up more of new-model dialog	2017-02-10 12:03:26 -08:00
Seth Alves	7a63b07462	attempting to handle new-model dialog	2017-02-09 17:14:10 -08:00
Seth Alves	d0d13cdde1	fix tab titles	2017-02-09 15:52:15 -08:00
Seth Alves	e12c77e576	move the edit tabs into tablet	2017-02-09 14:43:44 -08:00
Seth Alves	c4ac719d2c	merge from upstream + cleanups	2017-02-09 14:26:29 -08:00
Seth Alves	4c3a6842a5	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
Atlante45	3a30de79aa	CR	2017-02-09 13:04:43 -08:00
Atlante45	72ed1add94	CR log spam cleanup	2017-02-09 13:04:43 -08:00
Atlante45	6fbe3c9187	Windows specific changes	2017-02-09 13:04:43 -08:00
Atlante45	43d2501993	Add HMD friendly window for the ESS log	2017-02-09 13:04:43 -08:00
Atlante45	0f39356e94	Only users with perm rez can see the log	2017-02-09 13:04:43 -08:00
Atlante45	35f8afe456	Handle domain reconnections	2017-02-09 13:04:43 -08:00
Atlante45	191121888c	Add log window to the ESS log	2017-02-09 13:04:43 -08:00
Atlante45	2962dd6dc2	Factor LogDialog	2017-02-09 13:04:43 -08:00
Atlante45	fcb74bce10	First draft for entity script server log streaming	2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub	74f10a1e7f	Merge pull request #9603 from huffman/feat/trace-thread-script ... Add thread names and scripts to chrome traces	2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub	bc22326ec8	Merge pull request #9640 from ZappoMan/avatarSimulationStats ... New stats for avatar simulation	2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub	bb4654506a	CR	2017-02-09 11:37:21 -08:00
Brad Hefta-Gaub	57e0dadd65	CR	2017-02-09 11:35:00 -08:00
samcake	850be620f9	Merge pull request #9606 from samcake/blue ... More intrumentation, Pixel Format clean up and minor improvments in texture transfers	2017-02-09 11:18:09 -08:00
Seth Alves	b34341b48e	Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos ... Remove avatarEntityData cruft from settings	2017-02-09 10:40:00 -08:00
Brad Hefta-Gaub	dd2ddcc291	cleanup	2017-02-09 09:57:32 -08:00
Dante Ruiz	ff60058cbe	checking if desktop exists	2017-02-09 17:54:41 +00:00
Brad Hefta-Gaub	ae071aec0d	add a bunch more stats for avatar processing	2017-02-09 09:52:09 -08:00
samcake	c62108c3c8	Resolve merging conflict	2017-02-09 09:49:59 -08:00
Dante Ruiz	6bc685b02a	saving work	2017-02-09 07:13:29 -08:00
Dante Ruiz	5c5ace7c7b	goto in tablet	2017-02-09 07:13:29 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Seth Alves	908df7ee8a	Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs ... Fix for hidden cursor while using Export Entities / Import Entities form	2017-02-08 19:42:33 -08:00
Brad Hefta-Gaub	41dc498888	add inView simulation stats	2017-02-08 18:32:39 -08:00
Anthony J. Thibault	090f632189	Pal: Moved keyboard tray to be flush with bottom of window.	2017-02-08 18:16:48 -08:00
Anthony J. Thibault	7cc3079328	Tightened up margins for the tablet.	2017-02-08 17:58:24 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub	c2171ca08f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats ... Conflicts: libraries/avatars/src/AvatarData.h	2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub	6c41a25032	more stats	2017-02-08 16:51:00 -08:00
Thijs Wenker	6957ac5f8b	Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread	2017-02-09 01:31:07 +01:00
Brad Hefta-Gaub	b399420190	CR	2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub	357cc052e1	first cut at simulation stats	2017-02-08 15:32:48 -08:00
Andrew Meadows	e02810458b	clear old avatarEntityData when saving settings	2017-02-08 14:14:48 -08:00
Brad Hefta-Gaub	07cf87749f	Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots	2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub	89368afd68	add back accidentally removed line	2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub	eedfc4fd38	fix various bot related bugs	2017-02-08 12:35:00 -08:00
samcake	363db8a834	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-08 11:52:18 -08:00
Andrew Meadows	cc301d1c1a	remove legacy empty avatarEntityData settings	2017-02-08 11:50:15 -08:00
mike	6cba2049dd	Made jumping easier on the Vive	2017-02-07 19:46:16 -08:00
Seth Alves	90fa8bf572	Merge pull request #9612 from druiz17/users ... some tweaks to users and menus got tablet	2017-02-07 15:38:43 -08:00
Clément Brisset	eb0a316b6f	Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances ... Allow multiple instances to run if environment variable is set	2017-02-07 15:32:31 -08:00
samcake	2975f73fc9	merging	2017-02-07 13:13:21 -08:00