26981 commits

Author	SHA1	Message	Date
samcake	ea9dee1286	FIrst step introducing the Transaction model to access the Proxy of the space	2018-03-12 17:49:45 -07:00
samcake	7eaebaf23d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis	2018-03-12 14:37:58 -07:00
samcake	7116d82dc5	Merge branch 'workload-master' of github.com:samcake/hifi into workload-bis	2018-03-12 12:04:20 -07:00
John Conklin II	1c403b7532	Merge pull request #12616 from NissimHadar/bug12435 ... Mitigation of Manuscript issue 12435	2018-03-12 12:01:42 -07:00
samcake	9bec8cdd0b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-12 12:01:00 -07:00
samcake	69fe1ace0b	THe View rings are rendering corectly, let s ship it	2018-03-12 11:59:03 -07:00
John Conklin II	5bd49ce9dc	Merge pull request #12617 from samcake/punk ... Fix shadow: other avatars casting shadow, graphics settings checkboxes & menu layout	2018-03-12 10:49:48 -07:00
Sam Gateau	9e7260839c	Better rendering of the view circles	2018-03-12 01:05:07 -07:00
Sam Gateau	e3c8b9c62d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis	2018-03-09 22:24:58 -08:00
samcake	4a7d3e8e0e	REndering the view rings better	2018-03-09 17:49:50 -08:00
samcake	e8b5a875d6	REndering the view rings better	2018-03-09 17:40:58 -08:00
samcake	10016756b7	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-03-09 16:32:37 -08:00
Simon Walton	cc166dbece	LogHandler regexps - use vector of values	2018-03-09 15:44:56 -08:00
Simon Walton	d4cf22fbaf	LogHandler class stores regexps - code tweaks ... Code standard changes from review.	2018-03-09 15:29:10 -08:00
Simon Walton	4b27cd73ff	LogHandler class stores regexps rather than always recreating ... General efficiency tweaks; move to C++11.	2018-03-09 15:29:09 -08:00
NissimHadar	9b9b62d0e4	Transition to hover if falling and height above ground is greater than the threshold.	2018-03-09 15:20:51 -08:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
samcake	10447bf10e	Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there	2018-03-09 13:04:04 -08:00
Sam Gateau	d0de5b2d96	Merge pull request #12496 from AndrewMeadows/faster-raypick ... faster per-entity raypick culling and time-boxed picks	2018-03-09 13:01:52 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub	6b55fa1fcd	Merge pull request #12539 from ctrlaltdavid/21702 ... Remove deprecated Window.location.protocolVersion() function from API	2018-03-09 08:52:55 -08:00
Andrew Meadows	858b02f29d	more readable code	2018-03-09 08:35:18 -08:00
Andrew Meadows	3f1944eb8a	fix variable name typo	2018-03-09 08:35:18 -08:00
Andrew Meadows	9eecd3cb80	update styluses first: they are cheap	2018-03-09 08:35:18 -08:00
Andrew Meadows	f83c6000df	use 'auto' for very long type	2018-03-09 08:35:18 -08:00
Andrew Meadows	24635b0451	remove unused debug cruft variable	2018-03-09 08:35:18 -08:00
Andrew Meadows	7a39bd5c81	remove tab whitespace	2018-03-09 08:35:18 -08:00
Andrew Meadows	9fbe7ec194	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -08:00
Andrew Meadows	7a19f48b9c	move rayHitsSphere logic to AABox method	2018-03-09 08:35:18 -08:00
Andrew Meadows	2750f3ee71	remove unused cruft and avoid useless work	2018-03-09 08:35:18 -08:00
Andrew Meadows	6ab85d5800	cleanup and a few small optimizations	2018-03-09 08:35:18 -08:00
Andrew Meadows	79b9fec900	add rayHitsSphere() util method	2018-03-09 08:35:18 -08:00
Andrew Meadows	81de668c1e	faster per-entity raypick culling	2018-03-09 08:35:18 -08:00
Sam Gateau	f087bb7623	Adjust the freeze view and start drawing the views better	2018-03-09 01:38:00 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
John Conklin II	260715d616	Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug ... Fixed blocks importer textures being interpreted as image entities	2018-03-08 13:33:41 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	a703b5a3b5	Added check to correct crashing when selecting ambient occlusion from menu.	2018-03-08 12:15:26 -08:00
Brad Hefta-Gaub	d2e264ab32	Merge pull request #12583 from samcake/punk ... Fix Local lights not showing anymore	2018-03-08 10:31:58 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
John Conklin II	1341774450	Merge pull request #12482 from SimonWalton-HiFi/declare-metatype ... Add a Q_DECLARE_METATYPE in TextureCache.	2018-03-08 09:37:06 -08:00
Sam Gateau	ceb38dbc97	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-07 18:54:21 -08:00
Sam Gateau	dc122b4ce8	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-07 18:14:44 -08:00
samcake	87b159e491	merge with upstream, fixed a smal typo bug and clean up the ui	2018-03-07 17:30:11 -08:00
Clément Brisset	b7ac07f590	Merge pull request #12589 from highfidelity/RC65 ... merge back RC65 to master after RC hotfixes	2018-03-07 17:22:41 -08:00
Andrew Meadows	77d0c211df	fix warnings on windows	2018-03-07 15:46:42 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
SamGondelman	0aacdcd558	docs	2018-03-07 13:34:48 -08:00