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 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
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
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
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
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
samcake
1e8e3fec87
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-19 11:38:20 -08:00
Brad Davis
ae6cf131f5
Fixing crash bug
2015-12-18 17:19:06 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
samcake
7e66515beb
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub
4075f355a3
more work on hand movement
2015-12-18 15:44:01 -08:00
Brad Hefta-Gaub
868d10651a
Merge pull request #6651 from jherico/webengine
...
Migrate QML based web views to Qt WebEngine
2015-12-18 14:56:35 -08:00
Andrew Meadows
eb3210071e
Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition
...
Improved idle to walk forward transition
2015-12-18 13:59:03 -08:00
samcake
19769ddd8f
Merge pull request #6691 from zzmp/refactor/scene-render
...
Split JS global Scene into Scene and Render
2015-12-18 13:57:25 -08:00
Anthony J. Thibault
1618e0a92f
Network, Preferences and UI support for soft attachments
...
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.
AvatarData and AvatarBulkData version number has been bumped.
Changed Avatar attachment collections to use smart pointers to models
instead of raw ones. Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
2015-12-18 13:32:09 -08:00
samcake
dff4327f7d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 13:18:30 -08:00
Brad Davis
16dd24f3d8
Removing unused LGPL JS file
2015-12-18 13:02:45 -08:00
Brad Hefta-Gaub
bfecf68a2e
Merge pull request #6696 from AndrewMeadows/angular-velocity-is-a-vector
...
angular velocity is a vector
2015-12-18 12:29:56 -08:00
Zach Pomerantz
d057239023
Rename RenderContext::ItemsMeta to ItemsConfig
2015-12-18 11:48:40 -08:00
Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -08:00
