Vladyslav Stelmakhovskyi
|
b2be22f0e0
|
Maerge broke the logic. Fixed now
|
2017-05-06 10:28:57 +02:00 |
|
Vladyslav Stelmakhovskyi
|
e395a51c60
|
Merge with master
|
2017-05-05 07:05:16 +02:00 |
|
Howard Stearns
|
d9540d7ece
|
Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3
Lots of Snapshot app improvements, Round Three
|
2017-05-04 17:05:37 -07:00 |
|
Howard Stearns
|
fc9e9e1d28
|
Merge pull request #10374 from howard-stearns/notification-circumstances
Notification circumstances
|
2017-05-04 16:18:58 -07:00 |
|
Zach Fox
|
6a33ef49c2
|
New language for unshareable snaps
|
2017-05-04 16:17:33 -07:00 |
|
Zach Fox
|
2ad3346697
|
Are there bugs?
|
2017-05-04 16:05:20 -07:00 |
|
Clément Brisset
|
d80704bfbf
|
Merge pull request #10375 from Atlante45/feat/store-irradiance
Store irradiance in cached KTX files
|
2017-05-04 16:00:44 -07:00 |
|
Chris Collins
|
7c36dd3282
|
Merge pull request #10359 from samcake/ambient
Fixing the by region update transfer of the compressed texture
|
2017-05-04 15:52:38 -07:00 |
|
Chris Collins
|
98085b6d26
|
Merge pull request #10386 from ZappoMan/MyAvatarAttachmentsNotVisibleBug
fix issue with not seeing your own attachments
|
2017-05-04 15:51:46 -07:00 |
|
Chris Collins
|
7d1ffe181f
|
Merge pull request #10340 from huffman/fix/obj-atp
Fix OBJ material loading not working over ATP
|
2017-05-04 15:50:52 -07:00 |
|
Zach Fox
|
946c5e7662
|
Almost finished with not-logged-in and not-shareable
|
2017-05-04 15:24:51 -07:00 |
|
ZappoMan
|
43a177cf9a
|
CR feedback
|
2017-05-04 15:22:44 -07:00 |
|
ZappoMan
|
0e3b65abde
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MyAvatarAttachmentsNotVisibleBug
|
2017-05-04 15:06:31 -07:00 |
|
howard-stearns
|
25ab8e7e94
|
debugging on call, but mostly, specify json headers, etc.
|
2017-05-04 14:45:58 -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
|
f4df1a3a05
|
Merge pull request #10382 from jherico/3d_crash
Prevent crash on switching to 3D display twice
|
2017-05-04 14:16: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 |
|
ZappoMan
|
e87f8dfe45
|
fix issue with not seeing your own attachments
|
2017-05-04 13:31:24 -07:00 |
|
Brad Davis
|
fb995bebf1
|
Prevent crash on switching to 3D display twice
|
2017-05-04 12:04:21 -07:00 |
|
Zach Fox
|
b08d23924a
|
Keep hover status of both images in sync
|
2017-05-04 11:00:13 -07: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 |
|
Zach Fox
|
b01bff061e
|
Hover lock when uploading
|
2017-05-04 10:06:52 -07:00 |
|
Zach Fox
|
c7f5115e26
|
Move help text to above buttons
|
2017-05-04 10:06:52 -07:00 |
|
howard-stearns
|
a7e3fad23e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
|
2017-05-04 10:03:57 -07:00 |
|
Seth Alves
|
ecd690e5e9
|
Merge pull request #10348 from ctrlaltdavid/21311
Don't sort recordings
|
2017-05-04 09:59:12 -07:00 |
|
Seth Alves
|
006c5a3c20
|
Merge pull request #10347 from ctrlaltdavid/21310
Don't warn that recording didn't start playing if you stop it
|
2017-05-04 09:58:25 -07:00 |
|
anshuman64
|
9cee7ce483
|
Merge pull request #10360 from ctrlaltdavid/21314
Fix reliability of keyboard enabling in tablet Web pages
|
2017-05-04 09:57:02 -07:00 |
|
Seth Alves
|
19327ef5a7
|
Merge pull request #10354 from zzmp/fix/tablet-deadlock
Fix deadlock from accessing an initializing tablet
|
2017-05-04 09:52:50 -07: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 |
|
Andrew Meadows
|
ec1c99cb71
|
Merge pull request #10376 from sethalves/fix-guard-against-bad-hinge
guard against bad hinge-constraint settings
|
2017-05-03 20:34:07 -07:00 |
|
Seth Alves
|
c693687927
|
react to very small vectors instead of just zero-length ones
|
2017-05-03 20:23:10 -07:00 |
|
Seth Alves
|
f867a8e718
|
guard against bad hinge-constraint settings
|
2017-05-03 20:12:42 -07:00 |
|
Atlante45
|
5e36bebc96
|
Store irradiance in the KTX files.
|
2017-05-03 19:46:17 -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 |
|
howard-stearns
|
3e57e80465
|
use new request module.
|
2017-05-03 16:39:34 -07:00 |
|
Seth Alves
|
a259d00b63
|
Merge pull request #10332 from sethalves/bullet-constraints-5
Bullet constraints
|
2017-05-03 16:30:34 -07:00 |
|
howard-stearns
|
aa74dda9f3
|
cleanup
|
2017-05-03 16:29:37 -07:00 |
|
howard-stearns
|
e3546c38fa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
|
2017-05-03 15:55:13 -07:00 |
|
samcake
|
e2e6b1f9f1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-03 15:46:56 -07:00 |
|
Zach Fox
|
259d6f8ec6
|
Merge pull request #10370 from zfox23/fixEventEnum
Fix event enum
|
2017-05-03 15:45:22 -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 |
|