Seth Alves
e3b4612283
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-25 13:19:13 -07:00
Chris Collins
e1e1ca1c12
Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change
...
fix interface crash when chaning avatar models
2016-07-25 12:11:46 -07:00
Brad Hefta-Gaub
43602ab0fb
Merge pull request #8237 from imgntn/html5
...
updates to overlay web browser
2016-07-25 11:37:17 -07:00
James B. Pollack
38765e6fa4
extra space
2016-07-25 11:12:34 -07:00
James B. Pollack
84e4de4bad
update formatting
2016-07-25 11:11:37 -07:00
Chris Collins
3c9b9aef4f
Merge pull request #8304 from ChristophHaag/fixGridShader
...
fix grid shader
2016-07-25 09:47:12 -07:00
Andrew Meadows
1df3b59aa1
change BUG to FIXME
2016-07-24 19:19:35 -07:00
Andrew Meadows
d876251f1e
release geometry refs in Model::deleteGeometry()
2016-07-24 19:17:39 -07:00
James B. Pollack
cb848362ec
Merge pull request #8309 from ZappoMan/reduceLogSpamX
...
reduce activity logging spam
2016-07-24 19:06:52 -07:00
James B. Pollack
ea1c21e685
resolve merge
2016-07-24 18:51:00 -07:00
James B. Pollack
3b25b36db3
cleanup
2016-07-24 16:57:15 -07:00
James B. Pollack
8acb30da8e
add permissions bar
2016-07-24 16:54:00 -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
Andrew Meadows
7280992806
add mutex lock around AvatarData joint data
2016-07-23 10:30:44 -07:00
Christoph Haag
7134d2bfd4
fix grid shader
...
this shader is used for example in
developer - audio - audio scope - show scope
2016-07-23 11:09:16 +02: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
Seth Alves
9a69361391
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-22 17:52:49 -07:00
Seth Alves
f35b935031
do some cleaning-up of the domain-server settings page group tables
2016-07-22 17:51:31 -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
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
