64964 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
John Conklin II	25144f0fec	Merge pull request #12456 from Atlante45/fix/min-spec-crash ... Fix crash when passing --checkMinSpec flag	2018-02-26 17:35:46 -08:00
Clément Brisset	2a7a71db13	Merge pull request #12477 from Atlante45/new-master ... Merge stable back into master	2018-02-26 17:18:24 -08:00
Atlante45	2a204533f4	Add comments to startup processes	2018-02-26 16:25:41 -08:00
Ryan Huffman	24da043937	Merge pull request #12437 from sethalves/fix-qt-5-10-udt ... fix Qt 5.10 udt packet reading	2018-02-26 13:50:41 -08:00
Seth Alves	d60d8fe702	Merge pull request #12498 from vladest/fix_crash_startup ... Search main window by checking object name	2018-02-26 13:06:10 -08:00
Sam Gondelman	d1d6adf447	Merge pull request #12493 from sethalves/fix-shadows-on-osx-1 ... fix osx shadows	2018-02-26 11:46:43 -08:00
John Conklin II	7d450daaa1	Merge pull request #12397 from hyperlogic/bug-fix/entity-mat-avatar-dual-quaternions ... Bug fix/entity mat avatar dual quaternions	2018-02-26 11:37:33 -08:00
John Conklin II	4feea929ce	Merge pull request #12449 from misslivirose/fix/atp-collisions ... change default add to world shape for asset browser	2018-02-26 11:15:01 -08:00
John Conklin II	6316f33282	Merge pull request #12485 from dback2/avatarMotors ... Add dynamic mode for scripted avatar motor	2018-02-26 11:03:30 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
John Conklin II	e586a35d38	Merge pull request #12489 from vladest/fix_table_sort_indicator ... Make sure sort indicator is attached to the right of title	2018-02-26 10:33:27 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
Anthony J. Thibault	c8af9c6f04	Missing EPSILON	2018-02-26 10:05:15 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
NissimHadar	c0f20900a0	Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix ... Corrected edge case of creating a snapshot with "" as the filename.	2018-02-26 09:39:16 -08:00
John Conklin II	c227c11aa2	Merge pull request #12475 from ElderOrb/FB12518 ... fix for 'help icon in toolbar does not highlight when help window is open'	2018-02-26 09:35:56 -08:00
Olivier Prat	12d7e89d7e	Switched back velocity buffer job to original place while I try to get more info on how/where that tablet is rendered	2018-02-26 18:13:41 +01:00
Olivier Prat	d288ebe79e	Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased	2018-02-26 18:07:44 +01:00
Zach Fox	b5c42bfeca	Merge pull request #12480 from zfox23/commerce_extendedCerts_apps ... Commerce: Extended Certificates - Apps!	2018-02-26 08:24:53 -08:00
vladest	77ef0e05a1	Search main window by checking object name	2018-02-26 13:43:50 +01:00
vladest	62f2ba0dad	More intellectual calculation of title positions taking in account actual sort indicator glyph size	2018-02-24 09:32:08 +01:00
Seth Alves	9e156deaab	Merge pull request #12494 from druiz17/one-menu ... Remove the avatarEntitiesBookmark menu option	2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub	3d54f4d246	Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog ... Relax deadlock watchdog	2018-02-23 17:09:30 -08:00
Atlante45	800d15b405	Make sure settings timer is running	2018-02-23 16:23:50 -08:00
Sam Gondelman	e10af9b83d	Merge pull request #12462 from SamGondelman/entityDelete ... Fix EntityItems not getting destroyed	2018-02-23 16:17:52 -08:00
David Back	283b5724ba	CR changes	2018-02-23 15:02:51 -08:00
David Back	da391564a8	CR changes	2018-02-23 15:01:29 -08:00
David Back	a418129bea	simplify to just changing timescales	2018-02-23 15:00:23 -08:00
Olivier Prat	d3114cbc67	Android compilation fixes again	2018-02-23 21:52:45 +01:00
Olivier Prat	65f3408458	Fixed compilation error with GLES backend on Android	2018-02-23 20:19:55 +01:00
Dante Ruiz	d0ec84b6c8	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
Olivier Prat	37fdf81f1b	Fix warnings on mac and ubuntu	2018-02-23 19:37:12 +01:00
Zach Fox	5ee28297f3	Don't use eventLoop, since that will block the UI	2018-02-23 10:19:00 -08:00
Seth Alves	59bd05aa55	make shadow-related shader compile on osx	2018-02-23 09:22:34 -08:00
Dante Ruiz	d3be1a8a23	Merge branch 'master' of github.com:highfidelity/hifi	2018-02-23 09:20:03 -08:00
Olivier Prat	c935111c43	Some slight cleanup in Application_render	2018-02-23 18:13:08 +01:00
Olivier Prat	b1b62087e5	Forgot to reactivate deadlock detection	2018-02-23 18:08:21 +01:00
Olivier Prat	ee253143ff	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-23 14:53:14 +01:00
Olivier Prat	6a550e983f	Disable sharpen with FXAA	2018-02-23 14:46:37 +01:00
Olivier Prat	095f426f31	Adjusted default sharpen	2018-02-23 14:43:22 +01:00
Olivier Prat	c9a6d6bf14	Added adjustable post sharpen filter	2018-02-23 11:53:05 +01:00
Olivier Prat	d316b6e074	Fixed broken TAA on desktop... grrr.	2018-02-23 11:28:00 +01:00
Olivier Prat	4636f43728	Simplified camera view history and TAA is now working in all circumstances.	2018-02-23 10:19:05 +01:00
vladest	b8102cfbd7	Make sure sort indicator is attached to the right of title	2018-02-23 10:06:16 +01:00
Olivier Prat	7432c8361e	Added some comments to try to help understand the correction pipeline	2018-02-23 09:11:17 +01:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
David Back	ba0ba96d81	undo	2018-02-22 17:54:03 -08:00
ZappoMan	9f68accb30	add menu for testing unresponsive interface	2018-02-22 17:34:00 -08:00
David Back	083e461eb0	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors	2018-02-22 17:20:49 -08:00