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
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
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
Seth Alves
175506bbf1
when a script sets joint-data on a model-entity, send an edit packet
2015-12-23 16:06:04 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Seth Alves
29e79c0672
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-22 18:00:42 -08:00
Seth Alves
d878dde952
whitespace
2015-12-22 17:57:25 -08:00
Seth Alves
1a51c9ddbe
remove some unused stuff
2015-12-22 17:56:12 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -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
ericrius1
1cdee11784
Merge branch 'master' into polylineOptimizations
2015-12-21 12:49:00 -08:00
samcake
4f54b85c92
Remove warnings
2015-12-21 12:05:19 -08:00
samcake
ae124ebede
Tuning the proedural shader support to work with the current default: gamma corrected emissive
2015-12-21 12:00:30 -08:00
Brad Davis
6ef77bc46a
Support the marketplace in QML
2015-12-21 11:34:03 -08:00
samcake
492572df45
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-21 11:26:15 -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
samcake
4c2d5c54c4
Merge branch 'hdr' of https://github.com/samcake/hifi into hdr
2015-12-21 10:43:41 -08:00
samcake
aef748b894
Adding linear color in Particule system
2015-12-21 10:40:29 -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
Seth Alves
d71cecbc61
Merge pull request #6675 from AndrewMeadows/crash-fix
...
fix crash when visiting new domain with gun in hand
2015-12-20 06:24:44 -08:00
samcake
1e8e3fec87
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-19 11:38:20 -08:00
