Brad Hefta-Gaub
d98c2d1413
migrate callers of QMessageBox::question() to OffscreenUi::question()
2016-01-05 09:39:39 -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 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
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
Brad Davis
462cc325e5
Cleanup, moving some QML objects to OffscreenUI
2015-12-31 12:39:56 -08:00
Brad Davis
7d71a187d8
Fix SDL breakage due to missing init
2015-12-31 08:47:27 -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
Brad Davis
4c26627622
Add navigation actions and wire them up in the standard controller
2015-12-30 17:14:40 -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
Brad Davis
f4bd2afc8e
Make script launched windows invisible at creation time
2015-12-30 11:38:34 -08:00
Anthony J. Thibault
8f71a5fda5
ModelEntityItem: Fix for missing pre-rotations for animated models.
...
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
2015-12-30 10:17:18 -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
a5c19c04e5
Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown
...
Don't send a domain-server check in when shutting down
2015-12-30 08:43:19 -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
Andrew Meadows
ec27c75332
Merge pull request #6660 from hyperlogic/tony/anim-expressions
...
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -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
Zach Pomerantz
bea18e91aa
Guard against empty polyline index out of range
2015-12-28 15:09:49 -08:00
James B. Pollack
a133dfa8dd
Merge pull request #6738 from ericrius1/rayBlacklist
...
Ray-pick blacklisting
2015-12-28 10:19:52 -08:00
Anthony Thibault
878fe80040
Merge branch 'master' into tony/neuron-plugin
2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb
Set up controller poses to match hifi standard skeleton
...
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
2015-12-25 09:57:50 -08:00
ericrius1
8e7dfc07c0
Added logic to blacklist entities from raypicking
2015-12-24 11:59:47 -08:00
ericrius1
390dce4613
Adding blacklist
2015-12-24 11:48:40 -08:00
Zach Pomerantz
dfa2b8d453
Remove redundant clearColorBuffer from Blit
2015-12-24 10:39:29 -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
Anthony J. Thibault
c44f69b370
WIP checkpoint
...
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
2015-12-23 17:13:52 -08:00
Anthony J. Thibault
6afe3bae5e
Copy Neuron joints into controller poses
...
This makes the accessible for controller mapping and to JavaScript.
Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar. NOTE: the rotations are currently in the wrong coordinate frame.
2015-12-22 17:21:33 -08:00
Brad Hefta-Gaub
7a09582a65
Merge pull request #6729 from zzmp/fix/reorder
...
Reorder RenderContext initializer to avoid -Wreorder
2015-12-22 17:19:32 -08:00
Brad Davis
88d36487f8
Merge pull request #6727 from samcake/hdr
...
Clean up shaders removing glowIntensity and alphaThreshold legacy
2015-12-22 15:41:08 -08:00
Zach Pomerantz
df78f895a6
Reorder RenderContext initializer to avoid -Wreorder
2015-12-22 14:54:47 -08:00
samcake
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
ericrius1
6fc98bd577
fixed ravestick, merged
2015-12-22 12:03:03 -08:00
ericrius1
fdb909ca31
merged
2015-12-22 09:40:42 -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
samcake
757e94ed98
Merge pull request #6715 from zzmp/refactor/scene-render-js
...
Clean up interfaces for JS Scene/Render
2015-12-21 16:50:41 -08:00
Brad Davis
95c524fba1
Fixing authentication token for followed links
2015-12-21 15:44:35 -08:00
Zach Pomerantz
4df8fa4ac3
Create Render/Scene unique_ptr without C++14 make_unique
2015-12-21 15:39:49 -08:00
Stephen Birarda
ba89c8a97a
remove some extra debug that isn't needed
2015-12-21 16:23:23 -07:00
Stephen Birarda
8c6449a886
fix for stopping a nullptr QTimer
2015-12-21 16:20:06 -07: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
Zach Pomerantz
5a86f0c23f
Nest JS props in SceneScriptingInterface
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
