64891 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Brad Davis	f01c42dcc9	Fixing merged dual-quat pipelines	2018-02-27 08:54:46 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -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
Brad Davis	24545f8b58	Fixing android errors	2018-02-26 12:32:57 -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
Brad Davis	5aa15b5422	Fixing build warnings	2018-02-26 10:17:07 -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
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
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
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Dante Ruiz	d0ec84b6c8	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08: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
vladest	b8102cfbd7	Make sure sort indicator is attached to the right of title	2018-02-23 10:06:16 +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
Brad Davis	e0e7fb04f2	Fix merge issues	2018-02-22 18:08:56 -08:00
David Back	ba0ba96d81	undo	2018-02-22 17:54:03 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -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
David Back	902672f85e	add dynamic mode for scripted avatar motor	2018-02-22 17:20:36 -08:00
Zach Fox	249f0568a1	New loader	2018-02-22 17:14:23 -08:00
Zach Fox	e3ccfc9935	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps	2018-02-22 16:39:26 -08:00
Zach Fox	f14673bc50	Fixup Checkout for apps	2018-02-22 16:38:38 -08:00
NissimHadar	3150b963c0	Implemented call to abortTask().	2018-02-22 16:29:58 -08:00
Zach Fox	33f73fef0d	YAY!	2018-02-22 16:26:35 -08:00
Zach Fox	10fa3fa346	It's working!	2018-02-22 16:09:01 -08:00
Brad Davis	4e2d3f23a6	Fix tonemapping on forward render pipeline / GLES	2018-02-22 15:38:15 -08:00
John Conklin II	730dce31e3	Merge pull request #12444 from zfox23/commerce_extendedCerts_1 ... Commerce: Extended Certificate Support, V1	2018-02-22 15:19:57 -08:00
Stephen Birarda	fc9af39745	Merge pull request #12451 from SimonWalton-HiFi/moc-fixes ... Add #include of Forward.h to AudioMixer.h	2018-02-22 16:09:24 -07:00
Zach Fox	de0eee52d6	cool	2018-02-22 14:45:32 -08:00
Brad Davis	49dea19b26	Fix BGR/RGB bug on GLES	2018-02-22 14:11:05 -08:00