39082 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Pomerantz	0e9d696859	Cache renderable model orig texs as QVariantMap	2016-02-15 11:09:10 -08:00
Zach Pomerantz	0903e14b06	Revert model texs when unset	2016-02-12 15:57:24 -08:00
Brad Hefta-Gaub	98aaf02030	Merge pull request #7098 from zzmp/fix/model-texture-delta ... Update NetworkMaterial maps when changing textures	2016-02-12 15:16:17 -08:00
Andrew Meadows	2f2d1b5d22	Merge pull request #7076 from birarda/integrate-new-hrtf ... use injector not mixed count for inactivity	2016-02-12 15:14:53 -08:00
Chris Collins	3321265ae7	Merge pull request #7086 from howard-stearns/clear-away-on-buttons ... Clear pause/away on controller button press	2016-02-12 12:56:42 -08:00
Zach Pomerantz	d21f9d555a	Update NetworkMaterial maps when changing textures	2016-02-12 12:37:07 -08:00
Anthony Thibault	7d400623be	Merge pull request #7096 from howard-stearns/fix-lookAt ... Fix Quat.lookAt	2016-02-12 12:01:19 -08:00
Andrew Meadows	1e29faf365	Merge pull request #7090 from ZappoMan/fixOctreeBag ... move back to unordered_set so that OctreeElementBag will handle uniqueness	2016-02-12 11:22:46 -08:00
samcake	ef92a52777	Merge pull request #7051 from zzmp/feat/graphics-dialog ... Move graphics settings to a new dialog	2016-02-12 10:46:00 -08:00
Howard Stearns	80baa5ce18	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-lookAt	2016-02-12 10:39:31 -08:00
Howard Stearns	874f74de04	Fix Quat.lookAt	2016-02-12 10:38:50 -08:00
Andrew Meadows	31f9da2dcb	Merge pull request #7094 from sethalves/fix-attachment-manager ... fix some things I broke yesterday	2016-02-12 09:40:52 -08:00
Seth Alves	5659589ea1	Merge pull request #7088 from birarda/offline-domain ... fix STUN failover for offline machines	2016-02-12 09:16:20 -08:00
Seth Alves	94bc1764a8	fix auto-updating of adjustments to worn or equipped entities	2016-02-12 06:58:44 -08:00
Seth Alves	ca5525cc3f	if an entity already was near-picked, don't do a distance-to-center check on it.	2016-02-12 06:58:14 -08:00
Brad Hefta-Gaub	477dfe1b10	use std::unordered_map<> instead of std::unordered_set<>	2016-02-11 20:42:42 -08:00
Zach Pomerantz	232f06e175	Avoid unnecessary TaskConfig dtor	2016-02-11 17:29:18 -08:00
Seth Alves	90d81bc17b	Merge pull request #7091 from jherico/overlayCrash ... Prevent overlay cleanup from crashing the app	2016-02-11 16:26:07 -08:00
James B. Pollack	2889bdd8b2	Merge pull request #7083 from ZappoMan/fixDoublePreload ... handle two corner cases where preload would get called twice	2016-02-11 16:08:43 -08:00
Andrew Meadows	b6456889ef	Merge pull request #7050 from Atlante45/fix/audio-stats ... Fix audio stats	2016-02-11 15:56:45 -08:00
Brad Davis	e06bc26896	Prevent overlay cleanup from crashing the app	2016-02-11 15:17:58 -08:00
Seth Alves	89b85f3a78	Merge pull request #7087 from AndrewMeadows/crash-fix ... yet another attempt to avoid physics crashes	2016-02-11 14:58:57 -08:00
Brad Hefta-Gaub	26ab1bdac4	move back to unordered_set so that OctreeElementBag will handle uniqueness	2016-02-11 14:50:18 -08:00
Stephen Birarda	a6ba8dd8e5	fix null STUN server socket check in LNL	2016-02-11 14:14:16 -08:00
Stephen Birarda	a089c43fdc	don't send ice heartbeat with no ice-server socket	2016-02-11 14:07:05 -08:00
Andrew Meadows	2b91a31919	check for nullptr to avoid crashes	2016-02-11 13:53:01 -08:00
Stephen Birarda	3dbb444a65	Merge pull request #7068 from huffman/server-console-icons ... Update server console tray icons to include status	2016-02-11 13:28:47 -08:00
howard-stearns	7c4e31687c	simpler/better/more reliable (peek)	2016-02-11 13:27:56 -08:00
Chris Collins	c6bc91f8b2	Merge pull request #7084 from jherico/toolTabs ... Allow closed tabs to delete properly	2016-02-11 13:20:20 -08:00
Brad Hefta-Gaub	894c75f8fc	Merge pull request #7066 from zzmp/fix/circle3d-radii ... Add radius as property to circle3d	2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub	d14b9ab9b6	Merge pull request #7065 from zzmp/fix/circle3d-click ... Fix circle3d FindRayIntersection	2016-02-11 13:07:00 -08:00
howard-stearns	0d8404e7e8	interact more safely with mappings	2016-02-11 13:05:47 -08:00
Chris Collins	ca15638463	Merge pull request #7080 from ZappoMan/fixPersistMono ... add support for persisting the mono preview mode option	2016-02-11 13:03:49 -08:00
Chris Collins	38ba852c2e	Merge pull request #7075 from Atlante45/fix/add-to-scene ... Fix "Add to scene" option while dropping model	2016-02-11 13:02:36 -08:00
Ryan Huffman	6d55c5223c	Fix osx stopping icon	2016-02-11 12:16:11 -08:00
howard-stearns	93d72833bf	Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons	2016-02-11 12:10:53 -08:00
Ryan Huffman	76c9e298f5	Update tray icon images	2016-02-11 11:54:29 -08:00
Ryan Huffman	c4c1fdc6db	Fix server console not shutting down with new icons	2016-02-11 10:32:26 -08:00
Zach Pomerantz	d0f3ad75b8	Nest Persistent in Config to compile on nix	2016-02-11 10:27:32 -08:00
Brad Davis	2ee1f18e06	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
Chris Collins	a4afa03fe5	Merge pull request #7077 from sethalves/clean-up-grab-signaling ... Clean up grab signaling + various fixes	2016-02-11 10:20:56 -08:00
Zach Pomerantz	a7778daed2	Change graphics dialog to persisted dropdowns	2016-02-11 10:15:13 -08:00
Stephen Birarda	62e842bf2b	Merge pull request #7052 from huffman/bugsplat ... BugSplat integration	2016-02-11 10:10:44 -08:00
Zach Pomerantz	84197e5eb2	Add persistent render engine configuration file	2016-02-11 10:00:44 -08:00
Zach Pomerantz	66e1d9668c	Add ComboBox preference	2016-02-11 10:00:44 -08:00
Zach Pomerantz	5eeaa9a33e	Move graphics settings to dedicated dialog	2016-02-11 10:00:44 -08:00
samcake	99e9b3ecdd	Merge pull request #7043 from zzmp/fix/render-ui ... Revamp the render engine ui	2016-02-11 09:57:51 -08:00
Clément Brisset	911591c0ea	Merge pull request #7082 from birarda/hrtf-map-crash ... fix for HRTF map crash	2016-02-11 09:57:20 -08:00
Ryan Huffman	d226416306	Update params to MiniDmpSender to be const	2016-02-11 09:46:31 -08:00
Ryan Huffman	71b72aceb8	Fix CHECKED_FOR_BUGSPLAT_ONCE	2016-02-11 09:46:12 -08:00