Commit graph

54595 commits

Author SHA1 Message Date
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
Stephen Birarda
1857b297e0 don't re-grab the machine fingerprint every DS connection 2017-05-04 16:00:46 -07:00
Stephen Birarda
f39411656a use machine GUID from registry for machine ID 2017-05-04 16:00:46 -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
humbletim
f9d29256e0 use an actual Uuid value for the Uuid.print test 2017-05-04 18:58:30 -04: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
humbletim
f71552c648 * update Vec3.print, Quat.print, Mat4.print, ScriptUUID.print to work with JSConsole and HMD-friendly script log
* add test output for Quat-euler and Mat4-row/col prints
2017-05-04 18:33:49 -04: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
Atlante45
ecda313223 Add runtime access to compression settings 2017-05-04 15:07:59 -07:00
ZappoMan
0e3b65abde Merge branch 'master' of https://github.com/highfidelity/hifi into MyAvatarAttachmentsNotVisibleBug 2017-05-04 15:06:31 -07:00
humbletim
deeb9c367a update test to reflect support for scriptWarningMessage and scriptInfoMessage 2017-05-04 17:46:28 -04: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
humbletim
6cb95b2393 add and connect handlers for scriptWarningMessage and scriptInfoMessage signals 2017-05-04 17:43:00 -04: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
humbletim
e765d8858c update script engine to not treat about:* as a local filename; resolve debugPrint FIXME 2017-05-04 16:57:41 -04:00
Vladyslav Stelmakhovskyi
ba5a371da1 Decrease CPU usage in tabletUI periodical updates 2017-05-04 22:54:41 +02:00
humbletim
8cea7f6a62 add test for print/Script.print behavior 2017-05-04 16:54:16 -04:00
humbletim
fe36e6a793 fix JSConsole script message handlers and about: filename 2017-05-04 16:45:12 -04:00
Ryan Huffman
87a685c4f9 Fix OSX warning in TextureCache 2017-05-04 13:41:20 -07:00
ZappoMan
e87f8dfe45 fix issue with not seeing your own attachments 2017-05-04 13:31:24 -07:00
Atlante45
f728ae7955 Remove unecessary normalize 2017-05-04 12:38:27 -07:00
Brad Davis
fb995bebf1 Prevent crash on switching to 3D display twice 2017-05-04 12:04:21 -07:00
Vladyslav Stelmakhovskyi
c8a9b02c7a Block only secondary button 2017-05-04 20:26:02 +02:00
Zach Fox
b08d23924a Keep hover status of both images in sync 2017-05-04 11:00:13 -07:00
Atlante45
542923839d Change name to VEC2NU8_XY 2017-05-04 10:33:34 -07:00
Atlante45
10289f5423 Format non compressed normal maps to new format. 2017-05-04 10:33:34 -07:00
Atlante45
ea2b188b64 Recompute Y from X/Z for normal maps 2017-05-04 10:33:34 -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
Seth Alves
74a82f92df return null uuid for failure 2017-05-04 10:05:17 -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
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
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