18123 commits

Author	SHA1	Message	Date
Ryan Huffman	7e2bb0e5ed	Cleanup camera docs	2016-11-14 13:51:51 -08:00
Ryan Huffman	ec86b82079	Add jsdoc to Camera	2016-11-14 12:14:24 -08:00
Seth Alves	5629db9109	Merge pull request #9049 from birarda/max-min-av-scale ... add a min/max avatar scale in domain-server settings	2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub	a90a0fe8ba	Merge pull request #8976 from druiz17/FixMenuOutOfView ... Fixed menu out of view with HMD and Xbox controller	2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub	6db3556dc5	Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd ... Disable viewpoint menus in hmd	2016-11-10 17:52:50 -08:00
Stephen Birarda	020942c826	better handling for a flipped min/max scale	2016-11-10 16:50:36 -08:00
Stephen Birarda	88c63332de	protect flipped min/max scale in avatar mixer settings	2016-11-10 16:21:48 -08:00
Brad Davis	16060d50af	Merge pull request #9041 from jherico/disable_incremental ... Remove incremental texture transfers	2016-11-10 15:43:20 -08:00
Stephen Birarda	272d0c845e	add clarifying comments about target scale changes	2016-11-10 15:25:15 -08:00
Stephen Birarda	d5722c1654	fix clamping of scale and DRY it up	2016-11-10 15:03:13 -08:00
howard-stearns	4d18a3cc3d	expose menu enablement to javascript	2016-11-10 15:01:06 -08:00
Stephen Birarda	53769f4edf	change scale for avatar if domain limited scale changes	2016-11-10 14:58:04 -08:00
Stephen Birarda	9fdde49d14	clamp target scale changes on both ends	2016-11-10 14:54:42 -08:00
Stephen Birarda	6f442a74b1	request settings from agents and debug results	2016-11-10 14:43:15 -08:00
Stephen Birarda	77ede81fc9	limit MyAvatar scale to limits from domain settings	2016-11-10 13:27:13 -08:00
Brad Hefta-Gaub	ff559aa4a1	Merge pull request #9042 from hyperlogic/feature/jsdoc ... Generate JS documentation from comments in C++ source	2016-11-10 10:17:39 -08:00
Brad Davis	db98a742b6	Remove incremental transfers	2016-11-10 08:35:35 -08:00
Anthony J. Thibault	839b1a3c5e	Added some jsdoc comments to the C++ source	2016-11-09 18:09:10 -08:00
samcake	f5fd4bf8d1	Merge pull request #9014 from jherico/texture_derez ... Re-enable downsampling for non-sparse textures	2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub	770bf35d2b	CR feedback	2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub	cf3d1011f4	remove scripts from avatar attached entities for other avatars	2016-11-09 12:26:57 -08:00
Brad Davis	192c72ff99	Update menu, initial state for texture management	2016-11-09 12:09:25 -08:00
Howard Stearns	666d2dd2fc	Merge pull request #9031 from davidkelly/dk/2178 ... Log snapshot upload and user story creation errors	2016-11-08 12:11:16 -08:00
Howard Stearns	0a56f7c4fe	Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt ... fix numeric keyboard for hmd Window.prompt	2016-11-08 12:05:13 -08:00
David Kelly	1766ebab2c	Added a bit more logging	2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub	5454dca82e	Merge pull request #9030 from highfidelity/stable ... Update master with Stable hotfix	2016-11-07 18:48:54 -08:00
David Kelly	3105299670	Log snapshot upload and user story creation errors ... Plus, if the body of the error is empty, put something in there so the script will not think it was successful.	2016-11-07 18:13:10 -08:00
Chris Collins	eec8e2f19b	Merge pull request #9000 from samcake/punk ... Add Frame Timing and GPU memory to the Stats and user activity log	2016-11-07 16:17:20 -08:00
Atlante45	f34cf64f3e	Disable updater on Steam	2016-11-07 16:09:56 -08:00
Seth Alves	24556fc70d	Merge pull request #8980 from huffman/feat/default-to-hmd ... Update interface to default to HMD display plugin	2016-11-07 13:36:39 -08:00
Dante Ruiz	e22c36b4b7	fixed menu pop up delay	2016-11-07 17:16:24 +00:00
howard-stearns	84eb1721e7	fix numeric keyboard for hmd Window.prompt	2016-11-04 17:02:14 -07:00
Atlante45	ae29fe8ab2	Logging improvements	2016-11-04 14:26:19 -07:00
samcake	449add6b34	Fix bad variable initialization	2016-11-04 13:29:27 -07:00
Ryan Huffman	0cec62b3a3	Revert "Update interface to default to HMD display plugin" ... This reverts commit bbef071723.	2016-11-04 12:27:15 -07:00
Ryan Huffman	0dac2c999e	Revert "Remove unused 'first' variable" ... This reverts commit 26e0d02d60.	2016-11-04 12:27:04 -07:00
Ryan Huffman	3ad9c1a797	Add check to go into HMD on first run if available	2016-11-04 12:26:20 -07:00
samcake	76aa541d4a	Adding the frame gpu and batch timer	2016-11-04 11:49:52 -07:00
Andrew Meadows	836aad7d0b	Merge pull request #8997 from howard-stearns/raise-desktop-when-showing-it ... raise desktop when showing it	2016-11-04 10:45:05 -07:00
samcake	3db1831841	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2016-11-04 09:59:28 -07:00
samcake	7655f906f1	Starting adding a timer for the frame	2016-11-03 19:26:30 -07:00
howard-stearns	c5ee1941d1	raise desktop when showing it	2016-11-03 17:02:47 -07:00
Brad Hefta-Gaub	7cca8f0a66	Merge pull request #8993 from samcake/blue ... Prevent sparse texture on AMD gpus for now	2016-11-03 16:48:52 -07:00
samcake	1086585559	fixing the test to actually capture ati correctly and add the report to the ui	2016-11-03 15:15:05 -07:00
Clément Brisset	00a94bdd6d	Merge pull request #8974 from huffman/feat/help-select-xbox-tab ... Update help window to auto select xbox or vive controller tab on availability of device	2016-11-03 14:42:23 -07:00
Brad Hefta-Gaub	206f1ead1a	Merge pull request #8990 from howard-stearns/centered-toolbar ... centered toolbar	2016-11-03 14:18:32 -07:00
howard-stearns	b6e440f891	delete this and formatting	2016-11-03 13:26:50 -07:00
howard-stearns	7c45a78cb0	Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file	2016-11-03 13:17:47 -07:00
howard-stearns	3a072b5bf9	tell desktop about preference changes	2016-11-03 12:17:28 -07:00
howard-stearns	6aad78c8e8	Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar	2016-11-03 11:23:47 -07:00