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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
fb995bebf1
|
Prevent crash on switching to 3D display twice
|
2017-05-04 12:04:21 -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 |
|
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 |
|
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 |
|
Seth Alves
|
9171995ed3
|
add a comment
|
2017-05-03 21:41:00 -07: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 |
|
Seth Alves
|
f61ca1c8ac
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-03 20:34:37 -07:00 |
|
Seth Alves
|
03f416ff4d
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-03 20:32:08 -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 |
|
Seth Alves
|
0fff7678bf
|
code review
|
2017-05-03 19:07:46 -07:00 |
|
Seth Alves
|
a259d00b63
|
Merge pull request #10332 from sethalves/bullet-constraints-5
Bullet constraints
|
2017-05-03 16:30:34 -07:00 |
|
Seth Alves
|
c09009ad8b
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-03 16:21:58 -07:00 |
|
samcake
|
26441dbf2f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-03 14:54:11 -07:00 |
|
Sam Gateau
|
8507fffcc2
|
Merge pull request #10313 from samcake/ambient-bis
Fixing the the mip gpu copy for compressed format texture in GL41Backend
|
2017-05-03 14:50:55 -07:00 |
|
Seth Alves
|
e96c3e84b4
|
if a script attempts to edit a non-entity, don't send the edit packet over the wire
|
2017-05-03 13:58:49 -07:00 |
|
Chris Collins
|
c4c62e790b
|
Merge pull request #10341 from jherico/texture_transfer_crash
Prevent possible crash in texture buffering thread
|
2017-05-03 15:50:49 -05:00 |
|
samcake
|
c583ffbac4
|
Clean up names and comments
|
2017-05-03 11:30:09 -07:00 |
|
Stephen Birarda
|
5d1abe4499
|
Merge pull request #10307 from huffman/fix/ktx-crash
Fix for resource downloads getting capped
|
2017-05-03 11:25:51 -07:00 |
|
samcake
|
84305c2049
|
Fixing the by region update of the compressed texture to match the 4 x 4 tiles alignment
|
2017-05-02 17:30:31 -07:00 |
|
samcake
|
48eb30936e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
|
2017-05-02 17:20:10 -07:00 |
|
samcake
|
0ecf599267
|
Adressing the warning
|
2017-05-02 17:19:22 -07:00 |
|
samcake
|
dc50db7ee5
|
One more warning from gcc
|
2017-05-02 16:27:28 -07:00 |
|
Zach Pomerantz
|
0353940d9e
|
decouple initialization from storage in Table.getTablet()
|
2017-05-02 17:49:40 -04:00 |
|
samcake
|
41f0b1682e
|
Fixing warnings too
|
2017-05-02 14:45:41 -07:00 |
|
samcake
|
32d675c82b
|
Clean up the new code and adress review comments
|
2017-05-02 11:46:51 -07:00 |
|
samcake
|
df54ad2339
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-02 10:50:39 -07:00 |
|
Brad Davis
|
425405f72d
|
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
more cleanup in preparation for moving Avatar class to lib
|
2017-05-02 10:37:22 -07:00 |
|
samcake
|
e561a33b01
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
|
2017-05-02 09:52:09 -07:00 |
|
Seth Alves
|
b82a333a5e
|
Merge pull request #10196 from ZappoMan/poseFilters
support for input controller pose filters
|
2017-05-02 09:46:22 -07:00 |
|
Seth Alves
|
6b2caf8081
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash
|
2017-05-02 09:41:47 -07:00 |
|
Sam Cake
|
54ace01cd6
|
Factorizing the code on both 45 and 41 backend
|
2017-05-02 00:32:32 -07:00 |
|
samcake
|
8b62fad85e
|
TRying to test with sysmem and still doesn;t work
|
2017-05-01 18:19:07 -07:00 |
|
Seth Alves
|
71deac49c6
|
reset tablet to homescreen when going from 2d to vr
|
2017-05-01 17:06:15 -07:00 |
|
samcake
|
4514da2a09
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-01 16:49:35 -07:00 |
|
Seth Alves
|
45a50f9a46
|
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5
|
2017-05-01 15:32:29 -07:00 |
|
Seth Alves
|
3ec3005c6d
|
code review
|
2017-05-01 15:32:17 -07:00 |
|
druiz17
|
67daa4b0a9
|
Merge pull request #10335 from druiz17/webview-js
Implemented of a web app to bring up the tablet webView
|
2017-05-01 15:03:55 -07:00 |
|
Brad Davis
|
f81d01f179
|
Prevent possible crash in texture buffering thread
|
2017-05-01 14:13:59 -07:00 |
|