Anthony J. Thibault
|
25b5cb4762
|
Switch order of precondition and setSecondaryTargets
|
2017-08-01 13:17:33 -07:00 |
|
Anthony J. Thibault
|
2383933252
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-07-31 10:55:40 -07:00 |
|
Chris Collins
|
5bdaa4daa1
|
Merge pull request #11087 from jherico/crash_null_entity_element
Fix potential nullptr access in EntityTreeElement
|
2017-07-31 09:15:52 -07:00 |
|
Brad Hefta-Gaub
|
7785c11ee8
|
Merge pull request #11080 from jherico/fix_web_touch_emulation
Fix web touch emulation
|
2017-07-30 09:14:54 -07:00 |
|
Brad Hefta-Gaub
|
c88e5d1053
|
Merge pull request #11084 from jherico/fix_paths_warning
Fix log warnings from non-notifiable properties
|
2017-07-30 08:51:47 -07:00 |
|
Brad Davis
|
861b33a845
|
Fix potential nullptr access in EntityTreeElement
|
2017-07-29 17:22:25 -07:00 |
|
Brad Hefta-Gaub
|
3bd2464a01
|
Merge pull request #11086 from highfidelity/revert-11079-disable_web_touch_emulation
Revert "Disable touch event emulation for tablet until we fix crash"
|
2017-07-29 13:11:32 -07:00 |
|
Brad Hefta-Gaub
|
af2452eb64
|
Revert "Disable touch event emulation for tablet until we fix crash"
|
2017-07-29 13:06:07 -07:00 |
|
Brad Davis
|
17b06e8e12
|
Fix log warnings from non-notifiable properties
|
2017-07-29 11:54:39 -07:00 |
|
Brad Davis
|
7d18d2e017
|
Restore corrected touch event simulation
|
2017-07-29 08:51:51 -07:00 |
|
Brad Hefta-Gaub
|
52bebf621d
|
Merge pull request #11079 from jherico/disable_web_touch_emulation
Disable touch event emulation for tablet until we fix crash
|
2017-07-29 08:28:37 -07:00 |
|
Brad Davis
|
5946a965da
|
Disable touch event emulation for tablet until we fix crash
|
2017-07-28 18:54:16 -07:00 |
|
Chris Collins
|
cfd9f8b64e
|
Merge pull request #11077 from jherico/overlay_event_crashes
Fix overlay event handling thread issues
|
2017-07-28 15:56:09 -07:00 |
|
anshuman64
|
e11388f7f7
|
Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal
Add a "dominant hand changed" signal
|
2017-07-28 15:17:50 -07:00 |
|
Brad Hefta-Gaub
|
dd310b8661
|
Merge pull request #11076 from birarda/bug/blank-create-tabs
fix blank create tabs in HMD
|
2017-07-28 15:07:17 -07:00 |
|
Brad Davis
|
d42052a299
|
Fix overlay event handling thread issues
|
2017-07-28 14:56:21 -07:00 |
|
Stephen Birarda
|
17dd028ec7
|
make Paths available to desktop and tablet QML context
|
2017-07-28 14:23:18 -07:00 |
|
Brad Hefta-Gaub
|
c200d40862
|
Merge pull request #11063 from nimisha20/patch-2
Updating with the latest dependency info
|
2017-07-28 13:30:28 -07:00 |
|
anshuman64
|
defc76c9cf
|
Merge pull request #11075 from jherico/tablet_scripting_crash
Fix tablet button crash
|
2017-07-28 11:57:27 -07:00 |
|
Brad Davis
|
3d0c13915a
|
Fix tablet button crash
|
2017-07-28 11:20:57 -07:00 |
|
Andrew Meadows
|
d4e72df928
|
Merge pull request #10711 from burtsloane/midi
Midi support for Entities
|
2017-07-28 10:51:43 -07:00 |
|
utkarshgautamnyu
|
f407bf6f5a
|
Merge pull request #11064 from highfidelity/bug/6513
Enabled multiple selection and deletion in Asset Browser
|
2017-07-28 09:46:34 -07:00 |
|
Chris Collins
|
20513ccf83
|
Merge pull request #11069 from jherico/overlay_deadlocks
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
|
2017-07-28 09:25:26 -07:00 |
|
Brad Hefta-Gaub
|
3e1174a4ca
|
Merge pull request #11070 from kencooke/master
Merge pull request #10987 from SamGondelman/hmd59Crash2
|
2017-07-28 08:27:28 -07:00 |
|
Chris Collins
|
4684b388c7
|
Merge pull request #10987 from SamGondelman/hmd59Crash2
Fix crash when putting on HMD for Qt 5.9
|
2017-07-28 07:41:07 -07:00 |
|
Brad Davis
|
bb57504498
|
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
|
2017-07-27 19:39:22 -07:00 |
|
David Rowe
|
c1d179eba1
|
Add "dominant hand changed" signal
|
2017-07-28 14:20:49 +12:00 |
|
Brad Hefta-Gaub
|
d572510770
|
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
update EntityItem bounding cube when on changed dimensions
|
2017-07-27 18:21:06 -07:00 |
|
Anthony J. Thibault
|
6c2b6674bb
|
load and save shoulderConfig to settings.
|
2017-07-27 17:33:54 -07:00 |
|
Andrew Meadows
|
6b386000db
|
initialize 'success' and use for return value
|
2017-07-27 17:11:13 -07:00 |
|
nimisha20
|
55e23a3106
|
Update BUILD.md
|
2017-07-27 16:57:08 -07:00 |
|
burtsloane
|
e557f759b5
|
Update Midi.cpp
|
2017-07-27 16:17:23 -07:00 |
|
utkarshgautamnyu
|
1beec26003
|
Update TabletAssetServer.qml
|
2017-07-27 15:55:55 -07:00 |
|
utkarshgautamnyu
|
a6a4bd5923
|
Update AssetServer.qml
|
2017-07-27 15:55:30 -07:00 |
|
utkarshgautamnyu
|
07fc9a6dc3
|
Indentation fixes
|
2017-07-27 14:53:49 -07:00 |
|
utkarshgautamnyu
|
4680911264
|
Enabled multiple selection and multiple deletion in asset browser
|
2017-07-27 14:47:30 -07:00 |
|
nimisha20
|
f7add1f6c6
|
Updating with the latest dependency info
|
2017-07-27 13:17:42 -07:00 |
|
Brad Hefta-Gaub
|
9b3be6d164
|
Merge pull request #10808 from humbletim/21400
WL 21400 -- Setting that lets you switch from cursor to reticle
|
2017-07-27 13:16:58 -07:00 |
|
Brad Hefta-Gaub
|
3aca1e1d84
|
Merge pull request #11004 from highfidelity/express_custom_install
Added a page in installer for express/custom installation
|
2017-07-27 13:14:56 -07:00 |
|
Anthony J. Thibault
|
bcb4cc32d2
|
another clang error fix
|
2017-07-27 10:26:10 -07:00 |
|
Anthony J. Thibault
|
778c8bf9a7
|
clang build error fix
|
2017-07-27 10:08:35 -07:00 |
|
anshuman64
|
bcb819206b
|
Merge pull request #11037 from sethalves/bug-camera-mode-mods
use Qt menu hotkeys to drive camera-mode changes
|
2017-07-27 09:44:53 -07:00 |
|
Anthony J. Thibault
|
8f5c41af2d
|
changed _controllerPoseMap from unordered_map to map
|
2017-07-27 09:44:37 -07:00 |
|
Anthony J. Thibault
|
78c6564174
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-07-27 09:09:32 -07:00 |
|
Anthony J. Thibault
|
8dc9714282
|
Pass armCircumference and shoulderWidth to qml.
|
2017-07-27 09:08:34 -07:00 |
|
Chris Collins
|
ef67029837
|
Merge pull request #10912 from amvmoody/21374
WL 21374: Allow lights/particles to be dragged by icon
|
2017-07-26 22:07:36 -07:00 |
|
Chris Collins
|
853101fcbc
|
Merge pull request #10928 from 1P-Cusack/21362
Add point and thumb up gestures to the Vive.
|
2017-07-26 22:07:14 -07:00 |
|
anshuman64
|
2e7f62cbb3
|
Merge pull request #11058 from nimisha20/patch-1
Update BUILD_WIN.md
|
2017-07-26 17:50:33 -07:00 |
|
anshuman64
|
560cccb0df
|
Remove nmake troubleshooting step
|
2017-07-26 17:01:45 -07:00 |
|
anshuman64
|
081d8fbec4
|
More changes
|
2017-07-26 17:00:48 -07:00 |
|