Brad Hefta-Gaub
c2f2f950fb
Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
...
Make Avatar palm position/rotation accessors thread safe
2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce
Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen
...
move alert and confirm to use offscreen ui
2016-01-05 15:26:48 -05:00
Seth Alves
cd82383d33
Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability
2016-01-05 11:13:38 -08:00
Anthony J. Thibault
a21b604746
Simplified implementation of ThreadSafeValueCache
2016-01-05 11:08:08 -08:00
Andrew Meadows
0473891e86
Merge pull request #6671 from sethalves/near-grab-via-parenting
...
queryAACube plumbing
2016-01-05 11:01:28 -08:00
Andrew Meadows
62688d5c07
Merge pull request #6768 from jherico/vr_keys
...
Tweaks for supporting the new QML UI
2016-01-05 10:31:57 -08:00
Seth Alves
212d2d9e8f
merge from upstream
2016-01-05 10:27:45 -08:00
Howard Stearns
5f85e0a4c0
Merge pull request #6769 from hyperlogic/tony/marketplace-avatar-attachment-support
...
Interface support for avatar attachments from Marketplace
2016-01-05 10:17:33 -08:00
Brad Hefta-Gaub
927fe97359
migrate callers of QMessageBox::warning() to OffscreenUi::warning()
2016-01-05 10:17:16 -08:00
Andrew Meadows
43d8c14c16
Merge pull request #6767 from howard-stearns/pid-render-limits
...
render limits fixes
2016-01-05 10:17:04 -08:00
Anthony J. Thibault
9ea6079c64
Merge branch 'master' into tony/get-palm-thread-safe
2016-01-05 10:16:52 -08:00
Brad Hefta-Gaub
d98c2d1413
migrate callers of QMessageBox::question() to OffscreenUi::question()
2016-01-05 09:39:39 -08:00
Brad Davis
900a0f7f08
Trigger selection is too twitchy
2016-01-05 09:16:44 -08:00
Brad Davis
4b6f58dcab
Restoring code commented out for debugging
2016-01-04 20:51:52 -08:00
Brad Davis
8485c89a0e
More work on exposing tools to QML overlay windows
2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084
Working on focus problems
2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1
Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop
2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b
QML dialogs should not consume key events when disabled
2016-01-04 20:51:49 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Anthony J. Thibault
bac6570655
Interface support for avatar attachments from Marketplace
...
Drag and drop support of ava.json files is also supported and
at the moment the only way to test.
To test:
1. Create a cowboyhat.ava.json file on your hard-drive, with the following contents:
{
"version": "0.1",
"name": "Cowboy Hat",
"modelUrl": "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx ",
"jointName": "Head",
"transform": {
"rotation": {"x": 0, "y": 0, "z": 0, "w": 1},
"translation": {"x": 0, "y": 0, "z": 0},
"scale": {"x": 1, "y": 1, "z": 1}
},
"isSoft": false
}
2. Create a leatherjacket.ava.json file, with the following contents:
{
"version": "0.1",
"name": "Leather Jacket",
"modelUrl": "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx ",
"isSoft": true
}
3. Run interface
4. Drag-and-Drop cowboyhat.ava.json onto the main Interface window.
5. You should be prompted wear the 'Cowboy Hat' attachment.
6. If you select 'Yes', the cowboy hat should appear on the avatar.
7. Do the same with leatherjacket.ava.json file.
2016-01-04 17:50:45 -08:00
howard-stearns
715826cc0d
Full speed (no more half speed), and fix shouldRender for objects larger
...
than their distance.
2016-01-04 15:12:14 -08:00
Brad Davis
125d103e29
Merge pull request #6762 from ZappoMan/hideMirrorAndAudioInHMD
...
hide the rear view mirror and the audio in the HMD
2016-01-04 18:03:33 -05:00
howard-stearns
a37b9157bc
simplify preferences
2016-01-04 15:00:54 -08:00
Andrew Meadows
164c649a33
Merge pull request #6681 from howard-stearns/pid-render-limits
...
Pid render limits
2016-01-04 14:47:31 -08:00
howard-stearns
333eadd551
Don't show render count / distance when using acuity.
2016-01-04 14:46:57 -08:00
Brad Hefta-Gaub
2b5956af99
move alert and confirm to use offscreen ui
2016-01-04 13:57:36 -08:00
Brad Hefta-Gaub
f719f4a1cc
hide the rear view mirror and the audio in the HMD
2016-01-04 13:31:01 -08:00
Brad Hefta-Gaub
26f0030ca0
Merge pull request #6758 from jherico/vr_keys
...
Allow keyboard navigation of the VR/overlay menu
2016-01-04 12:42:34 -08:00
Howard Stearns
342d3e80bc
fix MSVC formatting
2016-01-04 09:49:25 -08:00
Howard Stearns
9c8a04ce1e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2016-01-04 09:26:14 -08:00
Brad Hefta-Gaub
5b177404d5
Merge pull request #6749 from jherico/resource_override
...
Allow a script to set a resource override.
2016-01-04 09:17:38 -08:00
Brad Davis
297e58fbc6
Cleanup
2016-01-03 20:29:31 -08:00
Brad Davis
435ab8c4e8
Fix possible log spam issue
2016-01-03 20:22:55 -08:00
Brad Davis
bfa9213a10
Allow keyboard navigation of 'vr menu'
2016-01-03 20:22:39 -08:00
Brad Hefta-Gaub
ec8a2ae093
Merge pull request #6739 from jherico/qml_window
...
Support QML and Web content in overlay windows
2016-01-03 10:18:26 -10:00
Brad Hefta-Gaub
02835fc960
Merge pull request #6702 from hyperlogic/tony/soft-attachments
...
Soft Attachment Support
2016-01-03 08:46:16 -10:00
Seth Alves
86b551c177
back out off-brand change
2016-01-03 07:33:50 -08:00
Seth Alves
5d0604b8d3
activateBody doesn't help if called from inside the action callback, because the callback isn't called on inactive bodies. call it from the setup routine, instead
2016-01-03 07:33:10 -08:00
Seth Alves
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -08:00
Brad Davis
67e32cc1f0
Consolidating URL handling, exposing to all QML objects
2015-12-31 14:14:48 -08:00
Brad Davis
462cc325e5
Cleanup, moving some QML objects to OffscreenUI
2015-12-31 12:39:56 -08:00
Brad Davis
a883891197
Expose the username to scripts (and thus QML)
2015-12-30 22:28:16 -08:00
Brad Davis
000130617e
Allow input devices to break up their mappings into multiple files
2015-12-30 22:28:10 -08:00
Brad Davis
c77b66f88c
Make navigation directions into axes
2015-12-30 22:28:08 -08:00
Brad Davis
4c26627622
Add navigation actions and wire them up in the standard controller
2015-12-30 17:14:40 -08:00
Brad Davis
a834f28eca
Add a tag to the top level QML dialog so loaded content can manipulate it easily
2015-12-30 17:14:03 -08:00
Brad Davis
bfe7ab4d94
Allow QML windows to quit the application
2015-12-30 11:39:34 -08:00
Brad Davis
f4bd2afc8e
Make script launched windows invisible at creation time
2015-12-30 11:38:34 -08:00
Brad Davis
d6f5296c3b
Working on event bridge and scripting interfaces
2015-12-30 09:14:50 -08:00
Brad Davis
0901e3aae1
Support QML and Web content in overlay windows
2015-12-30 09:14:49 -08:00