23143 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	07ee350c09	Removing reported logspam from release builds	2015-03-18 10:24:53 -07:00
samcake	948ced81ce	Merge pull request #4461 from Atlante45/fix_recordings ... Fix recordings	2015-03-18 09:52:29 -07:00
Brad Hefta-Gaub	53ae4b48bc	Merge pull request #4459 from ctrlaltdavid/20400 ... CR for 20400 - Name tags going through the head	2015-03-17 21:54:13 -07:00
Brad Hefta-Gaub	a5294ae3fa	Merge pull request #4436 from sethalves/persist-entities-as-json ... Optionally persist entities as json	2015-03-17 21:53:17 -07:00
Brad Hefta-Gaub	55d9560c9e	Merge pull request #4469 from jherico/frustumFetchCheck ... Fix broken aspect ratio in mirror	2015-03-17 17:06:21 -07:00
Brad Davis	1662230289	Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only	2015-03-17 16:44:29 -07:00
Brad Davis	e616308911	Adding runtime check to ensure that the correct frustum is fetched during rendering	2015-03-17 16:28:44 -07:00
Brad Davis	895a0d7b85	Correcting frustum usage by the avatar renderer that was causing aspect ratio problem	2015-03-17 16:14:35 -07:00
Brad Hefta-Gaub	fde7d5d464	Merge pull request #4464 from jherico/rearView ... Removing a hack that breaks rendering of the head in mirror mode	2015-03-17 15:24:43 -07:00
Brad Davis	c88f6f8f07	Adding some documentation on the change	2015-03-17 13:49:06 -07:00
Brad Davis	71e59cfa88	Fix: Mini-mirror doesn't render avatar head when in first person mode	2015-03-17 13:15:15 -07:00
Atlante45	3a11ed0574	Account for stereo audio in recorder	2015-03-17 16:40:26 +01:00
Atlante45	7121126e6f	Wrong byte array size in audio client	2015-03-17 16:40:26 +01:00
Atlante45	b0fd28beeb	Typo	2015-03-17 16:40:25 +01:00
Brad Hefta-Gaub	d33d3afb52	Merge pull request #4454 from Atlante45/fix_mouse_visible_in_oculus ... Hide cursor at MainWindow level when in VRMode	2015-03-17 08:06:05 -07:00
Clément Brisset	9acc4a1a8f	Merge pull request #4457 from ZappoMan/quietLogs ... dont report deleteEntity warnings in client for delete messages coming back from server	2015-03-17 15:42:20 +01:00
Clément Brisset	6ffd44e768	Merge pull request #4456 from birarda/master ... go to sandbox if location not present in settings	2015-03-17 15:31:09 +01:00
Atlante45	1f8a874ce6	Hide cursor in 3D TV mode too	2015-03-17 12:34:13 +01:00
Brad Hefta-Gaub	88b3f14000	Merge pull request #4458 from jherico/nsight2 ... Making nsight usage optional (still defaults to on)	2015-03-16 19:04:05 -07:00
David Rowe	d08a25f1a3	A more realistic default head height	2015-03-16 15:48:10 -07:00
David Rowe	913527eaa3	Calculate head height based on skeleton model mesh if no head model ... This fixes the problem of some skeleton models with heads having display names rendering through them.	2015-03-16 15:47:54 -07:00
Seth Alves	bed37ef49a	incorporate code review feedback	2015-03-16 13:57:22 -07:00
Brad Davis	fd29f72bfe	Making nsight usage optional (still defaults to on)	2015-03-16 12:59:41 -07:00
Seth Alves	c90ca4b425	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-16 12:13:26 -07:00
Seth Alves	fe658c0ed0	diff minimization	2015-03-16 12:13:16 -07:00
Seth Alves	5bc2d88ea6	diff minimization	2015-03-16 12:11:41 -07:00
Seth Alves	999324bcaf	remove unused code	2015-03-16 12:06:27 -07:00
Seth Alves	1e50d94384	don't put arbitrarily large array on stack	2015-03-16 11:59:30 -07:00
Seth Alves	2d4a95c634	move to-map recurse operator class to its own file	2015-03-16 11:54:50 -07:00
Seth Alves	109271de3d	remove unused constant	2015-03-16 11:54:06 -07:00
Seth Alves	ecb958687d	don't crash if we encounter an unknown shape type	2015-03-16 11:53:47 -07:00
Andrew Meadows	e18d9fd81c	Merge pull request #4452 from sethalves/obj-reader-fixes ... Obj reader fixes	2015-03-16 11:35:51 -07:00
Andrew Meadows	fa27b76183	Merge pull request #4442 from Atlante45/edit_entities_box_selection ... editEntities - select all in/touching box	2015-03-16 11:33:35 -07:00
ZappoMan	7ddd54b782	dont report deleteEntity warnings in client for delete messages coming back from server	2015-03-16 11:11:07 -07:00
Stephen Birarda	a874f933c6	go to sandbox if location not present in settings	2015-03-16 11:00:04 -07:00
Seth Alves	a2bc34ced9	fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review	2015-03-16 10:03:55 -07:00
Andrew Meadows	510bcb4488	Merge pull request #4453 from sethalves/quiet-some-warnings ... Quiet some warnings	2015-03-16 09:31:14 -07:00
Seth Alves	32c79f6172	bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code	2015-03-16 09:17:32 -07:00
Atlante45	c421adaf58	Fix unresolve merge conflict	2015-03-16 16:27:33 +01:00
Atlante45	a9ed09a742	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-16 15:53:59 +01:00
Clément Brisset	468b62e536	Merge pull request #4451 from sethalves/linux-tools-window-freakout ... don't autohide tools window on Linux	2015-03-16 07:41:52 -07:00
Atlante45	c6167f6893	CR	2015-03-16 14:35:17 +01:00
Atlante45	ad16f49d01	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-16 14:28:24 +01:00
Clément Brisset	dfd39ca1e1	Merge pull request #4448 from huffman/loading-image ... Add hourglass image to loading svo overlay	2015-03-16 06:25:41 -07:00
Clément Brisset	934d9c087a	Merge pull request #4447 from ctrlaltdavid/20394 ... CR for Job #20394 - Build friends.js v1	2015-03-16 06:24:35 -07:00
Atlante45	c5010c4d55	Hide cursor at MainWindow level when in VRMode	2015-03-16 14:19:24 +01:00
Seth Alves	806280f9cc	Merge branch 'linux-tools-window-freakout' of github.com:sethalves/hifi into persist-entities-as-json	2015-03-15 09:00:24 -07:00
Seth Alves	bd85179d82	suppress a compiler warning	2015-03-15 08:24:59 -07:00
Seth Alves	af10c2274b	remove stray carriage returns	2015-03-15 08:24:49 -07:00
Seth Alves	d074cec135	fix obj writer in vhacd util	2015-03-15 08:14:25 -07:00