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 |
|
Andrew Meadows
|
f11d6eff92
|
fix typos: RenderItemsMap not RenderItems
|
2017-05-04 15:43:44 -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 |
|
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 |
|
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 |
|
humbletim
|
e765d8858c
|
update script engine to not treat about:* as a local filename; resolve debugPrint FIXME
|
2017-05-04 16:57:41 -04:00 |
|
Ryan Huffman
|
87a685c4f9
|
Fix OSX warning in TextureCache
|
2017-05-04 13:41:20 -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 |
|
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 |
|
samcake
|
389d9405f9
|
Showing the comments
|
2017-05-04 10:18:14 -07:00 |
|
samcake
|
3f977a6743
|
Add a simple check on the uniform buffer slot to make sure it s valid
|
2017-05-04 10:16:33 -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 |
|
Ryan Huffman
|
a886963e20
|
Fix refresh crash with ktx textures
|
2017-05-03 11:26:52 -07:00 |
|
Ryan Huffman
|
7999ed6f60
|
Fix Resource::refresh for NetworkTexture
|
2017-05-03 11:26:52 -07:00 |
|
Ryan Huffman
|
2c19c5f045
|
Fix KTX creation not handling invalid storage
|
2017-05-03 11:26:52 -07:00 |
|
Ryan Huffman
|
0263021c0c
|
Fix loaded being reset to false for KTX resources
|
2017-05-03 11:26:52 -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 |
|
Sam Cake
|
3abd9f21e8
|
Debugging without understanding...
|
2017-05-01 13:50:19 -07:00 |
|
Atlante45
|
4f368cc867
|
Load High Mips before Fbx after skybox
|
2017-05-01 13:35:14 -07:00 |
|
Ryan Huffman
|
c839118c6b
|
Add ResourceManager::resourceExists
|
2017-05-01 13:22:23 -07:00 |
|
Ryan Huffman
|
074a11306c
|
Add support for atp and file urls in OBJReader
|
2017-05-01 13:22:02 -07:00 |
|
Seth Alves
|
a75544a9fb
|
Merge pull request #10319 from hyperlogic/feature/head-standard-action
Head, Hips and Chest IK can now be controlled from Controller inputs
|
2017-05-01 13:03:23 -07:00 |
|
Brad Davis
|
40e4e2f307
|
Merge pull request #10327 from jherico/face_tracker_refactor
Remove Faceshift
|
2017-05-01 12:14:55 -07:00 |
|
Sam Cake
|
ae5cd3059a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
|
2017-05-01 09:59:18 -07:00 |
|
anshuman64
|
5731242e7f
|
Merge pull request #10321 from ZappoMan/fixFrozenBots
fix frozen bots
|
2017-05-01 09:33:33 -07:00 |
|
druiz17
|
2bf7b12c7d
|
open webview from tabletwebscreen
|
2017-04-30 15:27:34 -07:00 |
|
Seth Alves
|
1b67a8b251
|
cleanups
|
2017-04-30 12:23:34 -07:00 |
|
Seth Alves
|
dabec586ec
|
if spring is linked to another entity which we can't find, disable the spring
|
2017-04-30 11:01:34 -07:00 |
|
Seth Alves
|
c9dfebb713
|
allow spring action to have targets relative to another entity
|
2017-04-30 10:58:58 -07:00 |
|
Seth Alves
|
7ce0ef2ec4
|
fix spring action so that it can be linear or rotational or both
|
2017-04-30 10:04:07 -07:00 |
|
Seth Alves
|
8f2fc24885
|
remove motors from constraints
|
2017-04-29 15:46:04 -07:00 |
|
Seth Alves
|
41f699ec9b
|
fix hinge limits
|
2017-04-29 14:28:56 -07:00 |
|
Seth Alves
|
e52c94895e
|
remove motor from hinge. fix hinge limits
|
2017-04-29 14:18:14 -07:00 |
|
Seth Alves
|
4c4e0dffcc
|
bullet cone-twist constraint
|
2017-04-29 12:30:12 -07:00 |
|
Seth Alves
|
6623028d71
|
ball-and-socket constraint
|
2017-04-29 08:35:55 -07:00 |
|
Seth Alves
|
e2e9371e96
|
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
|
2017-04-29 08:04:31 -07:00 |
|
Seth Alves
|
9e7ef83bd1
|
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
|
2017-04-29 07:01:44 -07:00 |
|
Brad Davis
|
2b43a1989f
|
Moving face and eye trackers out of interface
|
2017-04-28 23:28:17 -07:00 |
|
1st-BrainStormer
|
953a3f7a6f
|
Update EntityDynamicInterface.cpp
Grammar correction.
|
2017-04-28 20:14:01 -07:00 |
|
samcake
|
04895864b5
|
Factorizing the code...
|
2017-04-28 17:34:15 -07:00 |
|
Stephen Birarda
|
fed747a545
|
Merge pull request #10325 from huffman/atp-range-caching
Fix for stuck ATP downloads
|
2017-04-28 16:54:21 -07:00 |
|
samcake
|
83618d45a2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
|
2017-04-28 16:53:09 -07:00 |
|
samcake
|
bfe8bc7593
|
Adding the 45 codepath for debug
|
2017-04-28 16:52:43 -07:00 |
|
Brad Davis
|
5e1bc0d908
|
Remove faceshift
|
2017-04-28 16:34:54 -07:00 |
|
Ryan Huffman
|
89fb0a917b
|
Fix poorly indented if in AssetRequest
|
2017-04-28 16:27:44 -07:00 |
|
Ryan Huffman
|
765a061086
|
Fix stuck ATP downloads
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
|
2017-04-28 16:26:03 -07:00 |
|
Stephen Birarda
|
c518aa55be
|
Merge pull request #10312 from birarda/upload-new-models-to-entity
add an entity file replacement via domain-server content page
|
2017-04-28 16:06:05 -07:00 |
|
ZappoMan
|
bace47af7c
|
CR review
|
2017-04-28 14:46:27 -07:00 |
|
ZappoMan
|
086941356a
|
fix frozen bots
|
2017-04-28 14:36:38 -07:00 |
|
samcake
|
d0fa8fe887
|
Debuging the bad transfers...
|
2017-04-28 12:26:44 -07:00 |
|
Anthony J. Thibault
|
108cd80bb5
|
Merge branch 'master' into feature/head-standard-action
|
2017-04-28 10:41:29 -07:00 |
|
Stephen Birarda
|
b44a56db80
|
don't save ATP requests to cache if they are range requests
|
2017-04-28 10:32:06 -07:00 |
|
Andrew Meadows
|
32c367b644
|
use 'using' rather than 'typedef'
|
2017-04-28 10:18:15 -07:00 |
|