20199 commits

Author	SHA1	Message	Date
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Chris Collins	820ed5049b	Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire ... Fix -- dont send non-entity edits to entity-server	2017-05-05 16:37:27 -07:00
Zach Fox	6b00688289	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges ... "Set Availability" UI changes	2017-05-05 14:03:39 -07:00
Zach Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00
howard-stearns	2ecc71a990	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
Zach Fox	b41fb952ae	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Chris Collins	8d49540f3a	Merge pull request #10380 from vladest/rightclick-fix ... Rightclick fix	2017-05-05 10:01:11 -07:00
Andrew Meadows	f809afae2f	Merge pull request #10363 from jherico/qmlspam ... Removing logspam on toggling scripts window	2017-05-05 08:29:12 -07:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	0406cc41e0	if model-overlay has no name, use its url	2017-05-04 18:37:04 -07:00
Seth Alves	c04c0c5b13	if model-overlay has no name, use its url	2017-05-04 18:36:51 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
Atlante45	ecda313223	Add runtime access to compression settings	2017-05-04 15:07:59 -07:00
howard-stearns	9954380ce3	don't filter out the place you're at anymore	2017-05-04 14:44:48 -07:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer ... Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Anthony Thibault	7006fa6da4	Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update ... grab is driven by timer rather than update, load tablet model with high priority	2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00
Vladyslav Stelmakhovskyi	c8a9b02c7a	Block only secondary button	2017-05-04 20:26:02 +02:00
Andrew Meadows	7cb2bff4c5	Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash ... Fix vr 2d vr tablet crash	2017-05-04 10:08:55 -07:00
Seth Alves	9ab2a61a4b	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 10:04:18 -07:00
Vladyslav Stelmakhovskyi	4cefa0379c	Merge branch 'master' into rightclick-fix	2017-05-04 16:13:07 +02:00
Vladyslav Stelmakhovskyi	99ed2556f2	Do not send non primary button events to Tablet window	2017-05-04 16:11:07 +02:00
David Rowe	30604ab901	Fix some typos noticed in passing	2017-05-04 16:56:18 +12:00
David Rowe	9d92ed2b9b	Fix keyboard not appearing in social media snapshot sharing dialogs	2017-05-04 16:55:10 +12:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
David Rowe	8ae3d4e8a0	Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml	2017-05-04 13:10:09 +12:00
Zach Fox	affc7fc654	Merge pull request #10369 from druiz17/url-fix ... Fix tablet webview showing incorrect url.	2017-05-03 16:58:06 -07:00
Zach Fox	d28d89e8ff	Merge pull request #10368 from zfox23/palWebViewtoTabletWebView ... PAL WebView is now a TabletWebView	2017-05-03 16:51:32 -07:00
anshuman64	a924a33428	Merge pull request #10361 from ctrlaltdavid/21315 ... Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 16:41:43 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 ... Bullet constraints	2017-05-03 16:30:34 -07:00
Zach Fox	4d49ae5b09	Remove the +1s	2017-05-03 15:43:57 -07:00
Zach Fox	07d3e482cf	ARG	2017-05-03 15:40:39 -07:00
Dante Ruiz	5390a29859	tabletwebview-url-fix	2017-05-03 23:05:05 +01:00
Zach Fox	eaf819d11d	Remove FIXME	2017-05-03 14:59:07 -07:00
Zach Fox	066b2db73f	Make the change	2017-05-03 14:57:31 -07:00
Zach Pomerantz	4a8f5e380f	Merge pull request #10358 from zzmp/fix/minimize-deadlock ... Fix deadlock from minimizing	2017-05-03 15:06:27 -04:00
Zach Fox	ae72b9b73d	Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 ... Lots of Snapshot app improvements, Round Two	2017-05-03 11:44:40 -07:00
Brad Davis	8e12c1959d	Removing logspam on toggling scripts window	2017-05-03 09:53:32 -07:00
David Rowe	7fdcb9b1f0	Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 14:59:41 +12:00
David Rowe	7b387c52c3	Fix reliability of keyboard enabling in tablet Web pages	2017-05-03 14:42:06 +12:00
Zach Pomerantz	ad8d3e5490	continue idling while minimized	2017-05-02 20:05:55 -04:00
Sam Gateau	a7eecdfb26	Merge pull request #10265 from samcake/ambient ... Making the render engine Job/Task system configurable and reusable	2017-05-02 14:55:53 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	5302110e7b	Merge pull request #10346 from zfox23/newSnapshotReview_Improvements ... Lots of Snapshot app improvements, Round One	2017-05-02 13:00:08 -07:00
Zach Fox	c9e0679b70	Subscribe to changes to snapshotsLocation setter for better UX	2017-05-02 10:55:57 -07:00