Nissim Hadar
cf7d6a2eab
Added correct use of legacy background combo.
2018-01-04 20:30:10 -08:00
David Rowe
5463f1ae6b
Merge branch 'master' into 21646
2018-01-05 16:58:58 +13:00
Nissim Hadar
c10d2a5461
Added correct use of legacy background combo.
2018-01-04 19:48:25 -08:00
Bruce Brown
a1c3ad360f
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-01-04 18:42:52 -08:00
Nissim Hadar
adbc4d0c39
Removed background mode from code (still in the protocol).
2018-01-04 18:23:25 -08:00
SamGondelman
a9d5dda976
always push default haze to current frame
2018-01-04 17:54:23 -08:00
David Back
7558b00467
better fix for model scale floor, remove abs
2018-01-04 17:49:39 -08:00
Anthony J. Thibault
51ab38f484
warning fix
2018-01-04 17:32:22 -08:00
David Back
307867a91f
adjust to for loop
2018-01-04 16:53:35 -08:00
Andrew Meadows
623a29b14a
add ownership infection for constraints
2018-01-04 16:48:06 -08:00
David Back
6b9658f8cf
merge
2018-01-04 16:41:58 -08:00
Anthony J. Thibault
fac0982c67
need to use sizeof(TransformType), not sizeof(mat4)
2018-01-04 16:37:12 -08:00
Anthony J. Thibault
b8c88fca3b
Dual Quaternion skinning optimization
...
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
2018-01-04 16:17:23 -08:00
Anthony J. Thibault
aacf2d489f
removed comments
2018-01-04 16:17:21 -08:00
Anthony J. Thibault
bcd813ac62
Optimizations and cleanup
2018-01-04 16:15:44 -08:00
Anthony J. Thibault
e86fd4f992
Removed SKIN_COMP define, re-enabled cauterization
2018-01-04 16:15:42 -08:00
Anthony J. Thibault
b69edceb4f
Fixed rotation polarity and weights are now 16 bit.
2018-01-04 16:15:41 -08:00
Anthony J. Thibault
5bb0b06061
WIP: Dual Quaternion compensation for spinning the right way.
2018-01-04 16:15:39 -08:00
Anthony J. Thibault
8bdddf7211
Full Dual Quaternion support
2018-01-04 16:15:38 -08:00
Anthony J. Thibault
3896b31a72
Line numbers for shader when there are compilation errors
2018-01-04 16:13:46 -08:00
Anthony J. Thibault
18113d824c
Created Model::TransformComponents class
2018-01-04 16:13:44 -08:00
Anthony J. Thibault
515d13a4c1
WIP checkpoint
2018-01-04 16:09:08 -08:00
Anthony J. Thibault
23affb570b
WIP checkpoint, root transforms for shapes and non-animated fbx files are working.
2018-01-04 16:09:06 -08:00
Anthony J. Thibault
565875e823
WIP first attempt at dual quat skinning
2018-01-04 16:09:02 -08:00
Nissim Hadar
e797a77262
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# interface/resources/qml/js/Utils.jsc
2018-01-04 15:58:08 -08:00
Andrew Meadows
01fd6dc8f6
add comments to make code more clear
2018-01-04 15:53:03 -08:00
Andrew Meadows
a51d83c6e4
rollback automatic priority promotion to RECRUIT
2018-01-04 15:53:03 -08:00
Andrew Meadows
6638b1deae
fix bug causing sim ownership thrash
2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f
more correct volunteer ownership priority promotion
2018-01-04 15:53:03 -08:00
SamGondelman
eb0d09360a
Merge remote-tracking branch 'upstream/master' into overlayFix
2018-01-04 15:47:20 -08:00
Anthony J. Thibault
eff77b995e
Merge branch 'master' into feature/exp-smoothing-input-filter
2018-01-04 15:24:33 -08:00
Andrew Meadows
fbe2dd8a41
remove unnecessary 'virtual' keyword
2018-01-04 14:46:16 -08:00
Andrew Meadows
13538006ec
fix bug preventing sim owenrship on local domain
2018-01-04 14:46:16 -08:00
Dante Ruiz
b526842a46
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-04 14:23:10 -08:00
Anthony J. Thibault
f0985a8a01
Code review feedback
...
clamp _rotationConstant and _translationConstante between 0 and 1.
re-organized apply structure, to prevent transforming invalid values.
2018-01-04 14:21:53 -08:00
Dante Ruiz
597cb6ae9e
remove unused variables
2018-01-04 13:57:15 -08:00
Anthony J. Thibault
9beb3ac5b6
Merge branch 'master' into feature/exp-smoothing-input-filter
2018-01-04 13:45:27 -08:00
Dante Ruiz
a204685566
don't do unnecessary work
2018-01-04 13:44:04 -08:00
Atlante45
294a7ca3c6
Make sure the protocol signature still changes
2018-01-04 13:15:01 -08:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
Atlante45
d4a239731c
Add Unused packet type back for ICE servers
2018-01-04 13:07:02 -08:00
Nissim Hadar
8bd2985f1f
Simplified code.
2018-01-04 13:06:28 -08:00
RebeccaStankus
3e8063f80a
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 12:48:09 -08:00
Dante Ruiz
527d00871a
making relaying translation work
2018-01-04 11:57:51 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener
...
Remove legacy jurisdiction code
2018-01-04 11:52:38 -08:00
Nissim Hadar
e8770ec204
TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light).
2018-01-04 11:30:02 -08:00
RebeccaStankus
f52a6d8eae
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 10:49:32 -08:00
Nissim Hadar
5b7ef9a3d3
Minor cleanup.
2018-01-04 09:13:58 -08:00
Olivier Prat
9f04e8597f
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
2018-01-04 08:47:15 +01:00
David Rowe
7236ac17e2
Merge branch 'master' into 21661
2018-01-04 15:21:00 +13:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate
...
Tablet home paginate
2018-01-03 18:12:32 -08:00
RebeccaStankus
9471dbeba9
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-03 11:39:38 -08:00
RebeccaStankus
89138c9bd8
More filter choices, search will clear
2018-01-03 11:35:46 -08:00
Sam Gateau
72503ce8ba
Merge pull request #12064 from SamGondelman/overlayFix
...
Fix model overlays not disappearing on visibility change
2018-01-03 11:08:24 -08:00
Dante Ruiz
674e8e1ac2
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-03 08:47:40 -08:00
Dante Ruiz
e1a7f9bfb8
working on imporving soft-entities
2018-01-03 08:47:11 -08:00
David Rowe
6e43497e14
Merge tag 'RELEASE-7602' into 21661
...
Jenkins Git plugin tagging with RELEASE-7602
2018-01-03 16:46:10 +13:00
RebeccaStankus
dd48972e44
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-02 14:06:41 -08:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable
...
Stable merge back into master
2018-01-02 13:24:03 -08:00
vladest
a84e585679
Merge
2018-01-02 21:49:00 +01:00
Bruce Brown
dfe31bc791
Add files via upload
2018-01-02 11:52:12 -08:00
Nissim Hadar
dad3a0d340
Fixed skybox inheritance.
2018-01-02 09:08:05 -08:00
RebeccaStankus
efdba3b6e6
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2
2018-01-02 08:59:42 -08:00
Dante Ruiz
be9bf31843
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-02 08:04:26 -08:00
Nissim Hadar
0764e80996
Corrected behaviour of skybox modes.
2017-12-30 18:19:42 -08:00
nissim.hadar
b56c7535d2
Added legacy functionality (for zones that used Background "skybox")
2017-12-30 12:25:58 -08:00
druiz17
0ebbb76b49
fixed property over written issue and start relaying joints
2017-12-29 16:12:40 -08:00
Bruce Brown
1d79a21655
Add files via upload
2017-12-29 15:51:11 -08:00
Nissim Hadar
7260b4ff7b
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/entities/src/EntityPropertyFlags.h
2017-12-29 15:16:14 -08:00
Nissim Hadar
87e896ab20
Zone inheritance ready for testing.
2017-12-29 15:13:46 -08:00
Atlante45
aec5ab5921
CR
2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Bruce Brown
8d602e3669
Add files via upload
2017-12-29 12:43:59 -08:00
Bruce Brown
6d0cac83c4
Add files via upload
2017-12-29 12:28:31 -08:00
Bruce Brown
0eacac60c1
Add files via upload
...
add more mmidi message types to be exposed to javascript
2017-12-29 11:05:37 -08:00
Bruce Brown
31238e2d66
Update Midi.cpp
2017-12-29 10:49:51 -08:00
Bruce Brown
b3ac4de1e6
Update Midi.h
2017-12-29 10:45:58 -08:00
Bruce Brown
fa10578293
Add files via upload
2017-12-29 10:40:59 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3
...
avatar-entities which are children of an avatar will scale with the avatar
2017-12-29 09:12:17 -08:00
Nissim Hadar
85a81d6b5b
WIP - skybox inheritance
2017-12-28 18:23:49 -08:00
Dante Ruiz
30bbe6e41b
added relayParentJoints property
2017-12-28 15:43:59 -08:00
Nissim Hadar
64644fc980
WIP - skybox inheritance
2017-12-28 14:31:59 -08:00
David Back
24981a560f
fix scaling threshold
2017-12-28 11:56:39 -08:00
Nissim Hadar
03cf7710d0
Ambient light inheritance
2017-12-28 09:34:55 -08:00
vladest
35fee739c5
Use buttons index
2017-12-27 23:50:15 +01:00
Olivier Prat
dcfeed9b2c
Switched to using getFresnelF0 function in overlay3D model shaders
2017-12-27 15:52:17 +01:00
RebeccaStankus
296f0a323a
saving for Wednesday
2017-12-26 15:56:05 -08:00
Nissim Hadar
7f5897e90b
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-26 11:35:59 -08:00
Nissim Hadar
4ffd896ced
WIP - adding AmbientLightPropertyGroup
2017-12-26 11:15:33 -08:00
David Back
904015fc13
Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes
2017-12-26 10:20:11 -08:00
Nissim Hadar
1fa8f7c55b
WIP - adding AmbientLightPropertyGroup
2017-12-26 09:15:45 -08:00
Nissim Hadar
0b73e7db3f
WIP - adding AmbientLightPropertyGroup
2017-12-26 09:15:13 -08:00
Olivier Prat
93ba9ad3b1
Adjusted roughness aspect on specular reflection of sky box to more closely match Unity's PBR look especially on high roughness values
2017-12-26 15:43:23 +01:00
Olivier Prat
d6b70d459f
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
2017-12-26 14:15:24 +01:00
vladest
ec591c4da0
Merge branch 'master' into tablet_home_paginate
2017-12-25 20:15:26 +01:00
Brad Hefta-Gaub
3d02955c5d
Merge pull request #12029 from SamGondelman/webOverlay
...
Fix >20 web entities crash
2017-12-24 17:10:39 -08:00
Nissim Hadar
affc5d1b86
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-24 15:27:32 -08:00
vladest
9fa78bae0d
Merge branch 'master' into tablet_home_paginate
2017-12-23 17:46:51 +01:00
vladest
a497047666
Refactored using new GridView approach
2017-12-23 17:44:26 +01:00
Sam Gondelman
2898fa557e
typo
2017-12-23 00:53:11 -08:00
David Back
01fcd453b8
Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes
2017-12-22 16:41:17 -08:00
Nissim Hadar
3f82e9147b
Change keylight/ambient mode default from "enabled" to "inherit"
2017-12-22 16:30:19 -08:00
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back
...
Merge stable back into master after RC61.1
2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
2017-12-22 15:48:04 -08:00
Nissim Hadar
8ee5f642a9
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-12-22 15:41:59 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
SamGondelman
c38ef77b26
fix model overlays visibility change
2017-12-22 15:04:06 -08:00
Dante Ruiz
86be684d7a
delete code
2017-12-22 14:58:32 -08:00
Dante Ruiz
e316f71b31
fix grabbing
2017-12-22 14:53:48 -08:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3
...
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-22 14:31:03 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor
...
Removed glColor reset hack in MeshPartPayload
2017-12-22 14:25:51 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3
...
Remove _model from ModelMeshPartPayload
2017-12-22 13:50:06 -08:00
SamGondelman
5018edcfe0
reduce calls to getVisible
2017-12-22 12:59:06 -08:00
Stephen Birarda
d299b9a56c
Merge pull request #12024 from birarda/bug/entity-sequence-skip
...
handle sequence number from reliably sent adds in OctreeEditPacketSender
2017-12-22 12:30:27 -08:00
Howard Stearns
5767f5937e
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1
...
Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-22 09:56:22 -08:00
Seth Alves
533aa3d918
code review
2017-12-22 09:07:16 -08:00
Nissim Hadar
e102b8c087
Fixed Ubuntu warning.
2017-12-22 08:35:09 -08:00
Nissim Hadar
2eb74647f0
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-22 08:05:46 -08:00
Nissim Hadar
502cac2ac7
Keylight inherit/off/on working
2017-12-22 08:05:12 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
Olivier Prat
1d5f65b082
Updated Mesh to support map and forEach operations on colors in RGBA8 format and normals in XYZ10W2 format
2017-12-22 15:16:39 +01:00
Olivier Prat
29485b65e5
Fixed potential crash when getting mesh from voxel item
2017-12-22 14:35:19 +01:00
Olivier Prat
752952507d
Fixed memory leak in ModelScriptingInterface::appendMeshes and wrong normal transformation in ModelScriptingInterface
2017-12-22 14:18:02 +01:00
Olivier Prat
a6d5e33eca
Fixed levels between specular, diffuse, ambient specular, ambiend diffuse and background sky
2017-12-22 10:39:45 +01:00
Nissim Hadar
e974cac177
Keylight inheritance mode works.
2017-12-21 19:19:55 -08:00
Stephen Birarda
95c7f876bf
manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne
2017-12-21 18:52:01 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1
...
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-21 17:46:32 -08:00
David Back
f800a6d6fc
scale change
2017-12-21 17:00:27 -08:00
Zach Fox
07a1cf434a
IT'S WORKING!!!
2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Zach Fox
a2f2c23337
Change three lines of code. Fix one thing. Break another.
2017-12-21 16:32:15 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
Stephen Birarda
05b45f2e7e
adjust example and add clarifying comments to PrioritySortUtil
2017-12-21 15:40:08 -08:00
Stephen Birarda
7bf0cc2f63
cleanup other ref returns of shared pointers from sortables
2017-12-21 15:39:14 -08:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
SamGondelman
69c1c65eb8
get rid of _model completely
2017-12-21 14:08:21 -08:00
Zach Fox
e963673409
Progress?
2017-12-21 14:08:18 -08:00
Stephen Birarda
31e9f26772
fix use after free of pending message
2017-12-21 11:35:11 -08:00
luiscuenca
d93828f2f0
Fix an improve currentAPI.js
2017-12-21 11:50:02 -07:00
David Back
fd297f1c03
convert negative relative indices to absolute indices
2017-12-21 10:36:41 -08:00
vladest
2bca0939b3
Preliminary proxy model
2017-12-21 19:32:13 +01:00
Olivier Prat
cb4d78ce5c
Fixed bug in specular ambient
2017-12-21 18:47:18 +01:00
Olivier Prat
053bd2ba98
Created SurfaceData structure to centralize computation of frequently used shader temporary values
2017-12-21 17:41:36 +01:00
Brad Davis
26291e0a75
PR feedback
2017-12-21 07:29:29 -08:00
Olivier Prat
5c476dc967
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
2017-12-21 14:33:00 +01:00
Olivier Prat
72ef716b13
Fixed warnings on Mac and Ubuntu
2017-12-21 09:52:06 +01:00
vladest
d6e1a3ea41
Merge conflicts solved
2017-12-21 09:02:04 +01:00
Olivier Prat
0d34569b1a
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
2017-12-21 08:22:35 +01:00
Nissim Hadar
58c6f8e9c4
Radio buttons now work correctly.
2017-12-20 19:17:18 -08:00
Andrew Meadows
5c84c5f845
measure average time of 'present'
2017-12-20 17:41:08 -08:00
Melissa Brown
fddb192af8
Merge pull request #11961 from humbletim/add-midi-control-change
...
forward MIDI_CONTROL_CHANGE events
2017-12-20 17:11:08 -08:00
Zach Fox
b30d3fcc12
Change three lines of code. Fix one thing. Break another.
2017-12-20 15:40:10 -08:00
SamGondelman
2ba3e337db
cleanup
2017-12-20 14:18:01 -08:00
vladest
79f9b54f6a
Store button list in the resources section of fake item instead of C++ space
2017-12-20 22:59:07 +01:00
SamGondelman
7a7b1f7089
fix web entity crash
2017-12-20 13:58:58 -08:00
Nissim Hadar
d4b34b71ad
First version with packet update.
2017-12-20 13:12:07 -08:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
Olivier Prat
e8b88cd3f8
Specular lighting comming from ambient sphere map is now multiplied by PI to be at the same level as normal light specular
2017-12-20 11:14:07 +01:00
Olivier Prat
0e666ce671
Metallic value is now continuous and materials can be linearly blended between pure dielectric and pure metal
2017-12-20 09:34:53 +01:00
Zach Fox
297a3df63c
Merge pull request #11815 from zfox23/commerce_QmlWhitelist
...
QML Whitelisting + Commerce Integration
2017-12-19 18:07:14 -08:00
Sam Gondelman
5f5bf94f2a
Merge pull request #12008 from AndrewMeadows/fix-animation-crash
...
fix interface crash for bad QVector index in animation loop
2017-12-19 17:59:47 -08:00
NissimHadar
88ade87c71
Merge pull request #11774 from NissimHadar/hazeOnTransparent
...
Haze on transparent
2017-12-19 17:20:14 -08:00
Stephen Birarda
1a6546999a
track reliably sent adds in sent packet history from OEPS
2017-12-19 16:00:55 -08:00
David Rowe
e6c40f4aae
Window JSDoc
2017-12-20 10:16:09 +13:00
vladest
012f65a87f
Merge branch 'master' into tablet_home_paginate
2017-12-19 21:40:47 +01:00
SamGondelman
9aed825328
Merge remote-tracking branch 'upstream/master' into burp2
2017-12-19 11:39:21 -08:00
Nissim Hadar
2c6868b03e
Pass keylight direction as parameter to the shader.
2017-12-19 11:12:27 -08:00
John Conklin II
09e9707404
Merge pull request #12018 from sethalves/pr-12015-for-rc-61
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 10:53:01 -08:00
howard-stearns
16a58ddf5a
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
2017-12-19 10:48:34 -08:00
Nissim Hadar
de7edc68d4
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-19 10:47:16 -08:00
Andrew Meadows
bad2c1df76
proper modulus of animation frame
2017-12-19 10:40:17 -08:00
Andrew Meadows
559cb33563
remove incorrect comment
2017-12-19 10:40:17 -08:00
Andrew Meadows
661a63bd0c
fix crash for bad QVector index
2017-12-19 10:40:17 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
Olivier Prat
9f6c1946fb
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
2017-12-19 18:44:18 +01:00
Howard Stearns
f8cef6631b
Merge pull request #11995 from birarda/bug/fix-connection-reset
...
make udt::Connection live as long as node connection
2017-12-19 09:43:54 -08:00
Olivier Prat
6968753783
Added G factor in PBR shading and removed evalPBRShadingGloss
2017-12-19 17:40:34 +01:00
Seth Alves
63ac426bf2
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 08:13:44 -08:00
Nissim Hadar
73f16b1b2a
Merge branch 'hazeOnTransparent' of https://github.com/NissimHadar/hifi
2017-12-19 07:59:12 -08:00
Brad Hefta-Gaub
04fa4d2999
Merge pull request #12016 from SamGondelman/versionFix
...
Bump protocol version
2017-12-19 07:30:55 -08:00
John Conklin II
d4e44fec56
Merge pull request #12015 from sethalves/fix-av-collision-after-grab
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 07:01:37 -08:00
Olivier Prat
bd666406f4
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
2017-12-19 14:17:17 +01:00
SamGondelman
90d0e9dc32
bump protocol version
2017-12-18 18:35:15 -08:00
Sam Gateau
8f6929fe53
Merge pull request #12011 from SamGondelman/skybox
...
Fix equirectangular skybox loading
2017-12-19 08:32:22 +07:00
Seth Alves
ca45c4e8da
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-18 17:30:56 -08:00
Thijs Wenker
3a55fcfaf5
Merge pull request #12014 from thoys/feat/list-assignment-types
...
list assignment types in assignment-client help
2017-12-18 16:55:57 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
SamGondelman
ee3c47d5ec
fix equirectangular skybox loading
2017-12-18 13:21:12 -08:00
Daniela Fontes
7ca4a21a91
Fix entity property href not being able to reset (empty) once it was set with
...
the correct input for the first time.
2017-12-18 21:00:29 +00:00
SamGondelman
b0ecaa10d4
fix equirectangular skybox loading
2017-12-18 12:38:25 -08:00
Zach Fox
e075cd79fb
Add Passphrase Auth Status data tracking
2017-12-18 11:51:12 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Olivier Prat
24cc19aeaa
Partial fix of colors per vertex of FBX models exported by Blender 2.79
2017-12-18 14:37:50 +01:00
Olivier Prat
116756c976
Parallel optimizations of setBlendedVertices
2017-12-18 11:22:43 +01:00
Sam Gondelman
c39da5094b
weak_ptr _cacheFile
2017-12-17 22:31:09 -08:00
Sam Gondelman
a39eea5a34
cr and cleanup
2017-12-17 22:30:57 -08:00
SamGondelman
9bdcf34c91
clear all _cacheFiles on recycle
2017-12-17 22:30:47 -08:00
SamGondelman
90b97aba59
remove extra recycle
2017-12-17 22:30:31 -08:00
SamGondelman
355ceddcc6
keep _cacheFile alive
2017-12-17 22:30:05 -08:00
Sam Gondelman
6814dfcbfc
weak_ptr _cacheFile
2017-12-17 22:09:20 -08:00
Sam Gondelman
6990dda48d
cr and cleanup
2017-12-17 16:11:55 -08:00
Brad Davis
c6bc6f6ef2
Merge remote-tracking branch 'upstream/master' into android_nov
2017-12-16 16:20:16 -08:00
vladest
62a762b879
Merge branch 'master' into tablet_home_paginate
2017-12-16 20:32:21 +01:00
vladest
cdb9d72387
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
2017-12-16 20:27:19 +01:00
Nissim Hadar
dcce5964dd
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-16 00:23:08 -08:00
Nissim Hadar
d69297c02e
Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders.
2017-12-16 00:22:26 -08:00
Brad Hefta-Gaub
637e24504c
Merge pull request #11951 from dback2/polymaterialurl
...
Allow space characters in material library name
2017-12-15 19:42:25 -08:00
SamGondelman
3ae52c0e0e
clear all _cacheFiles on recycle
2017-12-15 17:52:48 -08:00
Sam Gondelman
dab4b12a72
Merge pull request #12001 from hyperlogic/bug-fix/anim-skeleton-crash
...
Fix for crash in AnimSkeleton::getNumJoints()
2017-12-15 17:40:42 -08:00
howard-stearns
813a94a79e
function => macro to conditionally take debug arg
2017-12-15 17:12:44 -08:00
howard-stearns
d730b7b87b
consistent goToUser behavior in PAL, and be able to go to flying user.
2017-12-15 17:00:54 -08:00
Anthony J. Thibault
e2df9e29e2
Fix for crash in AnimSkeleton::getNumJoints()
...
When initAnimGraph is called it asynchronously loads the Animation graph in the background.
If the model url is changed, or the Model is deleted in between the initial load and it's completion,
It's possible to access a bad Rig::_animSkeleton pointer.
The fix is to hold onto the _animSkeleton pointer via a weak ref.
2017-12-15 16:46:27 -08:00
SamGondelman
3477aa57a8
remove extra recycle
2017-12-15 16:36:07 -08:00
SamGondelman
52c4aef721
keep _cacheFile alive
2017-12-15 16:23:53 -08:00
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock
...
Fix getActiveDevice deadlocks on Linux
2017-12-15 15:41:41 -08:00
Brad Hefta-Gaub
5087893097
Merge pull request #11804 from amantley/character_entity_fixes
...
Fixed Entity Animation Property not applying to FBXs
2017-12-15 15:31:11 -08:00
Brad Hefta-Gaub
4ceedf7731
Merge pull request #11986 from kencooke/audio-wavloader-fix
...
Unsupported WAV files should always be logged and not played
2017-12-15 15:24:24 -08:00
Olivier Prat
264f41472d
Added tangents to blendshape for possible break of bump mapping when doing blend shape animations
2017-12-15 12:06:07 +01:00
Olivier Prat
2a325d45e0
Mesh color attributes are now stored as RGBA8
2017-12-15 09:21:36 +01:00
Nissim Hadar
82b94eaacd
Reduced size of parameters in (shader) function call.
2017-12-14 18:50:41 -08:00
Stephen Birarda
a5c951a666
remove tracking of last receiver response from SendQueue
2017-12-14 16:41:20 -08:00
Stephen Birarda
75e56b5daa
make the _lastMessageNumber in Connection default to 0
2017-12-14 16:41:20 -08:00
Stephen Birarda
8a2c31d342
only de-activate the SendQueue when it has nothing to send
2017-12-14 16:41:20 -08:00
Stephen Birarda
cf28fdf188
fix message erase in conn, SendQueue ctor order
2017-12-14 16:41:20 -08:00
Atlante45
34c1c27455
Keep track of message numbers
2017-12-14 16:41:20 -08:00
Atlante45
702d2c34a5
Reset ACK in ctor
2017-12-14 16:41:20 -08:00
Atlante45
b2beeae6b1
Keep connection alive as long as the node is connected
2017-12-14 16:41:20 -08:00
Stephen Birarda
6be7a3662c
Merge pull request #11992 from birarda/bug/fix-connection-reset
...
Make udt::Connection live as long as node connection
2017-12-14 16:34:51 -08:00
Nissim Hadar
76af59e331
Merge branch 'master' into hazeOnTransparent
2017-12-14 16:31:13 -08:00
Nissim Hadar
c352d5fc23
Passed light direction instead of light object into computeHazeColorKeyLightAttenuation.
2017-12-14 16:23:14 -08:00
Nissim Hadar
026b19d770
Set 4th position component from 0.0 to 1.0
2017-12-14 16:17:50 -08:00
Nissim Hadar
05e47ae668
Removed unneeded 'mix'.
...
Defined EPSILON.
2017-12-14 16:14:08 -08:00
Nissim Hadar
d5d4c22a3d
Removed dual calls to getViewInverse().
2017-12-14 15:55:31 -08:00
Nissim Hadar
00a2013b60
Added missing space before {
2017-12-14 15:38:07 -08:00
Stephen Birarda
da56d47307
make the _lastMessageNumber in Connection default to 0
2017-12-14 15:30:51 -08:00
Stephen Birarda
8b5e8f8d08
only de-activate the SendQueue when it has nothing to send
2017-12-14 15:30:25 -08:00
Nissim Hadar
1d4801adf5
Fix for Haze crash (bug 10537)
2017-12-14 13:48:31 -08:00
Zach Fox
504949cd32
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning
2017-12-14 12:08:00 -08:00
Stephen Birarda
7f948586dd
fix message erase in conn, SendQueue ctor order
2017-12-14 12:07:32 -08:00
NissimHadar
df34103895
Merge pull request #11980 from NissimHadar/crashFix10537
...
Protect against use of null HazePointer.
2017-12-14 11:45:49 -08:00
Nissim Hadar
409eade006
Merge branch 'master' into hazeOnTransparent
2017-12-14 11:41:53 -08:00
Ken Cooke
b6a88bbdda
Invalid WAV files should always be logged and not played
2017-12-14 10:20:46 -08:00
Zach Fox
af346f2ced
Protocol change
2017-12-14 10:09:10 -08:00
Olivier Prat
4abc428518
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
2017-12-14 17:57:47 +01:00
Olivier Prat
f38e473218
Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats
2017-12-14 17:57:34 +01:00
Olivier Prat
deb0b6b06f
Working interleaved normals and tangents. I'm still wondering why it works with blendshapes though...
2017-12-14 16:12:44 +01:00
