Commit graph

44451 commits

Author SHA1 Message Date
SamGondelman
15d09bb4fa cleanup, fixed texture corruption bug 2016-06-29 13:33:33 -07:00
SamGondelman
af2a0ed924 preserve preview aspect ratio, fix device pixel ratio scaling 2016-06-29 11:02:43 -07:00
SamGondelman
a741ae5069 moved _firstPreview after download 2016-06-28 17:43:15 -07:00
SamGondelman
55c5d53640 fixed signal 2016-06-28 16:58:42 -07:00
SamGondelman
a82930cb7a cleanup 2016-06-28 15:59:58 -07:00
SamGondelman
12b5cccfc7 merge from master 2016-06-28 14:05:43 -07:00
SamGondelman
8f0d966810 working on enabling preview image 2016-06-28 13:53:57 -07:00
Howard Stearns
da61100b6d Merge pull request #8150 from highfidelity/vive-ui
merge vive-ui to master
2016-06-28 13:31:55 -07:00
Anthony Thibault
abf643579a Merge pull request #8144 from howard-stearns/fix-crashing-hmd-menu-modals
fix crash when hmd context menu triggers a modal
2016-06-28 13:14:23 -07:00
Brad Hefta-Gaub
3fca0d655c Merge pull request #8145 from ctrlaltdavid/20978
reduce users window flicker when restart script
2016-06-28 10:03:46 -07:00
Andrew Meadows
e4329cc8de Merge pull request #8137 from AlexanderOtavka/add-entity
Fix bugs with Entities.addEntity
2016-06-28 09:54:09 -07:00
Andrew Meadows
b7b513a75f Merge pull request #8132 from AlexanderOtavka/eslint
Add eslintrc file
2016-06-28 09:51:28 -07:00
Andrew Meadows
58e05b2e90 Merge pull request #8143 from AlexanderOtavka/remove-cam-slots
namechange Camera::_rotation --> Camera::_orientation
2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix
Mini mirror/multi-monitor bug fixes
2016-06-27 22:04:39 -07:00
David Rowe
79cfd2e9dc Reduce users window flicker when restart script 2016-06-28 11:40:49 +12:00
Brad Hefta-Gaub
1af455b8b9 Merge pull request #8135 from SamGondelman/fixEditLockHMD
Prevent entering independent camera mode through edit.js in HMD mode
2016-06-27 15:50:25 -07:00
howard-stearns
68be819ea2 fix crash when hmd context menu triggers a modal 2016-06-27 14:07:13 -07:00
Zander Otavka
235ee4bd46 Refactor Camera scripting interface a little
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used.  get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
2016-06-27 13:06:12 -07:00
Brad Hefta-Gaub
cecd871c66 Merge pull request #8139 from ctrlaltdavid/20978
fix users.js display and operation
2016-06-27 12:56:10 -07:00
Howard Stearns
01ca54cac9 Merge pull request #8136 from jherico/tray_position
Don't reposition windows prior to selecting the initial display plugin
2016-06-27 12:31:59 -07:00
SamGondelman
0bfe3ea817 added support for disabling vsync on macs, but doesn't work with the rift 2016-06-27 11:34:44 -07:00
Zander Otavka
55c2466249 Move .eslintrc.js to project root
This way, all project scripts are in scope, and the .eslintrc doesn't
get pushed to the installer with the default scripts.
2016-06-27 10:25:53 -07:00
Andrew Meadows
53af5db77b Merge pull request #8141 from sethalves/unwedge-hydras-on-linux
workaround to allow models and files to be loaded on linux
2016-06-27 09:49:08 -07:00
Seth Alves
bbe9b931be on Linux, don't mess with the menus from the hydra plugin because it makes Qt stop 2016-06-26 14:59:42 -07:00
Brad Hefta-Gaub
c92293e559 Merge pull request #8138 from marko8904/master
sign executables with SHA256
2016-06-25 11:06:35 -07:00
Marko Kudjerski
17ce80ed69 sign executables with SHA256 2016-06-24 19:28:31 -07:00
David Rowe
dc07368dc9 Hide users list when logged out 2016-06-25 14:23:35 +12:00
David Rowe
0b6797acc3 Fix "show me" and "visible to" in users window not being remembered 2016-06-25 13:48:43 +12:00
Howard Stearns
de7738e644 Merge pull request #8134 from highfidelity/vive-ui
Vive UI bug fixes
2016-06-24 18:39:06 -07:00
David Rowe
8b0f59c9cf Fix users window minimized state not being remembered 2016-06-25 13:12:16 +12:00
David Rowe
1c1d81ae25 Fix missing users.js menu item 2016-06-25 12:18:03 +12:00
David Rowe
8a5369fcb1 Undo hide users.js when logged out 2016-06-25 12:03:36 +12:00
Zander Otavka
a4da63c1ff Fix bug with Entities.addEntity returning bad id
If addEntity failed for whatever reason (eg. lack of permission), it
would return a non-null UUID.

Fixes [FogBugz case #365](https://highfidelity.fogbugz.com/f/cases/356/Entities-addEntity-can-return-a-UUID-even-when-unsuccessful).
2016-06-24 16:39:57 -07:00
Zander Otavka
2786061d71 Fix bug with entity adding w/o permission
Entities could be added to the local tree, but be rejected by the server
because of a lack of permissions.
2016-06-24 16:34:54 -07:00
Brad Davis
f90a351400 Don't reposition windows prior to selecting the initial display plugin 2016-06-24 16:31:24 -07:00
SamGondelman
a358e3c2d9 Merge branch 'fixEditLockHMD' of https://github.com/SamGondelman/hifi into fixEditLockHMD 2016-06-24 16:23:52 -07:00
SamGondelman
d5feac94f4 coding standard fun 2016-06-24 16:23:15 -07:00
SamGondelman
5e69af83c6 can't enter independent mode through edit.js in HMD mode 2016-06-24 16:23:15 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd
Automatically enter first person when in HMD mode
2016-06-24 15:58:38 -07:00
Ken Cooke
36ebe4a4f6 Merge pull request #8125 from ZappoMan/simplifyResamplerUse
cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler
2016-06-24 15:43:04 -07:00
Anthony Thibault
aa8d1d097e Merge pull request #8133 from howard-stearns/do-not-recenter-hud-from-button
do not reset hud from button
2016-06-24 15:35:14 -07:00
howard-stearns
9ae3c38616 doh! 2016-06-24 15:26:24 -07:00
howard-stearns
2ae0a7defc If there are TWO conditions holding things back, weight for them both to
clear.
2016-06-24 14:46:46 -07:00
Brad Hefta-Gaub
2e8f6c2cc6 Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-24 14:08:29 -07:00
Howard Stearns
f7e9d3968a Merge pull request #8127 from hyperlogic/bug-fix/grab-visualization-improvements
grab visualization improvements
2016-06-24 14:01:44 -07:00
howard-stearns
7da854d98c do not reset hud from button 2016-06-24 13:35:47 -07:00
Anthony J. Thibault
41fcfb45ca Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements 2016-06-24 13:28:00 -07:00
Zander Otavka
dd023e16fd Tabs -> spaces 2016-06-24 13:16:24 -07:00
Howard Stearns
c4398c3950 Merge pull request #8129 from ZappoMan/reduceLogSpam
reduce log spam in Vive plugins
2016-06-24 13:00:13 -07:00
howard-stearns
6a1dd235c9 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-24 12:49:54 -07:00