65225 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	fe515e949b	New UI for new HFC users	2018-02-23 16:36:20 -08:00
Atlante45	800d15b405	Make sure settings timer is running	2018-02-23 16:23:50 -08:00
howard-stearns	29a2fa6ca5	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:19:54 -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
Zach Fox	cc98eb6424	Fix lightbox stuck	2018-02-23 16:14:42 -08:00
howard-stearns	f66e688f41	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:12:41 -08:00
howard-stearns	53614a1d9f	almost working	2018-02-23 16:12:01 -08:00
Zach Fox	47b25740de	Update commerceLightBox	2018-02-23 15:23:51 -08:00
howard-stearns	34253082d4	always reset when asked	2018-02-23 15:11:08 -08:00
Zach Fox	432e647f7a	Fix 'What's This' link	2018-02-23 15:08:33 -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
howard-stearns	3c2626894c	fixes	2018-02-23 14:54:03 -08:00
howard-stearns	050df2ac2a	merge	2018-02-23 14:46:13 -08:00
Zach Fox	9b54ab1080	UI changes, V1	2018-02-23 14:42:05 -08:00
howard-stearns	09091d29f7	more logic framework	2018-02-23 14:35:30 -08:00
Stephen Birarda	b18d5db062	Merge pull request #12495 from huffman/fix/baking-stuck ... Fix/baking stuck	2018-02-23 15:19:29 -07:00
howard-stearns	84f9bff330	basic element, but not pretty and not functioning	2018-02-23 13:56:56 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Ryan Huffman	c368c84f59	Make BakeAssetTask::abort thread-safe	2018-02-23 11:06:11 -08:00
Dante Ruiz	d0ec84b6c8	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
Stephen Birarda	85bd0442a7	Merge pull request #12488 from Atlante45/feat/backups-integration ... Merge master into content archives PR	2018-02-23 11:19:42 -07: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
Thijs Wenker	a27a5a7e1f	export boolean properties properly	2018-02-23 18:16:38 +01:00
humbletim	7c571cd431	cleanup / addition error message detail	2018-02-23 10:31:57 -05:00
humbletim	058e4d1926	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:12:33 -05:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	ebdb5b3c17	CR feedback; remove unrollVertices; update getFace; guard more debug logging	2018-02-23 08:57:48 -05:00
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
vladest	b8102cfbd7	Make sure sort indicator is attached to the right of title	2018-02-23 10:06:16 +01:00
Atlante45	c106fee659	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00
Stephen Birarda	4c44bcfdba	Merge pull request #12487 from Atlante45/feat/backups-integration ... Actually remove Backup from list during delete	2018-02-22 20:22:43 -07:00
Atlante45	eeda07bba6	Actually remove Backup from list during delete	2018-02-22 19:19:39 -08:00
Stephen Birarda	32830cbcd3	Merge pull request #12486 from Atlante45/feat/backups-integration ... Never delete assets on load	2018-02-22 19:49:19 -07:00
Clément Brisset	0e5e63bf03	Merge pull request #12481 from birarda/feat/content-settings ... immediately show restore, set restore filename, cleanup old AS baked content on start	2018-02-22 18:41:13 -08:00
Atlante45	cbabca5e3e	Add loadingComplete callback	2018-02-22 18:36:36 -08:00
Atlante45	e5c501a4cd	Never delete assets on load	2018-02-22 18:36:22 -08: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
humbletim	0dd3672162	CR feedback / cleanup	2018-02-22 21:20:56 -05:00
Brad Davis	e0e7fb04f2	Fix merge issues	2018-02-22 18:08:56 -08:00
Stephen Birarda	a0f7d4dd34	use const auto & where possible as per CR comments	2018-02-22 18:08:08 -08:00
David Back	ba0ba96d81	undo	2018-02-22 17:54:03 -08:00
humbletim	d1c4bde677	revert OBJWriter.cpp	2018-02-22 20:53:27 -05:00
Stephen Birarda	d69669512f	Merge pull request #12483 from Atlante45/feat/backups-integration ... Remove deleted file from the _assetsOnDisk set	2018-02-22 18:46:25 -07:00
Atlante45	acf04830ee	Remove deleted file from the _assetsOnDisk set	2018-02-22 17:43:04 -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