56830 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	b546d977f4	"EZRECORD" app script and button	2017-06-24 12:07:20 +12:00
Anthony J. Thibault	aabbcfd23d	code review feedback	2017-06-23 16:47:53 -07:00
David Rowe	384e2cefdb	Update make file per master changes	2017-06-24 09:53:58 +12:00
Anthony J. Thibault	b8c638b2b7	warning fixes	2017-06-23 14:36:59 -07:00
Seth Alves	43ba5f3772	Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward ... Fix for eye direction when no look at targets are present.	2017-06-23 14:32:21 -07:00
Ryan Huffman	86ed61a15d	Push avatar packet version for isReplicated	2017-06-23 14:26:13 -07:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
samcake	c0e8b6c8bc	clean up	2017-06-23 14:18:56 -07:00
Anthony J. Thibault	f320610681	opened up shoulder constraint + other fixes ... * bent elbows will be away from the body a bit more. * sped up smoothing of pole vectors	2017-06-23 14:06:00 -07:00
samcake	b7b520a6e8	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-23 13:50:31 -07:00
Brad Davis	f1fe4ed7cc	Merge pull request #10804 from jherico/fix_deps_3 ... Remove dependency between codec plugins and UI	2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
David Kelly	bda50af780	this uses qt's test location for AppData/Local, but leaves Roaming alone	2017-06-23 11:06:48 -07:00
Ryan Huffman	b12018ccf3	Fix Oven not properly handling native separators	2017-06-23 10:54:48 -07:00
Ryan Huffman	7298cd6940	Add support for vs2015 and vs2017 FBX libs	2017-06-23 10:54:31 -07:00
Anthony J. Thibault	8f89ef0931	Fix for eye direction when no look at targets are present.	2017-06-23 10:52:23 -07:00
Anthony J. Thibault	54af6af651	Fix for pole vector stability and knee pole vector computation	2017-06-23 10:38:21 -07:00
Brad Davis	416852c0cd	Fix warnings about creating QObjects with parents in different thread	2017-06-23 10:19:16 -07:00
Seth Alves	5e2aeb96d3	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan	2017-06-23 10:18:33 -07:00
humbletim	d6eb77e815	changes per feedback to quiet print debugs throughout	2017-06-23 13:09:22 -04:00
Brad Davis	341646c780	Fix bad invocation, cleanup signatures	2017-06-23 09:58:27 -07:00
David Kelly	04160f2ca1	switch to change ktx_cache directory (only)	2017-06-23 09:19:41 -07:00
David Kelly	63279f4525	Merge pull request #10790 from davidkelly/dk/scriptsSwitch ... Command line switch to override default scripts location	2017-06-23 08:53:40 -07:00
Seth Alves	5af07dfb62	more memory-debugger	2017-06-23 08:16:48 -07:00
David Kelly	7ef50042ba	remove turd	2017-06-23 08:00:18 -07:00
druiz17	91ce9235ea	Merge pull request #10747 from zzmp/audio/select-log ... Log audio selections	2017-06-23 07:54:03 -07:00
Zach Pomerantz	a82cc0ec09	retab	2017-06-23 09:35:48 -04:00
David Rowe	9f48a139cc	Fix crash when enable Leap Motion	2017-06-23 18:37:48 +12:00
David Rowe	e1dcf01706	Better settings text	2017-06-23 17:33:02 +12:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
David Rowe	b26f5c5811	Clear finger joints when finger poses no longer being updated	2017-06-23 16:15:40 +12:00
Brad Davis	d50c448151	Fix heap corruption coming out of running scripts dialog	2017-06-22 19:15:58 -07:00
samcake	c24e254257	Add support for profiling from scripts	2017-06-22 18:10:20 -07:00
Seth Alves	8510b60a87	Merge pull request #10789 from sethalves/fix-domain-server-ice-messages ... fix the messages printed by domain-server about which name it's using to find ice-servers	2017-06-22 17:59:09 -07:00
Clément Brisset	3ea7b82d61	Merge pull request #10796 from birarda/bug/audio-codec-replication ... check for codec changes for replicated agents	2017-06-22 16:51:40 -07:00
Clément Brisset	d182f06d1e	Merge pull request #10786 from Atlante45/feat/replicants ... Prevent replication flat loops	2017-06-22 16:41:59 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
Zach Fox	749082c580	Merge pull request #10794 from zfox23/lightInstaller_forceNoLaunch ... Add a /forceNoLaunch switch to the installer	2017-06-22 16:38:20 -07:00
David Rowe	8682cee17a	Refactoring	2017-06-23 11:33:29 +12:00
Stephen Birarda	ec30d9ad5c	always re-process codec for replicated agent	2017-06-22 16:18:46 -07:00
Zach Fox	e5666fbb2f	Two different options for server and client	2017-06-22 15:44:55 -07:00
samcake	bda52c33e6	Adding the function source when profiling, to explore perf issues	2017-06-22 15:35:00 -07:00
Atlante45	71d2540a23	Prevent replication flat loops	2017-06-22 15:22:32 -07:00
Clément Brisset	c47645e075	Merge pull request #10778 from birarda/feat/upstream-in-nodelist ... add upstream nodes to NL and verify replicated packet sender	2017-06-22 15:16:23 -07:00
Zach Fox	2318b6aef8	Add a /forceNoLaunch switch to the installer	2017-06-22 15:02:59 -07:00
Dante Ruiz	c3b6b2ad51	Merge branch 'master' of github.com:highfidelity/hifi into wide-stance-fix	2017-06-22 22:49:25 +01:00
Dante Ruiz	b48efc4317	fixed wide stance issue	2017-06-22 22:48:32 +01:00
Stephen Birarda	07ccf13ca9	Merge pull request #10788 from seefo/fb5533 ... Fixed a bug where restart modal was shown when it shouldn't be	2017-06-22 14:44:19 -07:00