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
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
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
feb63772f3
ThreadSafeValueCache added class and method descriptions
...
Also, changed callback prototype.
2015-12-29 17:08:17 -08:00
Anthony J. Thibault
17e6a04aa8
Renamed ThreadSafeValue to ThreadSafeValueCache
...
Also bug fixes where I was incorrectly swapping left and right hands.
2015-12-29 16:35:31 -08:00
Anthony J. Thibault
e7f3f549a5
Avatar getPalm* methods are thread-safe and non-blocking
...
Uses newly added ThreadSafeValue template class.
2015-12-29 15:10:38 -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
Stephen Birarda
a0d6001fa5
actually start domain-server check in timer
2015-12-28 10:54:42 -08:00
Stephen Birarda
2799123b55
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-28 10:46:51 -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
Seth Alves
5e4a165b4d
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-22 11:23:09 -08:00
ericrius1
fdb909ca31
merged
2015-12-22 09:40:42 -08:00
David Rowe
24f6cfa018
Fix whitespace
2015-12-22 15:26:41 +13:00
David Rowe
58f1371eba
Fix particle radius and rgba start, middle, finish interpolation
...
Bezier interpolation of 3 points doesn't intersect the middle value.
Instead, use separate Bezier interpolations for start-middle and middle-
finish, so that the interpolated values intersect the middle value as a
user would expect.
2015-12-22 15:08:03 +13: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
Stephen Birarda
74d1685617
remove an extra space
2015-12-21 16:45:33 -07: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
9e2d06710f
fix for connectedToDomain signal signature
2015-12-21 16:37:22 -07:00
Stephen Birarda
49ea560e4e
make QTimers in ThreadedAssignment not be raw pointers
2015-12-21 16:33:40 -07: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
Seth Alves
1d9f3097da
trying to track down why equips fail after a few minutes
2015-12-21 15:16:55 -08:00
Seth Alves
c84fa5f821
cleanups
2015-12-21 14:45:18 -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
Zach Pomerantz
5a86f0c23f
Nest JS props in SceneScriptingInterface
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
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
Seth Alves
68cfda1af9
try again on AACube::operator +=
2015-12-21 11:34:53 -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
Seth Alves
00e0b26f05
fix thinko and whitespace
2015-12-21 11:15:54 -08:00
Seth Alves
3c2dac5cf8
parent query-cube should encompass child query-cube not child max-aa-cube
2015-12-21 11:05:07 -08:00
Seth Alves
abaa329984
parents AACube should encompass all children's
2015-12-21 10:55:07 -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
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
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
Seth Alves
b82559e898
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-19 07:08:25 -08:00
Brad Hefta-Gaub
e929e3f789
more work on angular velocity tests
2015-12-18 19:20:32 -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
Seth Alves
4c996885e5
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 17:15:29 -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
Seth Alves
f60240e3f3
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 16:28:51 -08:00
Seth Alves
d7e08876da
Merge branch 'near-grab-via-parenting' of github.com:sethalves/hifi into near-grab-via-parenting
2015-12-18 16:28:34 -08:00
Seth Alves
701f99d28e
only send a queryAACube for entities to entity-server
2015-12-18 16:28:11 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Seth Alves
3782c21b45
when a parent moves, check children vs their queryAACubes
2015-12-18 16:06:51 -08:00
Brad Hefta-Gaub
4075f355a3
more work on hand movement
2015-12-18 15:44:01 -08:00
samcake
f24800cf10
Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script
2015-12-18 15:35:01 -08:00
Seth Alves
9b49d9d66b
default parentJointIndex to -1
2015-12-18 15:10:51 -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
Seth Alves
13ad6bf2f7
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 14:52:02 -08:00
Anthony J. Thibault
098a455b67
AttachmentData operator== bug fix
...
This was causing some changes to not be reflected across the network.
2015-12-18 14:49:33 -08:00
Seth Alves
69bba4a182
queryAABox wasn't centered on object
2015-12-18 14:46:24 -08:00
Brad Davis
88b88a3306
Fixing warnings
2015-12-18 14:32:35 -08:00
Howard Stearns
56a0ef146f
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-18 14:32:32 -08:00
Brad Hefta-Gaub
42764426ce
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-18 14:30:16 -08:00
Andrew Meadows
aa3d1c6e4c
Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix
...
ModelEntityItem: Fix for incorrect animations with preTranslations
2015-12-18 14:16:35 -08:00
Seth Alves
154bf5978b
Merge pull request #6697 from samcake/hdr
...
Graphics: Adding gamma correction to color vertex attribute
2015-12-18 14:11:14 -08:00
Seth Alves
b9a7ed8560
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
2015-12-18 14:02:51 -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
Howard Stearns
53f821b636
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-18 13:51:01 -08:00
samcake
0492bb1c6d
Final cleans and tests using R11G11B10 for lighting buffer
2015-12-18 13:50:28 -08:00
Seth Alves
1a534ff645
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
2015-12-18 13:43:33 -08:00
Eric Levin
2e4df5f859
Merge pull request #6692 from ctrlaltdavid/20758
...
Update particlesTest.js per current particles implementation
2015-12-18 13:35:19 -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
f6c80e01e9
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-18 13:23:09 -08:00
samcake
5a4d028573
Merge pull request #6699 from samcake/graphicsMaster
...
Graphics : merge upstream master into upstream graphics
2015-12-18 13:23:05 -08:00
samcake
0482a2a7f7
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-18 13:20:46 -08:00
samcake
d22811a771
Merge pull request #6698 from zzmp/fix/check-locations-pipeline
...
Stop modelMesh render if pipeline is not found
2015-12-18 13:20:12 -08:00
samcake
dff4327f7d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 13:18:30 -08:00
Zach Pomerantz
2c2b794683
Stop modelMesh render if pipeline is not found
2015-12-18 13:16:05 -08:00
samcake
3014b3bd5b
Adding Gamma correction to all the Color coming for the attribute stream if used as color
2015-12-18 12:50:21 -08:00
Brad Hefta-Gaub
5701ad2e8c
update to new angular velocity
2015-12-18 12:38:50 -08:00
Howard Stearns
a8aa00953e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-18 12:37:59 -08:00
Brad Hefta-Gaub
fff567d854
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-18 12:31:24 -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
Seth Alves
81d3571171
fix getMaximumAACube and getMinimumAACube success return values
2015-12-18 12:04:47 -08:00
Zach Pomerantz
674bfa4f37
Replace RenderContext substructs with subclasses
2015-12-18 12:04:21 -08:00
Zach Pomerantz
d057239023
Rename RenderContext::ItemsMeta to ItemsConfig
2015-12-18 11:48:40 -08:00
Brad Davis
08a087c5aa
PR comments
2015-12-18 11:19:01 -08:00
Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -08:00
Zach Pomerantz
cdcb2d565d
Use new RenderContext accessors for rendering
2015-12-18 10:34:39 -08:00
Zach Pomerantz
919a4b6728
Split global JS Scene into Render
2015-12-18 10:33:41 -08:00
samcake
157597e783
Merge pull request #6690 from samcake/hdr
...
Graphics: Fix the shading equation to respect the fresnel term for the diffuse
2015-12-18 10:30:36 -08:00
Anthony J. Thibault
6b5b272cd7
Added SoftAttachmentModel class.
...
Is a subclass of Model, it overrides the updateClusterMatrices so it will pull
the actual joint matrices from a different rig override.
For the avatar soft attachment system, this override will be the Avatar::_skeletonModel rig.
This will give us the ability for an avatar to "wear" non-rigid attachments, such as clothing.
2015-12-18 09:52:11 -08:00
Seth Alves
a5d37bed60
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 09:12:57 -08:00
Howard Stearns
9a68176693
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-18 09:11:06 -08:00
Brad Hefta-Gaub
a7824a06d0
fix Assignment copy constructor warning
2015-12-17 18:51:27 -08:00
Brad Hefta-Gaub
a2d5124964
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-17 18:12:12 -08:00
David Rowe
9a7c0cb182
Typo noticed in passing
2015-12-18 15:12:03 +13:00
Brad Hefta-Gaub
d344ef6e2a
fix warning in my PR
2015-12-17 18:10:41 -08:00
samcake
c891bcb8cd
FIxing the diffuse contribution bug maybe
2015-12-17 17:44:40 -08:00
samcake
32bb8f020c
FIxing the diffuse contribution bug maybe
2015-12-17 17:40:35 -08:00
Brad Hefta-Gaub
762aefbbca
add hand driven reticle
2015-12-17 17:38:20 -08:00
Howard Stearns
d6612d20ff
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-17 16:51:04 -08:00
Seth Alves
688448fe41
more queryAABox experimenting
2015-12-17 16:18:41 -08:00
Atlante45
78b805a19a
Fix file shader file lookup on windows
2015-12-17 16:06:55 -08:00
Atlante45
c0a675dd9e
Fix msvc warning
2015-12-17 16:02:49 -08:00
Atlante45
f41ca9fc50
More custom debug work
2015-12-17 15:18:23 -08:00
Atlante45
d8a389ff92
First cut at custom pipelines
2015-12-17 15:18:23 -08:00
Atlante45
9d6618c341
Cleanup DebugDeferredBuffer code
2015-12-17 15:18:23 -08:00
Atlante45
06d7de7106
Make Shader interface take more consts
2015-12-17 15:18:23 -08:00
Seth Alves
2dd2a49141
a non-set queryAACube is one with no volume
2015-12-17 15:02:07 -08:00
Seth Alves
473212e5b7
try to be more coherent about queryAABox meaning
2015-12-17 14:29:41 -08:00
Andrew Meadows
1bb6ddb99f
Merge pull request #6676 from sethalves/dejitter-hold-action
...
Dejitter hold action
2015-12-17 14:29:39 -08:00
ericrius1
92f96cbb2f
Removed un-needed libraries from particle effect entity
2015-12-17 12:49:30 -08:00
Brad Davis
5088eec2a2
Move directory web UI into the overlay
2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
Seth Alves
9438015f3a
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 11:48:04 -08:00
ericrius1
5b52b5e5e7
Merge branch 'master' into polylineOptimizations
2015-12-17 11:41:34 -08:00
ericrius1
2aaefbcfcb
refactoring, adding headers
2015-12-17 11:32:48 -08:00
Ryan Huffman
3da5cf1fe5
Merge pull request #6684 from birarda/read-type-assert
...
fix reading of empty or malformed packets
2015-12-17 11:26:47 -08:00
Seth Alves
eb173815f5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 11:08:05 -08:00
Stephen Birarda
06e9731fe4
don't attempt to read an empty or malformed packet
2015-12-17 11:07:36 -08:00
Stephen Birarda
08f42c08d9
use a ternary for single assignment
2015-12-17 10:54:32 -08:00
Seth Alves
5d8417309a
Merge branch 'shtml-content-type' of github.com:birarda/hifi into near-grab-via-parenting
2015-12-17 10:49:52 -08:00
Seth Alves
7693058e39
clear _queryAACubeSet flag in locationChanged
2015-12-17 10:49:24 -08:00
Stephen Birarda
286b984d6f
serve SHTML files with HTML MIME type
2015-12-17 10:48:33 -08:00
samcake
927cdc0880
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-17 10:30:04 -08:00
Seth Alves
16b26bbbfd
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 10:16:19 -08:00
samcake
d8a71db929
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-17 10:11:03 -08:00
samcake
8d4d0d4e9a
FIxing the bad returned value per reference
2015-12-17 10:08:40 -08:00
Clément Brisset
40272faa3f
Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix
...
ParticleEffectEntityItem: fix for invalid iterator increment
2015-12-17 09:43:39 -08:00
Seth Alves
32fb4decd5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 07:32:52 -08:00
Seth Alves
d34e166b48
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 07:31:52 -08:00
Brad Hefta-Gaub
24dde9ea92
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub
0b9bd858a7
implement support for pose ScriptEndpoints
2015-12-16 21:28:27 -08:00
Howard Stearns
da27cacdec
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-16 20:56:33 -08:00
Anthony J. Thibault
2eecb61da5
Prefer erase over repeated pop_front calls
2015-12-16 19:08:31 -08:00
samcake
7bc815448e
The material colors for diffuse and emissive are now gamma corrected by default
2015-12-16 18:14:43 -08:00
Seth Alves
b83579e6e5
include queryAABox in physics-induced sends
2015-12-16 17:25:49 -08:00
Anthony J. Thibault
3b1ba67a88
ModelEntityItem: Fix for incorrect animations with preTranslations
...
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.
We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
2015-12-16 17:08:22 -08:00
Anthony J. Thibault
1b08563079
ParticleEffectEntityItem: fix for invalid iterator increment
...
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
2015-12-16 16:56:49 -08:00
samcake
1b1365fd40
Exposing the tone curve in the js api
2015-12-16 16:32:53 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Seth Alves
0500c21e00
unmangle merge
2015-12-16 16:09:52 -08:00
Seth Alves
9e5116bf4f
Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting
2015-12-16 15:56:31 -08:00
Seth Alves
ea202c5271
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-16 15:44:44 -08:00
howard-stearns
e058057e3d
fix logging
2015-12-16 15:41:23 -08:00
Seth Alves
489d4099a7
add locationChanged to model entities
2015-12-16 15:21:20 -08:00
samcake
c0faf978f8
Introducing a setting for the tone curve
2015-12-16 15:21:09 -08:00
Andrew Meadows
ff83f8fc37
fix crash mode when leaving domain with handgun
2015-12-16 15:11:47 -08:00
Andrew Meadows
c14433979b
fix crash mode when model late to get collision URL
2015-12-16 15:11:47 -08:00
Atlante45
b4dc3b1b47
Fix windows compile error.
2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df
Move OctreeSendThread to the OctreeServer
2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c
Assignment don't inherit from NodeData
...
This is an artefact from an old design that stuck around
2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de
Forward QThread's finished signal in GenericThread
2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2
Remove OctreeServer's static instance
2015-12-16 14:27:26 -08:00
Seth Alves
d3c57821c0
call a method on actions before each physics simulation step. use this to attempt to dejitter held objects
2015-12-16 14:00:04 -08:00
David Rowe
b25fc5be6c
Don't send a domain-server check in when shutting down
2015-12-17 09:52:34 +13:00
Anthony Thibault
0c1ae5bb61
Merge pull request #6657 from AndrewMeadows/avatar-capsule-2
...
Correct collision capsule for scaled avatars
2015-12-16 11:36:08 -08:00
Ryan Huffman
a422103e89
Merge pull request #6662 from AlessandroSigna/overlays
...
Exposing emmisive property of the Image3DOverlay
2015-12-16 10:29:34 -08:00
Seth Alves
10b82945a6
formatting
2015-12-16 10:16:01 -08:00
Seth Alves
45d19167c9
fix a couple of missing-parent bugs
2015-12-16 10:09:46 -08:00
AlessandroSigna
08f7591787
Fix misspelling
2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-16 09:55:37 -08:00
samcake
b4b541178d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-16 09:42:06 -08:00
Seth Alves
b55596689f
Merge branch 'fix/fbx-texture' of github.com:zzmp/hifi into near-grab-via-parenting
2015-12-16 06:39:35 -08:00
samcake
1364329886
FIxing the compil bug by checking security of the call with assert and avoiding the compilation error
2015-12-15 22:07:06 -08:00
Zach Pomerantz
3280894e29
Load texture by convention with .obj
2015-12-15 19:30:15 -08:00
ericrius1
61bad36d5c
tweaks
2015-12-15 18:49:04 -08:00
Seth Alves
0003c607ea
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-15 18:46:21 -08:00
samcake
a60ef4fb5a
Finalize the names
2015-12-15 18:32:30 -08:00
samcake
c2feec16de
Cleaning the code
2015-12-15 18:24:16 -08:00
samcake
d2ebaef69e
Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template
2015-12-15 18:18:42 -08:00
Andrew Meadows
7baee8c391
use glm::clamp() instead of std::min() and max()
2015-12-15 18:18:08 -08:00
Andrew Meadows
c3823de353
setClampedTargetScale()-->setTargetScaleVerbose()
2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1
properly delete departing avatars
2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211
properly scale avatar collision shape
2015-12-15 18:18:08 -08:00
ericrius1
d9c93130e5
In a state where non uniform random vals are clear
2015-12-15 18:02:11 -08:00
Anthony J. Thibault
30480f126b
Improved idle to walk forward transition
...
Hooked up a transition animation from idle to walk in the animation json.
Also fixed a bug in the AnimBlendLinearMove which was preventing the interpolation
into idle from being correct.
2015-12-15 17:26:17 -08:00
Seth Alves
1c0231c416
quiet some debugging prints
2015-12-15 16:46:16 -08:00
Seth Alves
951db42146
only send queryAABox if something about the location changed
2015-12-15 16:17:49 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub
6420a43858
fix type
2015-12-15 15:35:17 -08:00
Seth Alves
0ac06bad5c
more AACube plumbing
2015-12-15 15:31:02 -08:00
Seth Alves
2b800d711f
queryAACube to and from scriptvalues
2015-12-15 15:18:43 -08:00
Seth Alves
b9f0a87a25
if a server can't get the queryAACube but received one from an interface, use the received one
2015-12-15 14:43:14 -08:00
Brad Hefta-Gaub
5a355bd22f
Merge pull request #6653 from hyperlogic/tony/model-entity-animation-fix
...
ModelEntityItem: fix for incorrect joint mapping
2015-12-15 14:29:06 -08:00
Brad Hefta-Gaub
7d43504c0c
Merge pull request #6615 from hyperlogic/tony/js-avatar-default-pose
...
Expose Avatar default pose to JavaScript
2015-12-15 14:27:53 -08:00
Seth Alves
0013d58365
include queryAACube when scripts make changes
2015-12-15 14:25:02 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
Anthony J. Thibault
ab85e2967a
AnimExpression: support for unary not.
2015-12-15 13:18:30 -08:00
Anthony J. Thibault
22756d168b
Changed grammar to support boolean and and or.
2015-12-15 10:35:35 -08:00
Anthony J. Thibault
2b0ed55077
Merge branch 'master' into tony/anim-expressions
2015-12-15 10:35:19 -08:00
ericrius1
dca83a054e
Changed additiveBlending to emitterShouldTrail
2015-12-15 10:30:57 -08:00
Seth Alves
a3631ea1d1
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-15 10:12:49 -08:00
ericrius1
c561a53f7c
Going to change additive blending to world position prop
2015-12-15 09:56:28 -08:00
samcake
2bbd5d86b8
cleaning indentation
2015-12-15 09:46:18 -08:00
samcake
e70ab472af
Merging with upstream master/graphics
2015-12-14 18:38:29 -08:00
samcake
84d1e3b123
Merged with upstream master
2015-12-14 18:30:24 -08:00
samcake
a50b14dfae
Merging with upstream graphics
2015-12-14 18:18:39 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
Anthony J. Thibault
617fda7832
ModelEntityItem: fix for incorrect joint mapping
...
This could happen when switching the animation url between fbx files
with different joint mappings. Only the first one would take effect.
This should fix the issue in the demo domain, with the contorted doll model.
2015-12-14 17:07:53 -08:00
samcake
ed2d45d0b6
HMD Mirror looks correct
2015-12-14 16:18:44 -08:00
Seth Alves
165c41d843
add a way to remember which entities couldn't be properly placed in octree due to missing parents
2015-12-14 14:19:19 -08:00
ericrius1
8d691f2132
light ball
2015-12-14 11:44:42 -08:00
Anthony J. Thibault
3f0cdb3c02
Merge branch 'master' into tony/js-avatar-default-pose
2015-12-14 11:19:24 -08:00
samcake
1597d3d466
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2015-12-14 10:25:22 -08:00
samcake
2aad26154e
THis should fix the mirror and the skybox issue
2015-12-14 10:24:51 -08:00
ericrius1
3d782f1307
fixed merge conflicts
2015-12-14 10:11:49 -08:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Andrew Meadows
0b7b9dcfda
Merge pull request #6640 from ZappoMan/menuGroups
...
first cut at adding advanced and developer menu groupings
2015-12-14 08:58:19 -08:00
Ken Cooke
67d6965f14
Revert "Fix the broken skybox and simplify a bit the vertex shader used"
...
This reverts commit 68134aafe5
2015-12-13 16:14:38 -08:00
