samcake
846c5a7b9a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 16:56:40 -08:00
samcake
8eddd52731
Fixing coding guidelines
2016-01-21 16:54:37 -08:00
Brad Hefta-Gaub
1a98ab3fba
Merge pull request #6877 from AndrewMeadows/crash-fix
...
fix interface crash when deleting lots of objects at once
2016-01-21 16:49:21 -08:00
samcake
402809fe2f
FIxing coding standards
2016-01-21 16:44:35 -08:00
Anthony J. Thibault
a91c181a89
MyAvatar: Recenter when the head turns away from the hips
...
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.
Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed. The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller.
A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure. This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
samcake
9c344c6498
FIxing the bordering enble default value
2016-01-21 16:38:21 -08:00
Seth Alves
c2edb0a559
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 16:15:06 -08:00
samcake
2471a88e85
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 15:53:25 -08:00
samcake
16573357d8
FIxing the AO results at the border of the frame by guarding the fetch out of the frame
2016-01-21 15:50:38 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
3e7f29a0aa
Support debug mode for QML UI in debug builds
2016-01-21 15:15:16 -08:00
Brad Davis
ae6cba85e8
More atmosphere removal
2016-01-21 15:15:16 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8
Fix wifi ping spikes
...
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
2016-01-21 15:05:32 -08:00
Leonardo Murillo
7e19110dd5
Merge pull request #6887 from birarda/migrate-ds-old-dev
...
migrate domain-server config from single org name
2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0
handle weird nested path on windows
2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0
migrate domain-server config from single org name
2016-01-21 13:57:24 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Stephen Birarda
4cfe3941f4
delete the lookup timeout timer once fired
2016-01-21 11:18:53 -08:00
Seth Alves
5027157575
for LOD, allow entity-server to use getAABox if it can, but fall back to queryAABox if it can't
2016-01-21 09:31:51 -08:00
Seth Alves
729998bbf3
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 09:19:47 -08:00
Andrew Meadows
58a7528b68
Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js
...
Access avatar parent information from js
2016-01-21 09:19:40 -08:00
Seth Alves
311e0cee67
Merge pull request #6820 from AndrewMeadows/collision-mask
...
use "collidesWith" instead of "collisionMask"
2016-01-21 09:13:34 -08:00
Seth Alves
1fef78f60f
fix bug where entities that were children of avatars wouldn't be included in entity-server packets to interfaces
2016-01-20 19:03:41 -08:00
samcake
8d1ab01018
exposing one more parameter
2016-01-20 18:32:44 -08:00
Andrew Meadows
e77189fb1b
keep reference to removed entity until next frame
2016-01-20 17:09:37 -08:00
Brad Hefta-Gaub
7919d7bc17
Merge pull request #6866 from jherico/menufix
...
Fixing overlay menu popup & some more QML cleanup
2016-01-20 16:58:21 -08:00
samcake
4e5869b247
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-20 16:30:24 -08:00
ericrius1
0ffcf437e9
Fix for transparent textures not being rendered with opacity
2016-01-20 16:22:49 -08:00
ericrius1
eb5a950f85
texture opacity potential fix
2016-01-20 15:08:39 -08:00
Zach Pomerantz
0c798c06a9
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-20 14:51:42 -08:00
samcake
0da4df93b8
Merge pull request #6860 from zzmp/refactor/cull-functor
...
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
2016-01-20 14:25:42 -08:00
Zach Pomerantz
0a34ee9138
Externalize list sizing for render::cullItems
2016-01-20 12:39:27 -08:00
samcake
07c630bcda
And cleaning again hopping to have the pr build
2016-01-20 11:44:01 -08:00
Brad Davis
d2900200a1
More cleanup & menu fixing
2016-01-20 11:23:56 -08:00
samcake
35ea04ae7c
fixing the bug that kept AO when ao is off...
2016-01-20 11:13:50 -08:00
Andrew Meadows
19d24293e1
Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent
...
don't persist entites with invalid parentIDs
2016-01-20 10:38:26 -08:00
samcake
320c799379
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-20 10:14:02 -08:00
Stephen Birarda
e69424e155
add parentheses to old style signal
2016-01-20 09:27:47 -08:00
samcake
379c882834
Debugging the darkness and pointing out bugs
2016-01-20 02:03:09 -08:00
Stephen Birarda
e3df02e589
fix parenting of single shot timer
2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1
allow STUN to succeed started late or immediately
2016-01-19 20:41:39 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
samcake
c5c51f2af2
Make sure the resolution level for ao is correct
2016-01-19 18:57:03 -08:00
Zach Pomerantz
3445b7fd2c
Fix orientation aligned with Y
2016-01-19 18:39:34 -08:00
samcake
dc40337dc1
Adjusting default settings
2016-01-19 18:02:47 -08:00
samcake
584d50b594
Experimenting with AO on the lightmaped surface
2016-01-19 17:56:07 -08:00
Stephen Birarda
e5d47f3379
fix for accidental filtering of stun packets
2016-01-19 17:26:41 -08:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
Seth Alves
28d673cb97
try again to make this thread safe
2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2
try again to make this thread safe
2016-01-19 15:55:56 -08:00
Zach Pomerantz
c794ae8da2
Avoid shadow attenuation outside of mapped area
2016-01-19 15:48:20 -08:00
Zach Pomerantz
27967f6064
Use 4-sample PCF for shadowMap sampling
2016-01-19 15:48:20 -08:00
Seth Alves
edea0320e6
try again to make this thread safe
2016-01-19 15:44:22 -08:00
Seth Alves
a515d6debe
call into correct thread to getJointNames on entity
2016-01-19 15:16:58 -08:00
Seth Alves
90847dc49c
oops
2016-01-19 15:00:33 -08:00
Seth Alves
09dd3e2a56
merge from upstream, respond to code review
2016-01-19 14:38:22 -08:00
Stephen Birarda
74b2a44050
merge the master and user configs after a settings change
2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e
complete handling of immediate temp name grab
2016-01-19 13:04:05 -08:00
Seth Alves
f265656e74
expose getJointNames for entities to js
2016-01-19 12:55:17 -08:00
samcake
c5c3f464cd
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-19 12:13:11 -08:00
samcake
6f93fb3114
Can now process the AO at lower resolution in orer to gsave performances
2016-01-19 12:12:51 -08:00
Zach Pomerantz
387a14b6b1
Fix shadowMap vertical keylight edge case
2016-01-19 12:01:40 -08:00
Zach Pomerantz
398f83be3f
Change shadow debug buffer to reuse shadowMap tex
2016-01-19 12:01:18 -08:00
Andrew Meadows
db77f22a61
use "collidesWith" instead of "collisionMask"
...
but make "collisionMask" work for those who want it
2016-01-19 11:41:22 -08:00
Seth Alves
a2bec2a5bf
Merge pull request #6857 from ctrlaltdavid/20779
...
Fix crash in Running Scripts when edit filter after highlighting script
2016-01-19 11:40:47 -08:00
Stephen Birarda
858adf383e
update comment for config migration
2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b
use mkpath to create new data directory
2016-01-19 11:37:49 -08:00
Seth Alves
8ba800fda8
Merge pull request #6851 from AndrewMeadows/collisionless2
...
namechange "ignoreForCollisions" to "collisionless"
2016-01-19 11:33:55 -08:00
Stephen Birarda
74806d9d2b
migrate old DS config file to new path
2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc
Move ShoudRenderFunctor to render::CullFunctor
2016-01-19 11:24:11 -08:00
Ryan Huffman
de36f3eeb2
Update ServerPathUtils::getDataDirectory to use custom path lookup
2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Andrew Meadows
7fb145e819
namechange ignoreForCollisions --> collisionless
2016-01-19 09:06:17 -08:00
Zach Pomerantz
7a5562abce
Do not cauterize bones in SHADOW_RENDER_MODE
2016-01-18 20:51:28 -08:00
Zach Pomerantz
3c80002dfe
Fix keylight frustum culling by calc internal state before use
2016-01-18 20:10:52 -08:00
Zach Pomerantz
ff425f40ae
Fix shadow leaking scene items
2016-01-18 18:43:01 -08:00
Zach Pomerantz
1b36d56b7a
Add shadowmap as a debug feature
2016-01-18 17:12:42 -08:00
Seth Alves
e365d93ed9
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
2016-01-18 16:50:26 -08:00
samcake
df496b065c
Merging with master
2016-01-18 16:40:34 -08:00
samcake
29945bba92
Merge pull request #6837 from zzmp/feat/render-shadow
...
Add RenderShadowTask
2016-01-18 15:45:51 -08:00
Seth Alves
135f25bde7
changes so that avatar-mixer wont attempt to resolve a parentID
2016-01-18 15:35:54 -08:00
Howard Stearns
6f84a67453
Merge pull request #6840 from jherico/qml_cleanup
...
File dialogs and modal message boxes in QML
2016-01-18 15:04:37 -08:00
Howard Stearns
5caf10beed
Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck
...
Include checking the angular size of entities on the server side for LOD support
2016-01-18 14:13:34 -08:00
samcake
93c7c182b3
Exposing the gpu RangeTimer counter for the AO effect
2016-01-18 14:10:59 -08:00
Seth Alves
823428290d
Merge branch 'master' of github.com:highfidelity/hifi into various-fixes
2016-01-18 13:26:45 -08:00
Brad Hefta-Gaub
b8747709ef
CR feedback, dead code cleanup
2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub
d10e1cc39d
CR feedback, dead code cleanup
2016-01-18 12:09:21 -08:00
Seth Alves
94bafb4a1e
Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove
...
namechange collisionsWillMove --> dynamic
2016-01-18 11:51:59 -08:00
Seth Alves
3b3720781f
fix a place where parent's scale wasn't properly squashed
2016-01-18 11:15:53 -08:00
Seth Alves
d6e3b85237
fix javascript access via localPosition and localRotation
2016-01-18 11:15:32 -08:00
Seth Alves
4232e400cc
add getJointIndex call
2016-01-18 11:15:03 -08:00
Zach Pomerantz
6434d98365
Separate directional shaders with(out) shadowmaps
2016-01-18 11:11:28 -08:00
Brad Hefta-Gaub
88af387214
cleanup
2016-01-18 10:10:24 -08:00
samcake
bc579f2605
Clening up the gpu::Timer behavior, now need a way to show it
2016-01-18 09:53:41 -08:00
Brad Hefta-Gaub
2774df38bc
check for entity size before including it for LOD
2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb
Working on keyboard focus issues
2016-01-17 20:56:07 -08:00
samcake
86e9c5ac9b
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-16 22:17:08 -08:00
samcake
39f1649cdf
refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing
2016-01-16 22:16:07 -08:00
