51052 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Clément Brisset	20c8c8c278	Merge pull request #9636 from huffman/feat/stopwatch-updates ... Stopwatch updates	2017-02-09 14:11:45 -08:00
Brad Hefta-Gaub	e329696cc8	Merge pull request #9581 from Atlante45/ess-pr ... Add log window for the EntityScriptServer in interface.	2017-02-09 13:31:15 -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
Seth Alves	f260b535a7	Merge pull request #9635 from druiz17/goto ... Moved goto into the tablet (currently not enabled)	2017-02-09 10:38:35 -08:00
Ryan Huffman	026c68c7de	Merge pull request #9625 from huffman/fix/server-script-entity-updates ... Fix Server Entity Script w/ high update rate causing issues	2017-02-09 10:07:32 -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	0e83e5da06	minimize diff	2017-02-09 07:13:30 -08:00
Dante Ruiz	580216c3d2	adding tablet-goto.js	2017-02-09 07:13:30 -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
Philip Rosedale	c9c04a9afc	Merge pull request #9638 from PhilipRosedale/fixRescale ... Fix rescale avatar bug	2017-02-08 22:09:41 -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
Anthony J. Thibault	e25ad0f332	Fix debug assert in FBXReader.	2017-02-08 18:56:58 -08:00
Anthony J. Thibault	b3a46c3518	Bug fix for TabletProxy::loadQMLSource()	2017-02-08 18:56:16 -08:00
Anthony J. Thibault	c2b832fb9c	removed debug prints from pal.js	2017-02-08 18:55:22 -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
Philip Rosedale	e94e41698e	remove debug	2017-02-08 18:04:55 -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
samcake	e11d10f5d4	Reparing broken normals and also fixing the ambient lighting bug	2017-02-08 16:56:59 -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
Clément Brisset	f608892e47	Merge pull request #9633 from ZappoMan/betterBots ... Various Bot fixes	2017-02-08 16:08:43 -08:00
Philip Rosedale	dc957d09d8	remove comment	2017-02-08 15:45:29 -08:00
Brad Hefta-Gaub	b399420190	CR	2017-02-08 15:42:59 -08:00
Philip Rosedale	fe92d38b60	Fixed scaling of self	2017-02-08 15:42:10 -08:00
Brad Hefta-Gaub	357cc052e1	first cut at simulation stats	2017-02-08 15:32:48 -08:00
Ryan Huffman	58e3351b25	Update stopwatch to use relative paths to models + sounds	2017-02-08 14:27:06 -08:00
Andrew Meadows	e02810458b	clear old avatarEntityData when saving settings	2017-02-08 14:14:48 -08:00
Ryan Huffman	40bd7d9475	Update the stopwatch spawn script to exit when done	2017-02-08 14:10:04 -08:00