63050 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	b28684f15e	Merge pull request #12087 from ctrlaltdavid/21661 ... Laser auto-on with tablet and Web overlays	2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub	aebd098e6e	Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting ... WL#21654: Make the Asset Browser Sort Case Insensitive	2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Brad Hefta-Gaub	6a3609093d	Merge pull request #12051 from dback2/polyobjimportfixes ... Poly obj import fixes	2018-01-05 13:33:29 -08:00
Seth Alves	487dab641f	Merge pull request #12090 from AndrewMeadows/simulation-ownership-003 ... more stable simulation ownership	2018-01-05 12:27:52 -08:00
Sam Gateau	91eb718074	Merge pull request #12091 from SamGondelman/overlayFix ... Update model render items on texture load and fix no haze issue	2018-01-05 12:26:56 -08:00
David Back	ac1c398b9d	Merge pull request #11669 from dback2/mergeAccountGlobalServices ... merge AccountScriptingInterface into GlobalServicesScriptingInterface	2018-01-05 11:34:53 -08:00
David Rowe	5431b7137b	Code review	2018-01-06 08:27:24 +13:00
David Back	76f278f899	Merge branch 'master' into mergeAccountGlobalServices	2018-01-05 10:56:12 -08:00
David Back	b165eac6a0	Merge branch 'master' into mergeAccountGlobalServices	2018-01-05 10:54:59 -08:00
Melissa Brown	933720fb10	Merge pull request #12012 from Delanir/Case10633 ... Cases 10632 and 10633 Particle Explorer UI	2018-01-05 10:46:41 -08:00
Melissa Brown	eb83c68d46	Merge pull request #12094 from ctrlaltdavid/resolution-removed ... Delete web3d overlay "resolution" property JSDoc	2018-01-05 10:38:07 -08:00
Seth Alves	2071d42d25	Merge pull request #12088 from ElderOrb/FB11008 ... 11008 GoTo app does not focus on address bar when opened	2018-01-05 10:07:36 -08:00
Andrew Meadows	c33c637f07	Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs ... Adopt path to certain Tablet dialogs to new loading subsystem and pat…	2018-01-05 09:07:54 -08:00
Ryan Downe Karpf	a3245aec57	Merge pull request #12079 from RebeccaStankus/log-filtering ... Log filtering	2018-01-05 08:40:41 -08:00
Seth Alves	fd8b521c50	Merge pull request #12038 from ElderOrb/audio_name_conflict_fix ... Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)	2018-01-05 08:15:48 -08:00
Sam Gondelman	5cf25a20c9	use correct model ptr	2018-01-04 21:21:58 -08:00
David Rowe	d6a0457ee5	Delete web3d overlay "resolution" property JSDoc	2018-01-05 16:48:37 +13:00
David Rowe	69dff9ac09	Remove unused code	2018-01-05 16:16:55 +13:00
David Rowe	4b2ed44322	Reduce incidence of tablet screen being rotated w.r.t. model	2018-01-05 16:16:42 +13:00
David Rowe	936b5f3571	Laser on tablet bezel as well as screen and "x" button	2018-01-05 16:15:59 +13:00
Lexx	85b54f82d8	revert sorting change mistake	2018-01-05 01:58:23 +00:00
SamGondelman	a9d5dda976	always push default haze to current frame	2018-01-04 17:54:23 -08:00
David Back	7558b00467	better fix for model scale floor, remove abs	2018-01-04 17:49:39 -08:00
NissimHadar	43bc8bb948	Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor ... defang accidental disable of MyAvatar's default motor	2018-01-04 17:44:22 -08:00
David Back	307867a91f	adjust to for loop	2018-01-04 16:53:35 -08:00
David Back	6b9658f8cf	merge	2018-01-04 16:41:58 -08:00
Andrew Meadows	01fd6dc8f6	add comments to make code more clear	2018-01-04 15:53:03 -08:00
Andrew Meadows	a51d83c6e4	rollback automatic priority promotion to RECRUIT	2018-01-04 15:53:03 -08:00
Andrew Meadows	6638b1deae	fix bug causing sim ownership thrash	2018-01-04 15:53:03 -08:00
Andrew Meadows	7e01f97f8f	more correct volunteer ownership priority promotion	2018-01-04 15:53:03 -08:00
Seth Alves	9e8e15d620	Merge pull request #12074 from AndrewMeadows/simulation-ownership ... fix bug preventing simulation ownership on localhost domain	2018-01-04 15:48:54 -08:00
SamGondelman	eb0d09360a	Merge remote-tracking branch 'upstream/master' into overlayFix	2018-01-04 15:47:20 -08:00
David Back	ac8b8da7b1	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices	2018-01-04 15:30:57 -08:00
David Rowe	67eb282815	Don't swap hands if both triggers are squeezed	2018-01-05 12:12:36 +13:00
Andrew Meadows	fbe2dd8a41	remove unnecessary 'virtual' keyword	2018-01-04 14:46:16 -08:00
Andrew Meadows	13538006ec	fix bug preventing sim owenrship on local domain	2018-01-04 14:46:16 -08:00
Stephen Birarda	22ced025cd	Merge pull request #12089 from Atlante45/fix/ice-servers ... Add Unused packet type back for ICE servers	2018-01-04 15:15:27 -07:00
David Rowe	27bed8d1f1	Tidying	2018-01-05 11:05:49 +13:00
David Rowe	fb09a9724e	Change laser hand with trigger squeeze	2018-01-05 11:04:09 +13:00
David Back	81f3590954	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices	2018-01-04 13:17:07 -08:00
Atlante45	294a7ca3c6	Make sure the protocol signature still changes	2018-01-04 13:15:01 -08:00
SamGondelman	6a19b0e0b6	update render items on texture load	2018-01-04 13:10:46 -08:00
Atlante45	d4a239731c	Add Unused packet type back for ICE servers	2018-01-04 13:07:02 -08:00
David Rowe	9f7a2b18e6	Use laser from dominant hand if both hands are pointing at the tablet	2018-01-05 10:04:39 +13:00
RebeccaStankus	9ba324b85f	"Clear Filter" button instead of "Show All"	2018-01-04 12:51:11 -08:00
RebeccaStankus	3e8063f80a	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-04 12:48:09 -08:00
Alexander Ivash	7ab7a46530	11008 GoTo app does not focus on address bar when opened	2018-01-04 23:38:10 +03:00
David Rowe	02f4085368	Fix magic number	2018-01-05 09:00:53 +13:00
Clément Brisset	efbff56f26	Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener ... Remove legacy jurisdiction code	2018-01-04 11:52:38 -08:00