4962 commits

Author	SHA1	Message	Date
Shannon Romano	32d3014d0d	Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 ... case 22190: Disable triggering away state when interface focus lost	2019-05-13 13:22:28 -07:00
danteruiz	0fae615cb4	fix dock widget context	2019-05-09 09:20:50 -07:00
Shannon Romano	15484436ca	Merge pull request #15507 from danteruiz/dockable-windows ... case LILY-30: Dockable Interactive Windows	2019-05-08 12:16:04 -07:00
danteruiz	3806631bf1	dockable window	2019-05-08 10:04:31 -07:00
Simon Walton	a100345416	Ensure banner entity is local entity	2019-04-26 19:21:40 -07:00
Simon Walton	60389017a4	Merge from master, including avatar protocol change ... Tony had added HandController version-type.	2019-04-26 18:51:41 -07:00
Simon Walton	1fe8f4332f	Fixes to banner; swap out avatar on client; reviewer comments; other WIP	2019-04-26 18:45:48 -07:00
Shannon Romano	a00545b48d	Merge pull request #15361 from SaracenOne/falling_push ... Case 22121: Allow players to disable automatic falling to flight threshold.	2019-04-26 14:03:52 -07:00
Sam Gateau	c647bbcb16	Merge pull request #15400 from danteruiz/throttle-refresh-rate ... Case 22253: Refresh Rate Controller	2019-04-26 12:04:39 -07:00
danteruiz	b60e35040e	another round of CR	2019-04-26 10:08:06 -07:00
danteruiz	9e1671a1bf	making requested changes	2019-04-25 16:02:12 -07:00
Simon Walton	f3efee56c0	Merge remote-tracking branch 'upstream/master' into avatar-verification	2019-04-25 13:40:27 -07:00
Sam Gondelman	ef64de7c04	Merge branch 'master' into openurl	2019-04-25 13:21:27 -07:00
Howard Stearns	da1597c5d1	Merge pull request #15327 from Atlante45/fix/warnings ... Case 22065: Fix mac warnings	2019-04-24 20:32:29 -07:00
Simon Walton	5f986bbeb7	New banner cpp files	2019-04-24 17:49:35 -07:00
SamGondelman	31b3f0e8f1	possible fix for openUrl exploit	2019-04-24 16:39:31 -07:00
Dante Ruiz	0bdc37859d	Refresh Rate Controller	2019-04-24 16:16:08 -07:00
SamGondelman	48aef3e6d9	build error	2019-04-23 10:46:53 -07:00
SamGondelman	4fc97effda	combine snapshotOperator lists per sam's suggestions	2019-04-22 16:22:18 -07:00
SamGondelman	06fbc8440e	Merge remote-tracking branch 'upstream/master' into stencil2	2019-04-22 13:28:30 -07:00
Clement	0f2dbd7b6a	Fix mac warnings	2019-04-19 20:14:15 -07:00
Shannon Romano	6c15719618	Merge pull request #15310 from danteruiz/fix-keyboard-scaling ... Case 21513: Keyboad doesn't scale to avatar after reloading content	2019-04-17 16:59:42 -07:00
SamGondelman	e7d12dc4f8	fix snapshots and preview	2019-04-17 15:43:05 -07:00
SamGondelman	c730e51d1e	wip redo stencil work	2019-04-11 13:22:51 -07:00
Saracen	3dde53f743	Friendlier and more understandable naming.	2019-04-11 03:57:34 +01:00
Sam Gateau	feb2757990	Merge pull request #15302 from sethalves/fix-linux-window-manager-fight ... case 21994: cooperate, rather than fight with, Linux window managers	2019-04-10 12:26:10 -07:00
Saracen	bce80130bd	Allow players to disable automatic falling to flight threshold.	2019-04-09 21:07:17 +01:00
Wayne Chen	4f738a5b42	code review feedback/formatting issues	2019-04-04 12:03:48 -07:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
Shannon Romano	f2ff5bebc7	Merge pull request #15275 from howard-stearns/ddv-all ... DDV all, including domainUnlimited	2019-04-03 11:03:16 -07:00
danteruiz	5f5e7d5f4e	a better fix	2019-04-03 10:45:40 -07:00
danteruiz	d88a13fc80	fix keybaord scaling	2019-04-02 13:28:41 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
Seth Alves	58605161e8	cooperate, rather than fight with, Linux window managers	2019-03-31 11:17:11 -07:00
Saracen	90e979bda7	Add option to disable triggering an away state when interface ... focus is lost.	2019-03-31 18:44:16 +01:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Howard Stearns	3da66dacc9	Merge branch 'master' of github.com:highfidelity/hifi into ddv-all	2019-03-27 15:08:03 -07:00
howard-stearns	bf1982564c	pass id around instead of relying on latest ivar value in a singleton	2019-03-26 19:26:38 -07:00
Howard Stearns	57da21cec2	more about challenges use entity id as id, not cert id	2019-03-26 17:12:28 -07:00
Howard Stearns	c9b79b24e3	track nonces by entity id instead of by cert	2019-03-26 15:23:13 -07:00
Howard Stearns	02129e0543	no-op refactor in prep for multiple entities per cert	2019-03-25 16:14:48 -07:00
David Rowe	cf4370ed3a	Merge branch 'master' into M21222	2019-03-26 09:44:48 +13:00
David Rowe	839a03ebe6	Miscellaneous JSDoc fixes noticed in passing	2019-03-26 09:41:07 +13:00
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -07:00
Wayne Chen	0edbf12fa3	removing extra onLevelChanged	2019-03-22 15:26:57 -07:00
Wayne Chen	d0116abc52	separating out bubble icon qml - adding support for transparency	2019-03-22 14:54:13 -07:00
Wayne Chen	8e6913dde1	staging avatar inputs for ignore radius	2019-03-22 14:50:14 -07:00
Wayne Chen	f80f4b2fd4	adding working bubble icon	2019-03-22 14:50:13 -07:00
Wayne Chen	20e181cd82	staging avatar inputs for ignore radius	2019-03-22 14:42:51 -07:00
Wayne Chen	49c3dfa52c	fixing typos	2019-03-22 14:33:54 -07:00