Commit graph

15999 commits

Author SHA1 Message Date
David Rowe
e79427bb3b Make some settings dialogs have collapsible sections 2016-03-02 19:41:50 +13:00
David Rowe
20bf07550a Update to new HiFi-Glyphs font file 2016-03-02 13:10:52 +13:00
David Rowe
d1f4369a5f Fix width of divider above buttons at bottom of settings dialogs 2016-03-02 12:00:29 +13:00
David Rowe
16fbf60bae Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
David Rowe
881302df02 Merge branch 'master' into 20812 2016-03-02 09:55:17 +13:00
David Rowe
5a3f74d51b Style drop-down combo box for Developer > Graphics... 2016-03-02 09:53:10 +13:00
David Rowe
a309a2e08f Style slider controls 2016-03-02 09:24:57 +13:00
Atlante45
14ae35e741 CR 2016-03-01 12:00:43 -08:00
Atlante45
4944d0a8d0 Handle threading inside AssetServer 2016-03-01 12:00:43 -08:00
Atlante45
f0ccada945 Fix for Ubuntu 2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b Temporary fix to disk cache editor crash 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Andrew Meadows
c1b3858193 Merge pull request #7228 from ZappoMan/hmdHacking
HMD and Away improvements
2016-03-01 11:48:09 -08:00
Chris Collins
926b93b4db Merge pull request #7224 from ctrlaltdavid/20816
Change Running Scripts reload, close, and tree buttons when pressed
2016-03-01 10:26:58 -08:00
Brad Hefta-Gaub
a3f4dbddcf Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-29 20:23:14 -08:00
Brad Hefta-Gaub
2c3fdc995f Away improvements 2016-02-29 20:23:06 -08:00
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
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
David Rowe
2b03e16bec Increase the title's focus shadow offset 2016-02-27 12:48:09 +13: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
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