Seth Alves
673182c091
formatting
2016-01-22 11:22:02 -08:00
Brad Hefta-Gaub
d8850b4649
Merge pull request #6904 from howard-stearns/no-text-chat-in-about
...
Remove obsolete reference to text chat within "about" text.
2016-01-22 11:19:43 -08:00
Seth Alves
a9cf836cb0
added isVec3NaN and isQuatNaN functions
2016-01-22 11:13:55 -08:00
Howard Stearns
9cec0e655b
Remove obsolete reference to text chat within "about" text.
2016-01-22 10:45:04 -08:00
Seth Alves
6294939095
missed one
2016-01-22 10:37:11 -08:00
Seth Alves
6b15beb88a
use isNaN rather than a self-comparison
2016-01-22 10:36:21 -08:00
Zach Pomerantz
b62fc50557
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:32:54 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Brad Hefta-Gaub
f22ffa8cdd
Merge pull request #6901 from samcake/hdr
...
Fixing the warning issue and tweaking the ao blur constants
2016-01-22 10:23:16 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
Brad Hefta-Gaub
c9d9bbe218
Merge pull request #6886 from jherico/browser_fix
...
Frame construction in onCompleted was breaking the browser keyboard focus
2016-01-22 09:50:11 -08:00
samcake
24d1f113f8
Fixing the warning maybe
2016-01-22 09:44:32 -08:00
Seth Alves
451464cb47
check values in location updates for NaN before using them
2016-01-22 09:41:46 -08:00
samcake
6d89f6d7b0
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-22 09:30:31 -08:00
Brad Davis
f343598d91
Focus hack for menu fix
2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165
Frame construction in onCompleted was messing up the browser keyboard focus
2016-01-22 00:55:31 -08:00
samcake
6bcd7f10ad
Try the constant gaussian values which are more stable on mac...
2016-01-21 23:54:51 -08:00
Brad Hefta-Gaub
58b7708315
Merge pull request #6899 from birarda/fix-go-home
...
repairs to index path behaviour
2016-01-21 21:29:24 -08:00
Brad Hefta-Gaub
b41301d226
Merge pull request #6879 from sethalves/fix-aa-cube-bug
...
fix query-cube vs lod bug
2016-01-21 21:02:42 -08:00
samcake
b7f14789af
Refining the ao effect on the blur side
2016-01-21 19:02:32 -08:00
samcake
7df3e9f306
Merge pull request #6876 from ericrius1/droplets
...
Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque
2016-01-21 18:32:43 -08:00
Stephen Birarda
40f2afb284
Merge pull request #6898 from Atlante45/fix/ds-shutdown-debug
...
Postpone logging of the shutdown reason
2016-01-21 18:31:19 -08:00
Stephen Birarda
cc96d90a21
Merge pull request #6897 from huffman/fix-asset-migration
...
Fix asset server not creating resources directory before migrating
2016-01-21 18:25:48 -08:00
Stephen Birarda
9061e33a1f
send path query once connected to domain
2016-01-21 18:24:17 -08:00
Stephen Birarda
fac30bb0ae
use the index path as default with network address
2016-01-21 18:24:16 -08:00
Stephen Birarda
15c922f4a5
always respond with default index path
2016-01-21 18:24:16 -08:00
Stephen Birarda
e371aa8ba5
remove the hard coded path from domain link
2016-01-21 18:24:16 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8
Merge pull request #6849 from jherico/atmosphere
...
Remove old atmosphere rendering
2016-01-21 17:58:59 -08:00
Atlante45
6fd5176474
Pospone logging of the shutdown reason
...
This makes it more obvious to the log reader why the DS went
down.
2016-01-21 17:54:10 -08:00
Ryan Huffman
f9718931b0
Fix asset server not creating resources directory before migrating
2016-01-21 17:40:12 -08:00
samcake
b5aa5fcb46
more clean up
2016-01-21 17:36:53 -08:00
Anthony J. Thibault
ca8a832818
CharacterController: added hard limit to follow displacement
...
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.
Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
2016-01-21 17:27:45 -08:00
Stephen Birarda
e00481ddfb
use macdeployqt for fixup of components
2016-01-21 17:17:28 -08:00
Stephen Birarda
9127edc968
Merge pull request #6892 from huffman/fix-asset-migration
...
Fix ATP file copy
2016-01-21 17:15:46 -08:00
Brad Hefta-Gaub
094e41c993
Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes
...
Fix wifi ping spikes
2016-01-21 17:07:38 -08:00
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
Ryan Huffman
99bb1fcbe1
Remove dirs from atp copy
2016-01-21 16:46:45 -08:00
Ryan Huffman
c9ea6e7eb6
Fix ATP file copy
2016-01-21 16:45:13 -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
Leonardo Murillo
a3ccf7014c
Merge pull request #6890 from huffman/fix-asset-migration
...
Fix asset server data migration
2016-01-21 18:12:07 -06: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
Ryan Huffman
996f3f5df7
Fix entity server data migration to work with default persist filename
2016-01-21 15:43:45 -08:00
Seth Alves
ee42c1d7c8
Merge pull request #6889 from birarda/console
...
explicitly remove server console targets from ALL_BUILD
2016-01-21 15:43:15 -08:00
