Brad Davis
|
ab7fed1af8
|
Switch back to disable GL 4.5 by default, add support for logging when enabled
|
2016-06-28 18:56:25 -07:00 |
|
Brad Davis
|
a41de3a60d
|
Making GL 4.5 enabled by default, adding logging
|
2016-06-28 18:55:26 -07:00 |
|
Brad Davis
|
8b56444dde
|
Fix crash in GL45 buffer re-allocation
|
2016-06-28 18:55:25 -07:00 |
|
Brad Davis
|
b16812aa4d
|
Adding GL 4.5 backend
|
2016-06-28 18:55:24 -07:00 |
|
Brad Davis
|
21d2c977a3
|
Remove roll from cursor in HMD
|
2016-06-28 18:30:07 -07:00 |
|
Seth Alves
|
c414df7a9d
|
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
|
2016-06-28 18:28:20 -07:00 |
|
Brad Davis
|
962f9d5f22
|
Don't update the shown state of the tool window when it's already invisible
|
2016-06-28 18:10:06 -07:00 |
|
Howard Stearns
|
58e2300943
|
Merge branch 'master' of https://github.com/highfidelity/hifi into limit-hand-controller-actions-to-recommended-area
|
2016-06-28 18:01:46 -07:00 |
|
Howard Stearns
|
b551bc3c1a
|
Use the whole area, less a margin.
|
2016-06-28 18:01:09 -07:00 |
|
Howard Stearns
|
d650c50a5b
|
Use normal Script.update (60hz) instead of a timer (@20hz).
|
2016-06-28 17:44:30 -07:00 |
|
SamGondelman
|
a741ae5069
|
moved _firstPreview after download
|
2016-06-28 17:43:15 -07:00 |
|
Brad Hefta-Gaub
|
ec0ca1d173
|
Merge pull request #8146 from huffman/fix/launch-version
Add version to launch user activity
|
2016-06-28 17:13:10 -07:00 |
|
SamGondelman
|
55c5d53640
|
fixed signal
|
2016-06-28 16:58:42 -07:00 |
|
Seth Alves
|
224008afd6
|
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
|
2016-06-28 16:56:27 -07:00 |
|
Seth Alves
|
b782ae667c
|
when one hand adjusts something equippd in the other, print out the new local position and rotation in case a content-creator wants to update userData
|
2016-06-28 16:36:37 -07:00 |
|
Andrew Meadows
|
74781c0786
|
boxify static meshes with too many vertices
|
2016-06-28 16:36:10 -07:00 |
|
Andrew Meadows
|
e538625fe0
|
fix warning about convex hull vertex count cap
|
2016-06-28 16:35:32 -07:00 |
|
Brad Davis
|
34faf45a5d
|
Merge pull request #8154 from jherico/stable-merge
Stable merge back to master
|
2016-06-28 16:22:10 -07:00 |
|
SamGondelman
|
a82930cb7a
|
cleanup
|
2016-06-28 15:59:58 -07:00 |
|
Seth Alves
|
630d5cfc82
|
make trigger more sensitive, print out position and rotation when releasing something
|
2016-06-28 15:47:17 -07:00 |
|
Brad Davis
|
b45ed7f959
|
Merge remote-tracking branch 'upstream/stable' into stable-merge
|
2016-06-28 15:09:00 -07:00 |
|
Brad Davis
|
f0d04dcfe0
|
Merge pull request #8153 from jherico/RC-14-merge
RC-14 merge back to master
|
2016-06-28 14:50:14 -07:00 |
|
Brad Davis
|
18017f7024
|
Merge remote-tracking branch 'upstream/RC-14' into RC-14-merge
|
2016-06-28 14:48:05 -07:00 |
|
SamGondelman
|
12b5cccfc7
|
merge from master
|
2016-06-28 14:05:43 -07:00 |
|
Brad Hefta-Gaub
|
9e8829aa81
|
Merge pull request #8148 from zzmp/fix/metadata-hours-migration
Beta Release 14.1 - fix metadata hours migrations for new users/version bumps
|
2016-06-28 13:55:51 -07:00 |
|
SamGondelman
|
8f0d966810
|
working on enabling preview image
|
2016-06-28 13:53:57 -07:00 |
|
howard-stearns
|
5051f2f326
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered
|
2016-06-28 13:33:50 -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 |
|
howard-stearns
|
c492d125e0
|
limit hand controller actions to recommended area
|
2016-06-28 13:19:03 -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 |
|
Zach Pomerantz
|
c406538301
|
properly parse domain metadata hours
|
2016-06-28 12:40:25 -07:00 |
|
Zach Pomerantz
|
56038a97a6
|
add domain settings getter for descriptors, validates nested vals
|
2016-06-28 12:39:00 -07:00 |
|
Zach Pomerantz
|
c62967a57b
|
add secs per hour
|
2016-06-28 12:38:00 -07:00 |
|
howard-stearns
|
799686f29d
|
Only update the (invisible) cursor position from hand controllers when the
trigger is partially squeezed.
|
2016-06-28 11:36:08 -07:00 |
|
Seth Alves
|
0f9f4749e7
|
fix invokeMethod in AvatarManager::findRayIntersection
|
2016-06-28 11:18:46 -07:00 |
|
Seth Alves
|
8a0d58a0c2
|
fix invokeMethod in AvatarManager::findRayIntersection
|
2016-06-28 11:15:01 -07:00 |
|
Stephen Birarda
|
18a1f74c37
|
remove unused boolean for signalling protocol mismatch
|
2016-06-28 10:32:43 -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 |
|
Ryan Huffman
|
b36a39b2bc
|
Add version to launch user activity
|
2016-06-28 09:59:59 -07:00 |
|
Seth Alves
|
5e7e6d2f3e
|
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
|
2016-06-28 09:57:58 -07:00 |
|
Triplelexx
|
efdee523fb
|
coding standard fix and renaming
|
2016-06-28 17:57:38 +01:00 |
|
Seth Alves
|
4e70e8ed42
|
js call to ray-pick against avatars
|
2016-06-28 09:55:49 -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 |
|
Triplelexx
|
cc6dca853c
|
change TouchScreenDevice based on CR feedback
* device support is based on detection of QTouchDevice::TouchScreen
* DPI scale is calculated using the screen that generates the touch
event
|
2016-06-28 16:47:13 +01: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 |
|
Triplelexx
|
19b6a04175
|
indentation causing some issue
is this resolved? Hard to tell.
|
2016-06-27 23:33:12 +01:00 |
|