Ryan Huffman
|
f60cd09b45
|
Add logging of signal slot exceptions in ScriptEngine
|
2016-01-03 21:12:21 -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 Davis
|
3b4f5d36a5
|
PR feedback
|
2016-01-03 12:29:32 -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
|
c17e8a6d9e
|
Merge pull request #6753 from jherico/sdl_fix
Fix SDL breakage due to missing init
|
2016-01-03 10:11:19 -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
|
63293d5838
|
remove commented code
|
2016-01-03 08:07:31 -08:00 |
|
Seth Alves
|
f5bc58f606
|
back out off-brand change
|
2016-01-03 08:00:31 -08:00 |
|
Seth Alves
|
40a25f859a
|
cleanups
|
2016-01-03 08:00:23 -08:00 |
|
Seth Alves
|
2c21092808
|
be more careful about locking
|
2016-01-03 07:59:49 -08: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
|
9145a8a753
|
back out off-brand change
|
2016-01-03 07:29:24 -08:00 |
|
Seth Alves
|
9f828448a0
|
add comment
|
2016-01-03 07:29:14 -08:00 |
|
Seth Alves
|
e1299ee290
|
be more careful about grab action -- if it somehow expires, reinstate it
|
2016-01-03 07:27:14 -08:00 |
|
Seth Alves
|
bfa8cc1969
|
merge from upstream
|
2016-01-03 06:47:25 -08:00 |
|
Seth Alves
|
fa043f3648
|
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
|
2016-01-03 06:29:41 -08:00 |
|
Seth Alves
|
b190b2757e
|
Merge pull request #6751 from hyperlogic/tony/model-entity-item-animation-fix
ModelEntityItem: Fix for missing pre-rotations for animated models.
|
2016-01-01 07:08:24 -08:00 |
|
Brad Davis
|
a0196f0cde
|
Ensure we don't hang if the QML thread doesn't shutdown
|
2015-12-31 15:23:39 -08:00 |
|
Brad Davis
|
67e32cc1f0
|
Consolidating URL handling, exposing to all QML objects
|
2015-12-31 14:14:48 -08:00 |
|
Philip Rosedale
|
60bc023d6e
|
Merge pull request #6754 from PhilipRosedale/master
Show hand-sphere search line and point just with hand direction again
|
2015-12-31 13:53:21 -08:00 |
|
Philip Rosedale
|
85a0dfa21a
|
remove debug line
|
2015-12-31 13:49:24 -08:00 |
|
Philip Rosedale
|
f4389c3b1f
|
Add head-to-hand mixing ratio, default to zero (hands only)
|
2015-12-31 13:36:24 -08:00 |
|
Brad Davis
|
462cc325e5
|
Cleanup, moving some QML objects to OffscreenUI
|
2015-12-31 12:39:56 -08:00 |
|
Philip Rosedale
|
c18a2fc264
|
blend 50/50 between head and hands for search
|
2015-12-31 11:56:37 -08:00 |
|
Zach Pomerantz
|
c6e6aceb85
|
Optimize getVertexStream() by using a const&
|
2015-12-31 11:51:05 -08:00 |
|
Philip Rosedale
|
0d4ac4387a
|
Show hand-sphere search line and point just with hand direction again
|
2015-12-31 11:46:35 -08:00 |
|
Brad Davis
|
7d71a187d8
|
Fix SDL breakage due to missing init
|
2015-12-31 08:47:27 -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
|
3eddf8d4a4
|
Allow and conditionals to be initialized from simple pairs
|
2015-12-30 22:24:34 -08:00 |
|
James B. Pollack
|
40aee910d7
|
disconnect
|
2015-12-30 20:18:52 -08:00 |
|
James B. Pollack
|
58257b00e7
|
reduce gap btw refresh
|
2015-12-30 17:18:33 -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
|
af132e267f
|
Support a 'nav focus' state to allow joystick / hydra navigation of UI
|
2015-12-30 17:13:20 -08:00 |
|
Brad Davis
|
e863d4edee
|
Fix SDL breakage due to missing init
|
2015-12-30 16:48:19 -08:00 |
|
Seth Alves
|
d35bbbb9f2
|
incorporate changes from #6732
|
2015-12-30 13:15:36 -08:00 |
|
Seth Alves
|
fe0a656d54
|
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
|
2015-12-30 12:45:32 -08:00 |
|
Seth Alves
|
4e312dd8f8
|
undo temporary hack
|
2015-12-30 12:45:19 -08:00 |
|
James B. Pollack
|
eae8b48513
|
fix conditional
|
2015-12-30 11:58:18 -08:00 |
|
James B. Pollack
|
2de517c70f
|
remove unused line
|
2015-12-30 11:50:20 -08:00 |
|
James B. Pollack
|
7b14fa0070
|
Merge branch 'master' into particle_grab_cleanup
|
2015-12-30 11:46:44 -08:00 |
|
James B. Pollack
|
b7d0a75f25
|
dynamic lifetimes for particle systems
|
2015-12-30 11:46:16 -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 |
|
Eric Levin
|
9276c78368
|
Merge pull request #6741 from PhilipRosedale/master
Improved hand controller grab and mouse movement
|
2015-12-30 11:10:37 -08:00 |
|