David Rowe
ddc5e952f1
Merge branch 'master' into 20812
2016-03-01 11:16:14 +13:00
David Rowe
a32452db8b
Change Running Scripts reload, close, and tree buttons when pressed
...
Provides visual feedback to user.
2016-03-01 10:43:46 +13:00
Brad Hefta-Gaub
bd80ecd4dc
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-29 13:17:24 -08:00
Seth Alves
95f9793999
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more
2016-02-29 11:35:58 -08:00
samcake
4bec6ddf52
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
8de4a59078
add support for auto-hide reticle and seek lookat on auto-show of reticle
2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578
Merge pull request #7212 from ZappoMan/depthReticleWork
...
add fade between depths in depth reticle
2016-02-28 12:49:47 -08:00
Brad Hefta-Gaub
188cf3694b
fix rotation of depth reticle
2016-02-27 17:31:35 -08:00
David Rowe
50ebbe362d
Style avatar browser field
2016-02-27 14:06:33 +13:00
David Rowe
1a331fcdac
Style basic text field
2016-02-27 13:52:21 +13:00
David Rowe
98eb94ecef
Fix up capitalization of other settings dialogs
2016-02-27 13:30:49 +13:00
samcake
99ba011996
Post merge with Zach work for environment map
2016-02-26 16:04:50 -08:00
David Rowe
2b03e16bec
Increase the title's focus shadow offset
2016-02-27 12:48:09 +13:00
Zach Pomerantz
5995c3717f
Continue updating overlay key on edit
2016-02-26 14:46:42 -08:00
Anthony J. Thibault
9a01c93322
Avatar: fix for rendering avatar attachments
2016-02-26 14:28:27 -08:00
David Rowe
839303168e
Fix missed capital
2016-02-27 11:20:31 +13:00
David Rowe
247ba7d3dd
Merge branch 'master' into 20812
2016-02-27 11:05:47 +13:00
David Rowe
b62bd682ed
Tidying
2016-02-27 11:03:57 +13:00
David Rowe
e8f349ec31
Fix up capitalization of labels and use of colons
2016-02-27 11:02:39 +13:00
David Rowe
bf0bcbe2ec
Style spinbox control
2016-02-27 10:48:53 +13:00
Zach Pomerantz
3c53078178
Merge pull request #7194 from ZappoMan/toggleOverlay
...
add toggleOverlays menu item and action
2016-02-26 10:17:24 -08:00
Philip Rosedale
783892ac2e
Merge pull request #7206 from hyperlogic/tony/simrate-fix
...
Application: don't simulate until we are ready to render
2016-02-26 07:27:35 -08:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
bf0fb7258a
CR feedback
2016-02-25 22:01:10 -08:00
David Rowe
3cac94ed35
Refactor label style
2016-02-26 17:32:25 +13:00
David Rowe
3dc9d01aab
Style checkbox control
2016-02-26 15:56:19 +13:00
David Rowe
b620427ae8
Fix text field label color
2016-02-26 15:54:50 +13:00
Anthony J. Thibault
e5c81f66a5
Application: removed threadID and milliseconds from logging.
2016-02-25 18:20:43 -08:00
Anthony J. Thibault
08c16beff2
Application: re-worded presentCount comments
2016-02-25 18:17:42 -08:00
Andrew Meadows
f964df6c97
final names for ViewFrustum intersection tests
2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e
cleanup names that use "keyhole"
2016-02-25 18:09:35 -08:00
Andrew Meadows
9558258f64
use cubeInKeyhole() where appropriate
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Anthony J. Thibault
11cd8e03b9
Merge branch 'master' into tony/simrate-fix
2016-02-25 17:50:23 -08:00
Anthony J. Thibault
1fdae13de1
Application: don't simulate until we are ready to render.
2016-02-25 17:48:55 -08:00
David Rowe
513bc5d4ef
Style scripts section
2016-02-26 14:10:37 +13:00
Stephen Birarda
34408c8144
Revert "verified domain ownership for full automatic networking"
2016-02-25 17:02:08 -08:00
David Rowe
a25702535b
Style snapshots section
2016-02-26 14:01:57 +13:00
Zach Pomerantz
113596636d
Merge pull request #7189 from ZappoMan/depthReticleWork
...
fix desktop detection when not pointing at overlay area
2016-02-25 16:24:06 -08:00
Brad Hefta-Gaub
e58081ca9c
remove extra debug code
2016-02-25 16:23:12 -08:00
Brad Hefta-Gaub
b0c286bc3b
Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay
...
Conflicts:
interface/src/Application.cpp
2016-02-25 16:21:38 -08:00
Brad Hefta-Gaub
202a456e1a
Merge pull request #7126 from AndrewMeadows/cleanup
...
cleanup ViewFrustum method names
2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
82cbf19bca
Merge pull request #7078 from zzmp/fix/light-intensity
...
Reimplement light attenuation for spot and point lights
2016-02-25 16:08:28 -08:00
Brad Hefta-Gaub
519a90f2bd
fix the overlays visible on startup case
2016-02-25 16:02:05 -08:00
Seth Alves
4873a1e26b
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more
2016-02-25 15:40:21 -08:00
Seth Alves
74452bc890
put back some code that shouldn't have been removed
2016-02-25 15:34:50 -08:00
Seth Alves
8f304d95b3
rather than computing a velocity for entities held by others as a way to keep it active in local bullet, just call activateBody over and over
2016-02-25 15:26:42 -08:00
Clément Brisset
2e7c7eace5
Merge pull request #7179 from birarda/domain-security
...
verified domain ownership for full automatic networking
2016-02-25 15:24:09 -08:00
Brad Hefta-Gaub
366aa39be8
handle startup overlay visibility correctly
2016-02-25 14:46:08 -08:00
Brad Hefta-Gaub
8422d4f36a
Merge pull request #7198 from howard-stearns/snapTurnDefault
...
snap turn default
2016-02-25 14:25:00 -08:00
samcake
610189ded3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 14:14:04 -08:00
samcake
96fb9c4466
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
2016-02-25 14:13:35 -08:00
Seth Alves
489fad4141
Merge pull request #7188 from ZappoMan/menuGroups
...
remove some unimplemented menu items
2016-02-25 14:00:38 -08:00
David Rowe
d255ad3805
Improve property naming
2016-02-26 10:17:36 +13:00
howard-stearns
d8fe55ddc5
Proper default for snapTurn preference (and new name so as to update old
...
users).
2016-02-25 13:06:34 -08:00
David Rowe
5d931523ad
Style settings section headings
2016-02-26 10:03:00 +13:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub
526f9dc248
check/uncheck the overlays menu when you toggle the overlays via some other mechanism
2016-02-25 08:41:38 -08:00
Brad Hefta-Gaub
5828c32041
add toggleOverlays menu item and action
2016-02-25 08:31:11 -08:00
David Rowe
09029e4edd
Change name of dialog to match menu item
2016-02-25 20:37:54 +13:00
David Rowe
f04654fb56
Style and swap order of save and cancel buttons
2016-02-25 20:35:27 +13:00
David Rowe
10efbd996f
Update General Settings dialog to use new window frame style
2016-02-25 20:26:36 +13:00
David Rowe
023c04d2fe
Add optional footer to "form editor" dialogs
2016-02-25 20:25:20 +13:00
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
Brad Hefta-Gaub
8b6a445b9e
fix desktop detection when not pointing at overlay area
2016-02-24 16:42:08 -08:00
Seth Alves
cfdaf643a1
Merge pull request #7181 from sethalves/fix-grab-action
...
fix avatarActionHold
2016-02-24 16:28:17 -08:00
Brad Hefta-Gaub
ecb03562d3
fix build buster
2016-02-24 16:24:48 -08:00
Zach Pomerantz
c2ed5e5474
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-24 16:24:09 -08:00
Brad Hefta-Gaub
f9b55c4b87
Merge pull request #7185 from ctrlaltdavid/20809
...
Fixes for new modal message dialog
2016-02-24 16:20:40 -08:00
Brad Hefta-Gaub
ca5de8d6a9
remove some unimplemented menu items
2016-02-24 16:17:11 -08:00
Zach Pomerantz
1817b8ef2f
Use only skyboxTexture in DeferredLightingEffect
2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Anthony J. Thibault
62ed5333e0
AvatarActionHold: compute velocities for other avatars
2016-02-24 15:14:56 -08:00
Anthony J. Thibault
b3b4c6473d
Merge branch 'master' into fix-grab-action
2016-02-24 14:34:23 -08:00
David Rowe
b9a1c2051b
Fix modal dialog not being opaque to mouse clicks
2016-02-25 10:52:16 +13:00
Brad Hefta-Gaub
568fd3e77f
Merge pull request #7164 from ctrlaltdavid/20809
...
Restyle message box modal dialogs
2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub
1699e4a396
Merge pull request #7131 from ctrlaltdavid/20805
...
Restyle the Running Scripts dialog
2016-02-24 13:45:40 -08:00
Zach Pomerantz
3c4ab077be
Init validOrientation for myAvatar calc
2016-02-24 13:16:45 -08:00
Zach Pomerantz
e78905a6d1
Rm previousDeltaTimeStep unused field from AvatarActionHold
2016-02-24 13:15:49 -08:00
David Rowe
51b41da488
Horizontally center short messages in the dialog
2016-02-25 09:15:07 +13:00
Seth Alves
e1b10e79df
don't crash when watching someone else near-grab something
2016-02-24 12:09:51 -08:00
Brad Hefta-Gaub
2a18127a01
Merge pull request #7171 from jherico/avatar_qml_location
...
Allow avatar positioning from QML
2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub
3df5d0abad
Merge pull request #7161 from zzmp/fix/overlay-model-scale
...
Use proper getter for model overlay scaling
2016-02-24 09:31:47 -08:00
Chris Collins
64a07440cc
Merge pull request #7180 from jherico/qml
...
Several QML fixes
2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186
Merge pull request #7176 from zzmp/menu/graphics
...
Update graphics menus
2016-02-24 08:18:58 -08:00
Brad Davis
fa23e2023e
Fix bad tool window placement
2016-02-23 21:05:57 -08:00
Clément Brisset
8e8e23452f
Merge pull request #7156 from ZappoMan/depthReticleWork
...
Depth reticle work
2016-02-23 17:54:35 -08:00
Andrew Meadows
8d91912d4b
Merge pull request #7162 from hyperlogic/tony/controller-velocity
...
Improve hand controller move and throw velocity
2016-02-23 17:13:13 -08:00
David Rowe
a816d835d3
Finesse modal message box dialog layout
2016-02-24 13:59:43 +13:00
Zach Pomerantz
ea8edb3744
Remove antialiasing from menus, default to on
2016-02-23 16:24:44 -08:00
Zach Pomerantz
7ae9752272
Remove Render > Ambient Light menu
2016-02-23 16:24:43 -08:00
Chris Collins
94d018be3e
Merge pull request #7172 from zzmp/fix/stats
...
Consolidate stats for opaque/transparent/other
2016-02-23 16:23:11 -08:00
Zach Pomerantz
1f9324c78f
Move Graphics... to Developer menu
2016-02-23 16:14:41 -08:00
David Rowe
7ee1edac3a
Merge branch '20805' into 20809
2016-02-24 13:08:28 +13:00
David Rowe
beef3f59eb
Fix QML warning
2016-02-24 12:59:21 +13:00
David Rowe
76ec5e4600
Merge branch 'master' into 20805
2016-02-24 12:38:44 +13:00
David Rowe
ad4d697f38
Use names for HiFi glyph characters
2016-02-24 12:37:23 +13:00
David Rowe
bac703b29e
Adjust height of Running Scripts now that fonts are consistently sized
2016-02-24 12:36:46 +13:00
David Rowe
128583660b
Specify font sizes in pixels instead of points
...
Makes the dialog layout and look consistent across different devices.
2016-02-24 12:10:19 +13:00
Stephen Birarda
42582e5d0f
remove old voxel cost model from application
2016-02-23 14:53:35 -08:00
Stephen Birarda
6cab831ea0
re-gen the interface keypair while being denied from domain
2016-02-23 14:52:12 -08:00
Anthony J. Thibault
8f27424de7
MyAvatar: bug fix for avatar leaning
2016-02-23 14:30:51 -08:00
David Rowe
9dd1bfad2d
Fix tree view branch indicator colors
...
Using interim HiFi glyphs until branch triangles are added to the font.
2016-02-24 10:54:36 +13:00
Brad Davis
2258a9cad9
Allow avatar positioning from QML
2016-02-23 12:16:41 -08:00
Zach Pomerantz
7804ee22d4
Consolidate stats for opaque/transparent/other
2016-02-23 12:14:00 -08:00
Brad Hefta-Gaub
71262c3e64
cleaner QML rejection of mouse messages
2016-02-23 11:14:16 -08:00
samcake
d3cdc5117f
clean up one more render::Item::isValid(ID)
2016-02-23 11:01:57 -08:00
samcake
7e39cc7753
clean up a bit the 2 globals RenderItem in APplication.cpp
2016-02-23 10:53:33 -08:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e
Fix model overlay scaling
2016-02-23 10:40:47 -08:00
Brad Hefta-Gaub
8117d51324
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-23 10:21:10 -08:00
Brad Hefta-Gaub
2db25690f1
detect when mouse is over QML overlays or 2D JS Overlays
2016-02-23 10:14:44 -08:00
samcake
9d0803e6b8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-23 09:33:54 -08:00
David Rowe
fdb7a9cf75
Merge branch '20805' into 20809
2016-02-23 20:29:18 +13:00
David Rowe
fec82e3125
Merge branch 'master' into 20805
2016-02-23 20:16:31 +13:00
David Rowe
e30135a89d
Increase height of dialog to avoid scrollbars
2016-02-23 20:05:45 +13:00
David Rowe
67b6cafc92
Use placeholder text for Filter field instead of separate label
...
Also fixes color of separate label if that is reinstated at some time.
2016-02-23 20:05:16 +13:00
David Rowe
9583b801f6
Increase size of resize handle
2016-02-23 19:57:13 +13:00
David Rowe
6bf377aac8
Move FontAwesome.qml to be with other font files
2016-02-23 18:16:32 +13:00
David Rowe
0e3cbd2930
Tidying
2016-02-23 18:05:49 +13:00
David Rowe
b09a20187a
Reverse order buttons appear in to make more consistent with Windows
2016-02-23 17:57:21 +13:00
David Rowe
49c229897f
Give the "change avatar?" confirmation dialog a default action
2016-02-23 17:55:36 +13:00
David Rowe
aa32c1f1af
Restyle modal message dialog content
2016-02-23 17:54:02 +13:00
David Rowe
86bb1b1ed8
Make copy of TextEdit control for restyling
2016-02-23 17:44:11 +13:00
Anthony J. Thibault
0fd260076b
SixenseManager: fix velocity and angularVelocity computation
...
Copied the delta based computation of velocity and angularVelocity that was in
Application::setPalmData() and moved it into SixenseManager. This will guarantee
that the velocity computation is the same as it was previously. The goal here is
to NOT change the behavior of the hydra.
The moving average style calculation of velocities has been removed.
Removed dead code.
2016-02-22 20:05:41 -08:00
Brad Davis
160a107bbd
Auto-unhide the desktop when showing or raising a window
2016-02-22 19:36:00 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
David Rowe
84e352a1de
Move icon to be in title
2016-02-23 14:54:49 +13:00
David Rowe
33cfe8f21f
Style modal dialog icon and message
2016-02-23 13:31:08 +13:00
David Rowe
f1921b4e38
Style modal dialog title
2016-02-23 13:14:38 +13:00
David Rowe
e86b36b00f
Don't whitewash screen when modal dialog is displayed
...
Focus shadow is used instead.
2016-02-23 13:12:29 +13:00
David Rowe
f7654dce05
Style modal dialog background and border
2016-02-23 13:10:02 +13:00
Zach Pomerantz
77ad4039bc
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2
Render point/spot lights with surface radii
2016-02-22 15:07:08 -08:00
Stephen Birarda
d444d5dd18
don't offer login reset from CrashHandler
2016-02-22 13:56:33 -08:00
Brad Hefta-Gaub
3f7a2eb10a
add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay
2016-02-22 13:54:46 -08:00
Brad Hefta-Gaub
fc002df5e7
implement Reticle.depth using the apparent 3D look at logic instead
2016-02-22 13:24:14 -08:00
David Rowe
d986a45497
Merge branch '20805' into 20809
2016-02-23 09:59:39 +13:00
David Rowe
942406e5d5
Improve focus shadow
2016-02-23 09:58:37 +13:00
Ryan Huffman
e6ccf501fa
Merge pull request #7135 from zzmp/fix/grid
...
Update renderGrid to use a shader, and fix grid edit tools
2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
715355464f
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-22 12:52:56 -08:00
Zach Pomerantz
5bf9b8bc76
Set grid minor div min to 0.01
2016-02-22 11:59:15 -08:00
Brad Hefta-Gaub
e369c1f327
fix unix warning
2016-02-22 10:28:00 -08:00
samcake
377ee5a486
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-22 09:23:14 -08:00
Brad Hefta-Gaub
19d0968ccb
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
...
Conflicts:
interface/src/ui/ApplicationCompositor.h
2016-02-22 09:18:40 -08:00
David Rowe
42734a0202
Tidy desktop QML dialogs
2016-02-22 21:16:00 +13:00
David Rowe
72fb2ff102
Make copies of modal window files
2016-02-22 17:05:57 +13:00
David Rowe
db6c76bf67
Merge branch 'master' into 20805
2016-02-22 13:15:40 +13:00
Brad Hefta-Gaub
cbe80bffd6
go into away mode if you the HMD loses mouse capture
2016-02-21 12:57:14 -08:00
Brad Hefta-Gaub
9f602a938d
don't move mouse on reset sensors
2016-02-21 12:42:02 -08:00
Brad Hefta-Gaub
ba36eed9eb
whitespace fixes
2016-02-21 11:40:15 -08:00
Brad Hefta-Gaub
68771c92f7
change position to use mutex instead of atomic<>
2016-02-21 11:38:26 -08:00
Brad Hefta-Gaub
3e6cddede3
CR feedback
2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
32a7179c62
CR feedback
2016-02-21 09:59:19 -08:00
Brad Hefta-Gaub
1a4591db58
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
2016-02-21 09:30:41 -08:00
Brad Hefta-Gaub
31b895058b
depth reticle work
2016-02-21 09:30:26 -08:00
David Rowe
bfedd24ad7
Fixes after reviewing against latest UI Toolkit doc
2016-02-21 16:43:41 +13:00
David Rowe
558c8872b1
Rework scrollbar to make layout more robust
2016-02-21 14:02:51 +13:00
David Rowe
b2c74447fb
Fix OSX scrollbars in scripts lists starting too low
2016-02-21 12:44:29 +13:00
Brad Hefta-Gaub
9c3abd3eb7
some cleanup and standardization in how headPose is gathered
2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
9066fb0622
Merge pull request #7145 from howard-stearns/lod-pid-removal
...
Lod pid removal
2016-02-20 10:29:42 -08:00
Brad Hefta-Gaub
e6614fb9e5
Merge pull request #7141 from sethalves/fix-avatar-fade
...
Fix avatar fade
2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f
Merge pull request #7122 from howard-stearns/audio-output-buffer
...
Audio output buffer
2016-02-20 09:40:06 -08:00
samcake
9b2a90b430
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-19 19:50:02 -08:00
Brad Hefta-Gaub
4e2c514eb1
fix mac warning
2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
04fa37324f
tweak to virtual desktop size, to make text more readable, 240d horz FOV
2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
1fa6e294e7
allow mouse to move outside of the overlay extents
2016-02-19 17:49:33 -08:00
Zach Pomerantz
665ef17fce
Remove avatar usage from grid3d
2016-02-19 16:38:53 -08:00
David Rowe
91e4fb478d
Don't display dialog focus or content shadows on OSX
...
Alpha gradients display as fuchsia on OSX.
2016-02-20 13:12:51 +13:00
Stephen Birarda
f553becabe
data-server name tweak and isAgent behaviour change
2016-02-19 16:04:45 -08:00
Anthony Thibault
942f2c13ab
Vive: smoother updates for IK driven by vive controllers
...
Before this PR the simulation rate was clamped to never exceed 60htz.
This had problems when waving the vive hand controllers in the world,
they would jitter. The simulation rate is now clamped to never exceed
120 htz. This has the effect of synchronizing the display and the
update rates to 90htz.
Also there are improvements to vive support if threaded present is
disabled.
2016-02-19 15:58:13 -08:00
Zach Pomerantz
c9362a4073
Set grid major div min to 1
2016-02-19 15:58:08 -08:00
Zach Pomerantz
5d78867197
Set grid height via global y-coord
2016-02-19 15:41:38 -08:00
Howard Stearns
13c602e2a3
Remove mumbleUnsynchronizedFPS, which is obsolete now that the update/render rate is not in power-of-two lockstep with present rate, and which had users other than the LOD PID.
2016-02-19 15:12:44 -08:00
Brad Hefta-Gaub
1a8b926534
Merge pull request #7144 from hyperlogic/tony/first-rotation-fix
...
MyAvatar: fix for turning with arrow keys on start up
2016-02-19 14:59:53 -08:00
Zach Pomerantz
3418488c2f
Fool octree to avoid ui grid overlay culling
2016-02-19 14:44:33 -08:00
Anthony J. Thibault
b94410a323
MyAvatar: fix for turning with arrow keys on start up
2016-02-19 14:39:46 -08:00
Howard Stearns
a22b25aad9
Make defaults match our performance statements. (Half of present rate.)
2016-02-19 14:37:58 -08:00
Brad Hefta-Gaub
342391cb2f
Merge pull request #7143 from imgntn/webengine-new-windows
...
Add support for pop-up windows to Qt WebEngineView
2016-02-19 14:31:16 -08:00
Brad Hefta-Gaub
edb241807a
Merge pull request #7137 from imgntn/webengine-fun
...
Enable HTML5 userMedia APIs in QTWebengine view
2016-02-19 14:27:27 -08:00
Brad Hefta-Gaub
7219a925d2
remove getTrueMouse()
2016-02-19 14:17:28 -08:00
Howard Stearns
00f3d6e382
Remove LODPreference enum.
2016-02-19 14:05:21 -08:00
Howard Stearns
9f7feed544
Remove LOD PID controller.
2016-02-19 14:00:22 -08:00
Zach Pomerantz
0b4e82405f
Snap grid overlay to major worldlines
2016-02-19 13:57:33 -08:00
Zach Pomerantz
fd6aa9a78b
Add layering to renderGrid, draw edit grid not layered
2016-02-19 13:57:32 -08:00
James B. Pollack
56f8282607
dont need this code here
2016-02-19 13:54:31 -08:00
James B. Pollack
7ec09c49f3
feature request is in another pull
2016-02-19 13:53:22 -08:00
James B. Pollack
afb6f1fe84
no clipboard
2016-02-19 13:50:30 -08:00
James B. Pollack
66e8f070e4
popup windows
2016-02-19 13:48:54 -08:00
Brad Hefta-Gaub
d9aa5d8857
cleanup dead code
2016-02-19 13:25:53 -08:00
Brad Hefta-Gaub
7be5811f34
tweak to UI size, clean up screen to overlay
2016-02-19 13:22:37 -08:00
Howard Stearns
30b4eace95
Remove LOD PID-related preferences and the related toggling of preferences.
2016-02-19 11:52:07 -08:00
Zach Pomerantz
9daefbdb94
Fix grid antialiasing
2016-02-19 11:39:11 -08:00
Zach Pomerantz
07a5c7bd16
Update grid shader for major/minor lines
2016-02-19 11:22:01 -08:00
Andrew Meadows
c53e583bf4
Merge pull request #7129 from hyperlogic/tony/no-hands-in-body
...
Prevent avatar's wrists from entering torso
2016-02-19 10:53:12 -08:00
Seth Alves
01d3977bf1
make avatars shrink faster
2016-02-19 10:04:58 -08:00
howard-stearns
c866d17907
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer
2016-02-19 09:46:29 -08:00
samcake
d7b3945c4a
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-19 09:29:23 -08:00
Brad Hefta-Gaub
d1e1067e5a
allow hydra mouse to know the correct size of screen to target
2016-02-18 22:30:31 -08:00
Brad Hefta-Gaub
bc5d4cfb7f
better handling of mouse capture to account for overlapping child windows
2016-02-18 20:20:30 -08:00
Brad Davis
6f364de062
Add a QML document referencing the QML multimedia types to force inclusion in the build
2016-02-18 18:39:25 -08:00
Brad Hefta-Gaub
0de5c1cf71
don't capture the mouse if you're not the active window or if a menu is popped up
2016-02-18 17:11:40 -08:00
James B. Pollack
d73728ae78
add to browser
2016-02-18 16:58:34 -08:00
James B. Pollack
4b29921e63
media!
2016-02-18 16:41:29 -08:00
Zach Pomerantz
af791e8f72
Make grid overlays unpickable
2016-02-18 15:50:18 -08:00
Zach Pomerantz
0c1353e6cc
Update grid overlay to use new renderGrid, sane properties
2016-02-18 15:48:23 -08:00
Brad Hefta-Gaub
adcadedc65
slight rework of handleRealMouseMoveEvent
2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
843039f741
fix mac warnings
2016-02-18 12:04:38 -08:00
Brad Hefta-Gaub
935af6d2cc
clean up debug logs
2016-02-18 12:01:03 -08:00
howard-stearns
30ae1950d2
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer
2016-02-18 11:35:41 -08:00
Zach Pomerantz
f79fc30b83
Update audioscope to use new renderGrid
2016-02-18 11:30:53 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
c4fc3e4057
more work on dragging in hmd
2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5
hmd mouse check point
2016-02-18 08:44:22 -08:00
David Rowe
54b27f3ac3
Merge branch 'master' into 20805
2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e
Tidying
2016-02-18 23:06:26 +13:00
David Rowe
b68837277c
Fix default focus
2016-02-18 22:12:43 +13:00
David Rowe
81169c59c8
Fix runtime warnings
2016-02-18 19:52:20 +13:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
David Rowe
4df77cff31
Add scrollbars to running scripts and available scripts tables
2016-02-18 18:10:58 +13:00
David Rowe
d32f743f52
Style running scripts and available scripts tables
2016-02-18 16:35:51 +13:00
samcake
b88501784c
Making progress toward the PBR material
2016-02-17 18:47:52 -08:00
Anthony J. Thibault
73ac47724a
Rig: Prevent the hand IK targets from entering the body.
...
Use a 2d circle/circle intersection test to keep the hands outside of the body.
2016-02-17 16:23:18 -08:00
Anthony Thibault
e863da5a68
Merge pull request #7118 from jherico/hmd_mono
...
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Seth Alves
784dc2b538
Merge pull request #7124 from samcake/red
...
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Brad Hefta-Gaub
38430d8d2c
Merge pull request #7112 from howard-stearns/snap-turn-preference
...
Snap turn preference
2016-02-17 09:19:38 -08:00
David Rowe
b2314d33ba
Style and lay out text fields
2016-02-17 20:44:09 +13:00
David Rowe
2a25509f7c
Further font fixes
2016-02-17 20:38:01 +13:00
David Rowe
f568b1c67f
Fix display of Raleway Bold
2016-02-17 16:19:00 +13:00
David Rowe
61d359a9b5
Style Button controls
2016-02-17 16:12:11 +13:00
David Rowe
1164e3e303
Set up window pane's content width so that can right-align
2016-02-17 15:35:35 +13:00
Howard Stearns
6d70584b5a
Change name and use only when in HMD.
2016-02-16 18:09:56 -08:00
Howard Stearns
983a0ccb9b
Change internal preference names so that old users pick up the new default values, and change name in dialog.
2016-02-16 18:00:39 -08:00
samcake
640bf81339
Forcing an update from teh avatar manager to the avatar renderItems when beeing updated
2016-02-16 17:19:31 -08:00
Brad Hefta-Gaub
a25581c656
clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)
2016-02-16 12:11:58 -08:00
David Rowe
30498760b0
Set up and use font size values
2016-02-16 21:06:06 +13:00
samcake
0ad7bacf02
Changing diffuse to albedo and breaking everything...
2016-02-15 21:50:10 -08:00
Brad Davis
56fc9ea301
Remove distortion on HMD previews, both mono and stereo
2016-02-15 21:46:29 -08:00
David Rowe
386a247f78
Put Running Scripts content into sections
2016-02-16 17:48:21 +13:00
David Rowe
3c1561cc06
Revise scrollbar handling to make better for content
2016-02-16 16:03:23 +13:00
David Rowe
d46f85c5dd
Allow noninteger font sizes
2016-02-16 14:50:28 +13:00
David Rowe
535b183f76
Fix focus shadow vertical position
2016-02-16 13:44:36 +13:00
Brad Hefta-Gaub
0d873c7732
consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface
2016-02-15 16:11:25 -08:00
David Rowe
0442fcf89c
Add shadow at bottom of content
2016-02-16 12:20:01 +13:00
Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
David Rowe
615b2e6052
Fix up some colors
2016-02-16 11:01:53 +13:00
David Rowe
6a22078d2c
Add focus shadow
2016-02-16 10:47:45 +13:00
