Sam Gateau
429d54d65d
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-10 09:53:22 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process
...
Move asset server baking to a separate process
2017-12-09 20:48:14 -08:00
Ryan Huffman
e3d00c4aa5
Remove unnecessary logging from PathUtils
2017-12-08 17:48:10 -08:00
Ryan Huffman
982607eedf
Remove unused variable from PathUtils
2017-12-08 15:40:33 -08:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
samcake
9a4f667059
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-08 08:50:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
...
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
David Kelly
42b509639b
Fix certificate hash
2017-12-07 17:22:00 -08:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
...
domain uses min/max avatar height instead of min/max scale
2017-12-07 16:29:15 -08:00
samcake
6148458aeb
Workable state, need final clean up and testing
2017-12-07 16:04:08 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
...
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
Andrew Meadows
813c4fa38a
Merge pull request #11915 from druiz17/fix-collision-mask-for-children
...
If hold actions are added to entity update the collision mask for the children aswell
2017-12-07 11:16:50 -08:00
Ryan Huffman
94a58a2471
Remove baking dependency from assignment-client
2017-12-07 10:53:23 -08:00
Anthony J. Thibault
b5ffda6911
const fix
2017-12-07 10:09:09 -08:00
Anthony J. Thibault
095bedcd3f
code review feedback
2017-12-07 10:08:18 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
...
Use PrioritySortUtil for avatar updates from avatar-mixer
2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub
ac3bd5042f
Merge pull request #11890 from dback2/mirrorissues3
...
Secondary camera frame buffer / texture fixes
2017-12-07 09:17:27 -08:00
samcake
5f85e8e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 08:48:12 -08:00
Bradley Austin Davis
2a91e98813
Fix iterator names
2017-12-06 14:26:07 -08:00
Brad Davis
e626ca3ccd
Working on scene threading optimizations
2017-12-06 14:26:07 -08:00
Ryan Huffman
2eecb41337
Update metatype registration in assetBakeTask
2017-12-06 13:59:46 -08:00
Ryan Huffman
6b098bfc6a
Fix aborted baking in oven cli
2017-12-06 13:51:31 -08:00
Ryan Huffman
cb9a30413d
Rename removeTemporaryDis to removeTemporaryApplicationDirs
2017-12-06 12:50:20 -08:00
Ryan Huffman
f20aa2e680
Fix asset server baking not working on *nix
2017-12-06 11:49:34 -08:00
Ryan Huffman
de7e3e60cd
Add temp dir removal to asset server
2017-12-06 11:49:34 -08:00
Ryan Huffman
f3fc5769e8
Move asset baking on asset server to separate process
2017-12-06 11:49:19 -08:00
Dante Ruiz
0f3a70553c
fix dynamic entities that are parented to your avatar
2017-12-06 11:18:15 -08:00
samcake
1efddb8260
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-06 10:21:45 -08:00
luiscuenca
8abe8b9879
move save logic to audioclient
2017-12-05 18:22:14 -08:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -08:00
luiscuenca
20d6615417
emit only when recording
2017-12-05 16:13:44 -08:00
Dante Ruiz
36aa0ae476
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
2017-12-05 15:48:45 -08:00
Dante Ruiz
8af1d8d8d0
dont run code if not nesscassry
2017-12-05 15:48:09 -08:00
Zach Fox
902064ed37
Cleanup debug stuff
2017-12-05 15:26:55 -08:00
Zach Fox
7521e4870e
Bugfixes
2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5
Add data tracking for wallet setup
2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222
Add data tracking for purchase and rez
2017-12-05 13:09:09 -08:00
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable
...
stable -> master
2017-12-05 11:58:23 -08:00
Dante Ruiz
c58286d371
dont do work if not needed
2017-12-05 09:31:35 -08:00
Dante Ruiz
486cdf14d2
make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed
2017-12-04 15:34:53 -08:00
samcake
9fceaad38b
Merging with master
2017-12-04 14:20:10 -08:00
Dante Ruiz
a1bf54ff00
fix issue of no_bootstrapping not being set correctly
2017-12-04 11:16:41 -08:00
Dante Ruiz
03934549cc
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
2017-12-04 09:08:11 -08:00
luiscuenca
4030688e7a
added record wav files
2017-12-03 11:54:37 -07:00
Brad Hefta-Gaub
b2c5154cb6
Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing
...
fix issues in model import sizing caused by recent refactor
2017-12-02 09:30:57 -08:00
Dante Ruiz
1e6b5c0c75
make requested changes
2017-12-01 17:09:00 -08:00
