Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
Zach Pomerantz
8feace62b7
Conform text3d initializers to coding standard
2016-02-15 13:05:19 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Zach Pomerantz
452b6f4e59
Fix opacity check for Overlay ItemKey
2016-02-15 13:02:29 -08:00
Zach Pomerantz
f2b716f90a
Alias text3d's backgroundAlpha to alpha
...
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
2016-02-15 13:02:29 -08:00
samcake
0c0089f736
REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines
2016-02-15 11:08:12 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
Brad Davis
b5cba79f0c
Merge pull request #7095 from ZappoMan/hmdHacking
...
Various bug fixes in related to HMD overlay support
2016-02-12 17:50:42 -08:00
Andrew Meadows
6baf181453
Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space
...
Controller Pose values are relative to Avatar.
2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9
Merge pull request #7103 from jherico/render-rate
...
Don't drop to half the vsync rate when we can't keep up
2016-02-12 17:11:03 -08:00
Brad Davis
df225afd05
PR feedback
2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e
some CR feedback
2016-02-12 16:13:12 -08:00
Brad Davis
908e153c36
Don't drop to half the vsync rate when we can't keep up
2016-02-12 15:57:27 -08:00
samcake
9bfeb4a1d5
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-12 11:31:47 -08:00
Brad Hefta-Gaub
1160ecb335
improvements in HMD UI behavior
2016-02-12 10:51:33 -08:00
samcake
ef92a52777
Merge pull request #7051 from zzmp/feat/graphics-dialog
...
Move graphics settings to a new dialog
2016-02-12 10:46:00 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
Anthony J. Thibault
8bde897cee
Application: removed unused myAvatar local variable.
2016-02-11 18:14:42 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Seth Alves
90d81bc17b
Merge pull request #7091 from jherico/overlayCrash
...
Prevent overlay cleanup from crashing the app
2016-02-11 16:26:07 -08:00
Andrew Meadows
b6456889ef
Merge pull request #7050 from Atlante45/fix/audio-stats
...
Fix audio stats
2016-02-11 15:56:45 -08:00
Brad Davis
e06bc26896
Prevent overlay cleanup from crashing the app
2016-02-11 15:17:58 -08:00
Brad Hefta-Gaub
894c75f8fc
Merge pull request #7066 from zzmp/fix/circle3d-radii
...
Add radius as property to circle3d
2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6
Merge pull request #7065 from zzmp/fix/circle3d-click
...
Fix circle3d FindRayIntersection
2016-02-11 13:07:00 -08:00
Chris Collins
ca15638463
Merge pull request #7080 from ZappoMan/fixPersistMono
...
add support for persisting the mono preview mode option
2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e
Merge pull request #7075 from Atlante45/fix/add-to-scene
...
Fix "Add to scene" option while dropping model
2016-02-11 13:02:36 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
Stephen Birarda
62e842bf2b
Merge pull request #7052 from huffman/bugsplat
...
BugSplat integration
2016-02-11 10:10:44 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
samcake
355b8ee40d
THursday morning the frustum culling seems broken in one particular angle
2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2
Add persistent render engine configuration file
2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e
Move graphics settings to dedicated dialog
2016-02-11 10:00:44 -08:00
Ryan Huffman
d226416306
Update params to MiniDmpSender to be const
2016-02-11 09:46:31 -08:00
Zach Pomerantz
eb6ff725c4
Fix circle3d FindRayIntersection to scale by radius
2016-02-11 08:24:48 -08:00
Ryan Huffman
3355019cbe
Add custom bugsplat flags
2016-02-11 08:17:20 -08:00
Brad Hefta-Gaub
d77d102384
add support for persisting the mono preview mode option
2016-02-10 22:01:17 -08:00
Atlante45
913172b490
Fix extension checking
2016-02-10 18:17:13 -08:00
Atlante45
1fe4ff5319
Make stats code more readable
2016-02-10 16:35:06 -08:00
Chris Collins
b1c6d1d256
Merge pull request #7070 from sethalves/no-sink-upon-server-restart
...
don't sink through floor when server restarts
2016-02-10 14:42:28 -08:00
Seth Alves
11d296a477
if we are told to clear the octree, disable physics until we have (re)loaded entities
2016-02-10 14:08:35 -08:00
Zach Pomerantz
7e474dba60
Add radius as property to circle3d
2016-02-10 12:27:00 -08:00
Andrew Meadows
132169395c
use const reference for std:vector
2016-02-10 10:36:34 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006
SpatiallyNestable: warn on failure.
2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844
Merge pull request #7049 from jherico/antistutter
...
Anti-stutter work
2016-02-09 12:16:15 -08:00
Ryan Huffman
27384dbe0a
Clean up BugSplat initialization
2016-02-09 11:33:50 -08:00
Chris Collins
cc576dd5e3
Merge pull request #7045 from sethalves/fix-query-cube
...
fix queryAACube lastEdited bug
2016-02-09 11:23:56 -08:00
Ryan Huffman
65b82b9bba
Add BugSplat to interface
2016-02-09 10:48:32 -08:00
Chris Collins
e61636e8a7
Merge pull request #7028 from zzmp/fix/overlay
...
Add transparency and layering for overlays
sam is doing it
2016-02-09 09:18:32 -08:00
Anthony Thibault
aa3cb8fb20
Merge pull request #7047 from AndrewMeadows/hide-the-razor-blades
...
MyAVatar::rebuildCollisionShape() is not a slot
2016-02-09 09:11:14 -08:00
