23812 commits

Author	SHA1	Message	Date
John Conklin II	9ba29028e3	Merge pull request #12398 from jherico/fix/spectator_cam ... Fix spectator camera crash	2018-02-14 13:15:42 -08:00
John Conklin II	6187731fdc	Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865 ... [Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click	2018-02-14 11:14:26 -08:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
Zach Fox	2f0c9e1acb	Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap ... Commerce: Fix wrap mode for very long P2P memos	2018-02-14 09:14:21 -08:00
John Conklin II	309c2ecba1	Merge pull request #12239 from druiz17/fix-camera-update ... Do not override sensorToWorldMatrix if animGraph is loading or failed to load	2018-02-13 15:10:13 -08:00
Zach Fox	3e41229e8c	Commerce: Fix wrap mode for very long P2P memos	2018-02-13 13:30:17 -08:00
Andrew Meadows	b111e82763	Merge pull request #12365 from AndrewMeadows/workload-001 ... moving Job/Task framework out of 'render' library and into its own 'task' library	2018-02-13 12:26:32 -08:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images ... 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
Dante Ruiz	45f09dde96	address tony's requests	2018-02-13 10:32:15 -08:00
Andrew Meadows	8231a56b22	pull task out of render and into its own lib	2018-02-13 08:56:11 -08:00
Andrew Meadows	be38a4bc71	creating workload lib	2018-02-13 08:54:44 -08:00
Sam Gateau	714e3f445d	Merge pull request #11537 from jherico/threaded_qml ... Migrating QML rendering off the main thread	2018-02-12 15:32:33 -08:00
John Conklin II	3377aaceea	Merge pull request #12343 from NissimHadar/saveSnapshotWithName ... Added option to select snapshot filename in scripts.	2018-02-12 15:22:04 -08:00
John Conklin II	51bf3c1466	Merge pull request #12323 from Zvork/shadow ... Shadow performance / acnee improvements	2018-02-12 14:41:13 -08:00
John Conklin II	d084e58f48	Merge pull request #12328 from Atlante45/fix/misc-bugs ... Misc bug fixes	2018-02-12 14:31:38 -08:00
Dante Ruiz	1a25332575	fix indenting	2018-02-12 10:59:25 -08:00
Dante Ruiz	3c84318918	fixing merge conflict	2018-02-12 10:57:55 -08:00
Dante Ruiz	d381beb213	cleaning up code	2018-02-12 10:53:42 -08:00
Dante Ruiz	5325b22b01	working on lambdas	2018-02-09 16:46:11 -08:00
John Conklin II	a961021101	Merge pull request #12378 from druiz17/save-avatarUrl ... save avatarUrl when setting new skeletonModelUrl	2018-02-09 16:04:35 -08:00
John Conklin II	88094cae87	Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2 ... Commerce: Inspection Certificate Redesign (Fixed!)	2018-02-09 15:51:46 -08:00
David Back	7bcfd0cf8d	Merge pull request #12114 from dback2/polymaterials ... Additional mtl spec support & fixes for Poly & more	2018-02-09 13:18:14 -08:00
John Conklin II	64c5b883b1	Merge pull request #12243 from RebeccaStankus/log-filtering ... Some improvements to the log window	2018-02-09 12:50:49 -08:00
Dante Ruiz	b3a3d92131	Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update	2018-02-09 10:31:43 -08:00
Bradley Austin Davis	7102cf44b8	Fixing merge errors	2018-02-09 10:30:57 -08:00
Dante Ruiz	beb41495d5	save avatarUrl when setting new skeletonModelUrl	2018-02-09 09:35:24 -08:00
RebeccaStankus	736115b12d	fixed QLabel include	2018-02-09 09:30:25 -08:00
Dante Ruiz	2ae976d256	Merge pull request #10 from sethalves/laser-bug ... allow overlay children to follow avatar from one domain to another	2018-02-08 17:20:18 -08:00
Seth Alves	5e16623c81	allow overlay children to follow avatar from one domain to another	2018-02-08 17:17:04 -08:00
Bradley Austin Davis	023ee35b2e	Merge remote-tracking branch 'upstream/master' into threaded_qml	2018-02-08 17:16:36 -08:00
Brad Hefta-Gaub	a6c8172990	Merge pull request #12370 from jherico/fix/deadlock_shaders ... Prevent deadlock crashes when building shaders at startup	2018-02-08 14:44:46 -08:00
Brad Hefta-Gaub	5aeadf04cf	Merge pull request #12371 from highfidelity/stable ... Merge stable back into master	2018-02-08 14:39:37 -08:00
RebeccaStankus	14839bc5f4	Some improvements to the log window ... -Renamed button "Clear Filters" to "All Messages" -Changed search result matching text to a more visible color -Made Date/Time text more visible -Added count of current messages in window -Set window to show all messages with no filtering upon first opening	2018-02-08 11:26:02 -08:00
divya	97abdb63db	Merge pull request #12364 from jherico/fix/display_plugin_crash ... Don't trigger a backtrace exception on quitting while in HMD	2018-02-08 11:18:19 -08:00
John Conklin II	d0cfdfb4ca	Merge pull request #12368 from jherico/fix/offscreen_deadlock ... Fix for deadlock triggering while loading QML engine	2018-02-08 10:37:46 -08:00
Zach Fox	a92e614aff	Bugfix.	2018-02-08 10:35:34 -08:00
Bradley Austin Davis	8748e98b5e	Prevent deadlock crashes when building shaders at startup	2018-02-08 10:23:25 -08:00
Zach Fox	744f679b4e	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2	2018-02-08 09:51:35 -08:00
David Back	880ef17c75	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-02-07 18:11:15 -08:00
Bradley Austin Davis	77741c2851	Fix for deadlock triggering while loading QML engine	2018-02-07 16:43:15 -08:00
Zach Fox	f5e2e4f3d8	Comment change	2018-02-07 15:44:21 -08:00
Bradley Austin Davis	2c514b5d1b	Don't trigger a backtrace exception on quitting while in HMD	2018-02-07 15:28:04 -08:00
Zach Fox	7f0915f6ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2	2018-02-07 15:14:33 -08:00
Zach Fox	e01e88d4ae	This works, but is it correct?	2018-02-07 15:13:22 -08:00
Seth Alves	fdbfeab3ea	Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto	2018-02-07 14:22:26 -08:00
Seth Alves	8d35bcb3e5	Merge pull request #12347 from AndrewMeadows/quickfix-tractor ... remove initial glitch in Tractor (grab) action	2018-02-07 14:22:12 -08:00
Seth Alves	84ed23f547	Merge pull request #12292 from ElderOrb/FB11855 ... FB11855 - Change bubble icon on tablet	2018-02-07 14:03:16 -08:00
Zach Fox	2270dcd79d	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-07 13:52:20 -08:00
Seth Alves	84f4453990	undo part of #12312	2018-02-07 13:32:30 -08:00
Zach Fox	3c34d13ec6	Revert "Commerce: Inspection Certificate Redesign"	2018-02-07 13:22:09 -08:00