38219 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	0e0fcdae74	fixing accidental commit of leap motion disabling.	2016-01-22 20:27:23 -08:00
Brad Davis	208d7c3cfc	Killing the old preferences dialog	2016-01-22 19:24:38 -08:00
Brad Davis	71ae36f5c0	Button prefs and conditionally enabled prefs	2016-01-22 19:06:30 -08:00
Brad Davis	858bbbf987	Adding OffscreenUI API for QInputDialog functionality	2016-01-22 17:31:03 -08:00
Brad Davis	27fdb523cb	Add directory & avatar browsing preferences	2016-01-22 17:30:10 -08:00
Brad Davis	c7186590ea	Support for directory browsing	2016-01-22 17:30:09 -08:00
Brad Davis	2026821d9e	Moving preferences to dependency mananger	2016-01-22 17:30:08 -08:00
Brad Davis	205ab05506	First pass on preferences dialog ... Conflicts: tests/ui/qmlscratch.pro	2016-01-22 17:30:07 -08:00
Leonardo Murillo	6cd6c3038f	Merge pull request #6911 from birarda/remove-old-interface ... remove old Interface and vcredist_x64.exe while running new installer	2016-01-22 19:14:41 -06:00
Brad Hefta-Gaub	0c64d45c18	Merge pull request #6909 from hyperlogic/tony/fly ... MyAvatar: fly animation	2016-01-22 17:04:53 -08:00
Brad Hefta-Gaub	d1444514e2	Merge pull request #6912 from sethalves/no-bootstrap ... adjust grab script so that avatars can't bootstrap themselves during an object hand-off	2016-01-22 16:55:31 -08:00
Stephen Birarda	95f9f7e6d6	remove old installer files while running new install	2016-01-22 16:51:52 -08:00
Clément Brisset	860d97edd7	Merge pull request #6910 from birarda/chromium-competition ... fix for crashing web windows, console search filtering	2016-01-22 16:46:44 -08:00
Stephen Birarda	3c2923f50a	Merge pull request #6893 from Atlante45/fix/new-assignment ... Fix DS new assignment feature	2016-01-22 16:44:35 -08:00
Seth Alves	41a2173901	adjust grab script so that avatars can't bootstrap themselves during an object hand-off	2016-01-22 16:38:28 -08:00
samcake	338342cdec	Merge pull request #6859 from zzmp/flag/shadows ... Add shadows behind a render-menu flag	2016-01-22 16:28:17 -08:00
Atlante45	9330c3d4f3	Fix DS assignment scripts responses	2016-01-22 16:04:38 -08:00
Stephen Birarda	801cbf3fac	make sure CONSOLE_INSTALL_APP_PATH is defined before use	2016-01-22 15:59:39 -08:00
Stephen Birarda	4e76f3ccc4	use RMDir for removal of old SC dirs	2016-01-22 15:55:58 -08:00
Stephen Birarda	6951f1aed7	tweak server console deletion requirements	2016-01-22 15:55:58 -08:00
Stephen Birarda	da1902ac72	use CMake InstallRequiredSystemLibraries for MSVC	2016-01-22 15:55:58 -08:00
Stephen Birarda	921d4dccd7	remove anything previously installed by old server-console	2016-01-22 15:55:58 -08:00
Stephen Birarda	971603bd57	make shortcuts to server-console point to right place	2016-01-22 15:55:58 -08:00
Stephen Birarda	53eee27086	use incredibly dumb win path to 64-bit dlls	2016-01-22 15:55:58 -08:00
Stephen Birarda	47a630f0ad	manually install msvc DLLs with Interface/DS/AC	2016-01-22 15:55:58 -08:00
Stephen Birarda	055a0ff7d9	check a level up from server-console.exe for win32	2016-01-22 15:55:58 -08:00
Stephen Birarda	9039334af5	reinstate the search filter in log	2016-01-22 15:55:58 -08:00
Stephen Birarda	5743c8046c	install the server-console in a subdir on win32	2016-01-22 15:55:58 -08:00
Leonardo Murillo	5d8828e872	Merge pull request #6894 from birarda/console ... use macdeployqt for fixup of components	2016-01-22 17:49:45 -06:00
Brad Hefta-Gaub	74c37104f6	Merge pull request #6905 from jherico/focus_fix ... Fix initial keyboard focus problems	2016-01-22 15:19:57 -08:00
Stephen Birarda	b099376193	fix a typo in message for macdeployqt	2016-01-22 14:47:25 -08:00
Andrew Meadows	86162094c1	Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation ... MyAvatar: Recenter when the head turns away from the hips	2016-01-22 14:07:40 -08:00
Andrew Meadows	200676ac68	Merge pull request #6896 from AndrewMeadows/another-crash-fix ... fix crash when deleting entities quickly	2016-01-22 14:04:46 -08:00
Anthony J. Thibault	7af20e90c8	Hooked up fly animation to json and Rig	2016-01-22 13:47:09 -08:00
Brad Davis	89b8eb2efa	Fix initial keyboard focus problems	2016-01-22 13:41:06 -08:00
Anthony J. Thibault	8bfa80d5fc	Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation	2016-01-22 13:37:43 -08:00
Atlante45	822244ef72	Fix DS new assignment feature	2016-01-22 13:37:19 -08:00
Brad Hefta-Gaub	9ec2cf1ab9	Merge pull request #6902 from sethalves/no-nan ... check values in location updates for NaN before using them	2016-01-22 13:34:15 -08:00
Stephen Birarda	61430235a0	Merge pull request #6907 from huffman/fix-console-log ... Fix auto scroll and font in console log window	2016-01-22 12:04:56 -08:00
Eric Levin	c908d9accf	Merge pull request #6906 from highfidelity/revert-6876-droplets ... Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"	2016-01-22 11:58:13 -08:00
Anthony J. Thibault	61b760038a	Address feedback from code review	2016-01-22 11:54:28 -08:00
Seth Alves	2633cb1f27	rename NaN functions for vec3 and quat	2016-01-22 11:54:24 -08:00
Ryan Huffman	d401a45d20	Fix auto scroll and font in console log window	2016-01-22 11:51:56 -08:00
samcake	f98f8d5bbb	Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"	2016-01-22 11:51:02 -08:00
Seth Alves	7a3401a8d7	Merge pull request #6867 from AndrewMeadows/collision-group-prep ... cleanup in preparation for smarter collision grouping	2016-01-22 11:45:42 -08:00
Seth Alves	673182c091	formatting	2016-01-22 11:22:02 -08:00
Brad Hefta-Gaub	d8850b4649	Merge pull request #6904 from howard-stearns/no-text-chat-in-about ... Remove obsolete reference to text chat within "about" text.	2016-01-22 11:19:43 -08:00
Seth Alves	a9cf836cb0	added isVec3NaN and isQuatNaN functions	2016-01-22 11:13:55 -08:00
Howard Stearns	9cec0e655b	Remove obsolete reference to text chat within "about" text.	2016-01-22 10:45:04 -08:00
Seth Alves	6294939095	missed one	2016-01-22 10:37:11 -08:00