Stephen Birarda
39e6ac0974
cleanup API for HifiConfigVariantMap after migration
2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08
migrate the deprecated merged master/user config
2016-08-02 14:35:11 -07:00
Stephen Birarda
7e6dbf2d1a
add a kick request packet and send from NL
2016-08-02 14:35:11 -07:00
Stephen Birarda
94b97e8119
expose kick perms from LNL and Node
2016-08-02 14:35:11 -07:00
Stephen Birarda
f04996a53d
add the kick permission to domain server settings
2016-08-02 14:35:11 -07:00
Seth Alves
708bd33056
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-08-01 12:00:13 -07:00
Seth Alves
60d6673950
switch data-web urls to point at production server rather than dev one
2016-08-01 12:00:08 -07:00
Anthony Thibault
f71a59276c
Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering
...
Fix alpha cut-outs and incorrect gamma on web overlays and entities
2016-07-29 17:44:46 -07:00
Seth Alves
8e1820f911
make sure permissions have the correct ID in the case where a user has been verified
2016-07-29 13:10:14 -07:00
Seth Alves
507410af79
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-29 08:14:15 -07:00
Anthony Thibault
8e3bc97ef9
fix for unused variable warnings
2016-07-29 08:10:10 -07:00
Brad Hefta-Gaub
74a3835a1e
CR feedback
2016-07-28 15:15:33 -07:00
Anthony Thibault
ea310bcc43
Web Entities now render correctly as well
2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a
Merge branch 'master' into bug-fix/web3doverlay-rendering
2016-07-28 11:20:35 -07:00
Brad Hefta-Gaub
22619a66ba
process events also
2016-07-28 10:51:17 -07:00
Anthony Thibault
6b8e912114
Fix for mac and linux builds
2016-07-28 10:02:19 -07:00
Brad Hefta-Gaub
755989b8ff
don't allow punished scripts to slow stop or shutdown
2016-07-28 10:01:05 -07:00
Seth Alves
5a96c8bf57
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-27 18:07:29 -07:00
Seth Alves
cd2f61c90c
if logging in, send username signature even when connecting to localhost
2016-07-27 14:03:51 -07:00
Seth Alves
bc2ded2f97
code review
2016-07-27 08:46:46 -07:00
Seth Alves
148793011d
code review
2016-07-27 07:55:09 -07:00
Bradley Austin Davis
54a7265be8
Removing empty file, because jenkins
2016-07-26 16:32:56 -07:00
Bradley Austin Davis
a9740b803f
Defer batch execution to the end of the frame generation
2016-07-26 16:13:48 -07:00
Bradley Austin Davis
fa20898285
Remove last direct use of gpu::Context::render()
2016-07-26 16:13:22 -07:00
Bradley Austin Davis
bb6abf11d3
FramebufferCache, cleanup & thread safety
2016-07-26 15:32:31 -07:00
Bradley Austin Davis
a455f3a435
Add frame concept to gpu library
2016-07-26 15:25:36 -07:00
Andrew Meadows
5ce681154d
Merge pull request #8301 from AlexanderOtavka/asset-browser-ui
...
Asset browser ui
2016-07-26 15:04:10 -07:00
Chris Collins
a13c8385bb
Merge pull request #8319 from ZappoMan/punishSlowScripts
...
better allocation of CPU time while loading scenes and when slow scripts are running
2016-07-26 12:54:31 -07:00
Bradley Austin Davis
ac743b6acb
PR feedback
2016-07-26 11:55:25 -07:00
Bradley Austin Davis
3962487ee3
Fix depth state caching / resetting
2016-07-26 11:55:25 -07:00
Brad Hefta-Gaub
2d199fe3d0
rename function for better clarity
2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
a12034cb45
fix unix warning, added comments
2016-07-26 07:54:55 -07:00
Brad Hefta-Gaub
83dc9ea6bb
punish slow scripts and don't send updates while physics is still loading
2016-07-25 21:46:30 -07:00
Anthony J. Thibault
0a35c13a94
Moved creation of pipeline into call_once block
2016-07-25 16:30:29 -07:00
Anthony J. Thibault
fb84f058d6
Fix alpha cut-outs and incorrect gamma on Web3DOverlays
2016-07-25 15:56:05 -07:00
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
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
Brad Hefta-Gaub
c85d6800c3
reduce activity logging spam
2016-07-24 11:44:25 -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
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 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
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
