Anthony Thibault
a43e9a5710
Fix for crash on avatars with missing "Hips" joint
2016-07-22 16:00:40 -07:00
Zander Otavka
2cd97bfe78
Fix squeezeHands.js error on script end
2016-07-22 15:55:42 -07:00
Zander Otavka
cc7e723e07
Remove extra debug print
2016-07-22 15:23:39 -07:00
Seth Alves
82dfdebd46
move permissions for specific-users below groups. turn debug-prints back off
2016-07-22 14:14:03 -07:00
Seth Alves
8e5262872e
fix bug that was losing verified status for users with permissions specific to their account
2016-07-22 14:00:46 -07:00
James B. Pollack
3607a34f55
tweak telecolors
2016-07-22 13:25:33 -07:00
Seth Alves
6ec8aff645
remove group-related debug prints
2016-07-22 12:02:17 -07:00
Seth Alves
96fd1cb841
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b
book-keeping around groups and ranks
2016-07-22 11:40:23 -07:00
James B. Pollack
e81f65d992
colors
2016-07-22 10:54:57 -07:00
James B. Pollack
54109c6c6f
remove all the old visualization methods
2016-07-22 09:39:38 -07:00
James B. Pollack
1d3dc7b195
remove particle beam and lights
2016-07-22 09:19:13 -07:00
James B. Pollack
5202038210
Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor
...
Vive HMD fixes to prevent user from becoming embedded in the floor.
2016-07-22 09:04:40 -07:00
Brad Davis
4cbf804dd4
More work on perf testing
2016-07-21 22:32:13 -07:00
Zander Otavka
8976f18290
Change 3.14 literal to Math.PI
2016-07-21 18:36:58 -07:00
Brad Hefta-Gaub
566e0f5dbf
Merge pull request #8287 from AndrewMeadows/fix-simple-compound
...
fix bug breaking simple-compound shape type
2016-07-21 18:18:04 -07:00
Brad Hefta-Gaub
c24472d390
Merge pull request #8290 from howard-stearns/cleanup-heartbeat
...
cleanup domain-server heartbeat code
2016-07-21 18:17:19 -07:00
Brad Davis
f64d53e109
Merge pull request #8291 from ZappoMan/fixSilenceOnBadCodecs
...
fix silence on no codec after previous codec has been set
2016-07-21 17:32:00 -07:00
James B. Pollack
f9e8ada954
new whiteboard for home
2016-07-21 17:18:45 -07:00
Anthony Thibault
2429b82b5e
Support for animGraphUrl override in FST file.
2016-07-21 17:17:08 -07:00
howard-stearns
b303c6df8e
strong type checking my arse
2016-07-21 16:04:12 -07:00
Zander Otavka
30c5f277a0
Finish renaming functions
2016-07-21 15:52:19 -07:00
Zander Otavka
72978c5d96
Rename examples -> marketplace
...
Includes the title of the marketplace web window.
2016-07-21 15:44:42 -07:00
Zander Otavka
0992e80254
Add Toolbars to eslint globals
2016-07-21 15:44:05 -07:00
Brad Davis
faba1a4b4e
Fix UI elements triggered by WebViews
2016-07-21 15:13:07 -07:00
Seth Alves
97b40ab87d
adapting to api changes
2016-07-21 14:04:55 -07:00
Brad Hefta-Gaub
bb8224be8c
fix silence on no codec after previous codec has been set
2016-07-21 13:57:11 -07:00
Chris Collins
d11e26e665
Merge pull request #8289 from highfidelity/RC-16
...
Beta Release 16 - Includes up to Developer Release 5179
2016-07-21 12:07:00 -07:00
Seth Alves
6a94bfe8aa
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-21 09:32:47 -07:00
Howard Stearns
51bc3c51ca
less logging, change constant name.
2016-07-21 08:35:21 -07:00
Anthony Thibault
592a50356b
Merge pull request #8211 from highfidelity/skin
...
Skin sub-surface lighting
2016-07-20 15:48:25 -07:00
Andrew Meadows
20eebb90f8
fix build -- remove some accidental changes
2016-07-20 14:08:25 -07:00
Chris Collins
cc4c21e899
Merge pull request #8284 from davidkelly/dk/noMoBuzzsaw
...
Potential cause of that buzzsaw when resetting
2016-07-20 14:00:31 -07:00
Chris Collins
71c12c30a2
Merge pull request #8286 from sethalves/build-server-only-plugins
...
Build server only plugins
2016-07-20 14:00:13 -07:00
Zander Otavka
5394c092d0
Fix bug with dropdown
2016-07-20 13:07:45 -07:00
Andrew Meadows
3fdfc0db14
fix bug breaking simple-compound shape type
2016-07-20 12:55:13 -07:00
Seth Alves
4e308914b2
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:37:30 -07:00
Seth Alves
5485b3ee13
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:34:44 -07:00
Seth Alves
c36d0d91ad
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:29:57 -07:00
Seth Alves
406b08ffa1
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:29:00 -07:00
samcake
569fdde7f1
Merge pull request #8285 from samcake/skin
...
Merging upstream master and fixing comments from review
2016-07-20 11:06:22 -07:00
samcake
1c4742e710
Fixing comments from review
2016-07-20 11:02:27 -07:00
samcake
853f31f6ea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-20 10:49:27 -07:00
David Kelly
7b2d5e7fab
Potential cause of that buzzsaw when resetting
2016-07-20 10:41:16 -07:00
Seth Alves
c1b27a9249
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-20 10:03:22 -07:00
Ryan Huffman
1dd7d108d8
Merge pull request #8271 from thoys/fix-duplicate-teleport-target-overlays
...
FIX duplicate teleport target overlays
2016-07-20 09:10:16 -07:00
Thijs Wenker
be0ccad0d3
Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays
2016-07-20 03:12:26 +02:00
Anthony J. Thibault
90beb30e8a
Filter out bad openvr HMD poses that are below the floor
...
When interface is launched and steam vr is NOT running, openvr can return bad HMD poses for a few frames.
To workaround this, filter out any hmd poses that are obviously bad, i.e. beneath the floor.
2016-07-19 18:12:20 -07:00
Thijs Wenker
b3b1bf7884
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays
2016-07-20 03:12:02 +02:00
Zander Otavka
4a11e4accc
Merge pull request #1 from AndrewMeadows/edit-model-ui
...
fix bug where some model shapes are momentarily incorrect
2016-07-19 18:07:19 -07:00
