James B. Pollack
cb848362ec
Merge pull request #8309 from ZappoMan/reduceLogSpamX
...
reduce activity logging spam
2016-07-24 19:06:52 -07:00
Brad Hefta-Gaub
c85d6800c3
reduce activity logging spam
2016-07-24 11:44:25 -07:00
Brad Hefta-Gaub
4f04dbc926
Merge pull request #8308 from jherico/overlay_multi_edit
...
Allow atomic editing of multiple overlays from scripts
2016-07-23 13:51:51 -07:00
Brad Hefta-Gaub
1802f8e7a2
Merge pull request #8298 from imgntn/lazzzers
...
Update hand controller laser colors
2016-07-23 13:50:38 -07:00
Brad Hefta-Gaub
43064807d1
Merge pull request #8292 from jherico/webui
...
Fix some UI elements triggered by WebViews
2016-07-23 13:47:04 -07:00
Brad Hefta-Gaub
6f613e77b6
Merge pull request #8296 from jherico/perf
...
More work on perf testing
2016-07-23 13:45:06 -07:00
Brad Hefta-Gaub
f0574282eb
Merge pull request #8299 from hyperlogic/bug-fix/no-hips-no-problem
...
Prevent avatars with missing "Hips" joints from causing crashes
2016-07-23 13:44:14 -07:00
Brad Hefta-Gaub
41e02276e5
Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override
...
Support for animGraphUrl override in FST file.
2016-07-23 13:42:46 -07:00
Brad Hefta-Gaub
e5e3967030
Merge pull request #8307 from jherico/osx_laser_fix
...
Disable glow lines on Mac
2016-07-23 13:23:06 -07:00
Brad Davis
121a0f0f5e
Allow atomic editing of multiple overlays from scripts
2016-07-23 11:41:58 -07:00
Brad Davis
85b0440e32
Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now
2016-07-23 11:06:33 -07:00
Brad Davis
89d9affb41
Merge remote-tracking branch 'upstream/stable'
2016-07-22 19:47:31 -07:00
Chris Collins
2c3b25cfa7
Merge pull request #8302 from davidkelly/dk/hotfixForAudio
...
Hotfix for RC-16: Audio fix for injectors and Assignment Clients
2016-07-22 19:11:56 -07:00
David Kelly
3d3a7a8820
Merge branch 'stable' of github.com:highfidelity/hifi into dk/hotfixForAudio
2016-07-22 18:40:06 -07:00
David Kelly
8b8a98bfcc
Acutally audio was really broken
...
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
because you are an assignment client), we would not do the
network injection at all. That's bad.
* When we don't have a codec, like when using an injector, we
were serializing the empty string in some problematic way. I
just use the built-in serialization, and it seems fine.
I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too). Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.
Then, I added a script to play audio as a persistent script, which
just loops forever and ever. You should hear that on both interface
clients also.
A detailed test plan to follow.
Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls. Good to do this cuz
you know, things happen...
2016-07-22 18:33:38 -07:00
Chris Collins
a06ef47bb3
Merge pull request #8300 from davidkelly/dk/noACAudioPlus
...
Actually audio was really broken
2016-07-22 18:23:28 -07:00
David Kelly
4b48cc7c2e
Acutally audio was really broken
...
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
because you are an assignment client), we would not do the
network injection at all. That's bad.
* When we don't have a codec, like when using an injector, we
were serializing the empty string in some problematic way. I
just use the built-in serialization, and it seems fine.
I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too). Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.
Then, I added a script to play audio as a persistent script, which
just loops forever and ever. You should hear that on both interface
clients also.
A detailed test plan to follow.
Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls. Good to do this cuz
you know, things happen...
2016-07-22 17:47:24 -07:00
Ryan Downe Karpf
91714aaca6
Merge pull request #8258 from AlexanderOtavka/edit-model-ui
...
Edit model dialog improvements
2016-07-22 17:11:52 -07:00
James B. Pollack
133b59ae42
Merge pull request #8294 from imgntn/home_whiteboard_jul21
...
Add new whiteboard to home
2016-07-22 17:00:30 -07:00
James B. Pollack
d4ed347f5f
Merge pull request #8293 from AlexanderOtavka/fix-market-title
...
Fix marketplace title
2016-07-22 16:55:41 -07:00
James B. Pollack
c04a41c3cb
fix invisible characters from slack copying
2016-07-22 16:51:42 -07:00
Chris Collins
e755528cf2
Merge pull request #8278 from sethalves/fix-equip-fly-away
...
fix equip fly-away
2016-07-22 16:47:31 -07:00
Anthony Thibault
3b14988577
Fix another crash if "Hips" joint is not found.
2016-07-22 16:27:43 -07:00
Anthony Thibault
a43e9a5710
Fix for crash on avatars with missing "Hips" joint
2016-07-22 16:00:40 -07:00
Zander Otavka
cc7e723e07
Remove extra debug print
2016-07-22 15:23:39 -07:00
James B. Pollack
3607a34f55
tweak telecolors
2016-07-22 13:25:33 -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
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
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
