Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -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
Andrew Meadows
164c649a33
Merge pull request #6681 from howard-stearns/pid-render-limits
...
Pid render limits
2016-01-04 14:47:31 -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
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
Brad Davis
07531353e4
Allow a script to set a resource override.
2015-12-30 09:06:04 -08:00
Andrew Meadows
b83987331b
Merge pull request #6725 from huffman/fix-avatar-get-myavatar
...
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d
Merge pull request #6745 from hyperlogic/tony/neuron-plugin
...
Support for Perception Neuron
2015-12-30 11:39:32 -05:00
Anthony J. Thibault
f4f4bd44cb
SoftAttachmentModel: added a descriptive comment.
2015-12-29 13:28:04 -08:00
Anthony J. Thibault
c2dd00375d
Merge branch 'master' into tony/soft-attachments
2015-12-29 13:21:37 -08:00
Zach Pomerantz
12fa223004
Render SKY_DOME when SKY_MAP tex is loading
2015-12-29 10:58:23 -08:00
Anthony Thibault
878fe80040
Merge branch 'master' into tony/neuron-plugin
2015-12-25 10:24:55 -08:00
Zach Pomerantz
687eef37da
Move final blit into RenderDeferredTask
...
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
2015-12-23 18:21:08 -08:00
Seth Alves
036002151d
call activateBody in prepareForPhysicsSimulation rather than various other places
2015-12-22 12:40:38 -08:00
Seth Alves
5e4a165b4d
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-22 11:23:09 -08:00
Ryan Huffman
00b47cacea
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
...
The previous code inadvertently added a default constructed shared pointer
to the avatar hash, causing it to crash when dereferencing it in
the update loop.
2015-12-22 09:59:57 -08:00
Anthony J. Thibault
0459479c2b
NeuronPlugin: Added external project for Neuron SDK
...
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
2015-12-21 18:30:15 -08:00
Brad Hefta-Gaub
3dfc48e205
Merge pull request #6687 from jherico/marketplace
...
Support the marketplace in QML
2015-12-21 17:55:55 -08:00
Brad Davis
95c524fba1
Fixing authentication token for followed links
2015-12-21 15:44:35 -08:00
Zach Pomerantz
d8022aa5b0
Add back deferred debugging and combine context init
2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d
Nest JS props in RenderScriptingInterface
2015-12-21 14:32:06 -08:00
Seth Alves
76df582a6c
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-21 14:29:32 -08:00
Brad Hefta-Gaub
111a8caa3c
Merge pull request #6701 from highfidelity/graphics
...
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
2015-12-21 13:54:50 -08:00
Brad Davis
6ef77bc46a
Support the marketplace in QML
2015-12-21 11:34:03 -08:00
Brad Davis
05b7fcc957
Remove script -> qt::webchannel dependency
2015-12-21 11:19:05 -08:00
samcake
6bbc94badc
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-21 10:48:55 -08:00
Anthony J. Thibault
dcde640acd
Stub Perception Neuron input plugin
2015-12-21 10:06:36 -08:00
Seth Alves
1d9a81d5d4
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-21 09:14:37 -08:00
Brad Davis
46a4a469e9
Merge pull request #6689 from ZappoMan/rightClickMenu
...
Some early work to support hand driven reticle
2015-12-20 17:49:50 -08:00
