Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 19:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76087 commits 74 branches 59 tags 1.2 GiB
Commit graph

31301 commits

Author SHA1 Message Date
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4 migrating platform plugin 2019-01-16 17:05:50 -08:00
Wayne Chen
a905310a58 more staging 2019-01-16 17:05:49 -08:00
Wayne Chen
a24ebe2718 oculus functions live in the display plugin; display plugins update 2019-01-16 17:05:49 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6 staging 2019-01-16 17:05:48 -08:00
Wayne Chen
ebb9cd7de6 adding new plugin 2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
SamGondelman
3835796419 deprecate the new property so that people hopefully don't use it 2019-01-16 14:01:05 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
Seth Alves
1104e56bc3 fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level 2019-01-16 13:23:27 -08:00
Simon Walton
024cb70fce Change member-initializer order to fix warnings 2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d Pass udt::Socket pointer in initializer-list for udt::Connection 2019-01-16 12:08:02 -08:00
Ken Cooke
328809f008 More robust approximation of distance attenuation at extreme settings. 
Fixes artifacts that occur when attenuation zone coef = 1.0 and distance > 32m.
 2019-01-16 11:10:38 -08:00
Stephen Birarda
0a9ac72e7b
Merge pull request #14720 from birarda/add-comments-to-atv 
pepper AssociatedTraitValues with some needed comments
 2019-01-16 10:59:08 -08:00
birarda
a63c2b3e29 pepper AssociatedTraitValues with some needed comments 2019-01-16 10:15:04 -08:00
luiscuenca
67cc5bd7f2 Fix warnings and wrong shapes position for myAvatar 2019-01-16 10:52:34 -07:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
Anthony Thibault
104084d811 Avatar Mixer Protocol: Normalize translation before compression 2019-01-15 18:56:09 -08:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04 
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
 2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
SamGondelman
1d2270e9c7 web entity fixes 2019-01-15 16:51:36 -08:00
Seth Alves
c4fc884bce ignore position edits from server when grabs are in effect 2019-01-15 16:35:20 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge 
log purge
 2019-01-15 16:19:03 -08:00
Seth Alves
b1c34eb9ec update queryAACube during grab rather than only when grab is released 2019-01-15 16:01:44 -08:00
Clement
8480624797 Limit upstream data to avatar mixer 2019-01-15 14:18:53 -08:00
Seth Alves
174c79d66d use new-style far-grabbing code for mouse grabs 2019-01-15 13:43:51 -08:00
Roxanne Skelly
6317ceb9b3 Case20277 - Ignoring user causes loading orb to appear at /0,0,0 
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
 2019-01-15 13:34:29 -08:00
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large 
Log a warning if an entity's property is too large
 2019-01-15 12:00:04 -08:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
sabrina-shanman
df17614fc3 Actually, don't support 3d vectors for Maya uv scale/offset 2019-01-15 11:16:22 -08:00
sabrina-shanman
f02d6433e3 Be more descriptive about Maya uv scale/translation property, and better guess for 3d vector case 2019-01-15 11:09:16 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
Shannon Romano
0089b91eea
Merge pull request #14609 from sethalves/fb-20280 
fix a couple shutdown crashes and a class of asan warning
 2019-01-15 10:59:08 -08:00
Shannon Romano
547f167539
Merge pull request #14654 from kencooke/audio-injector-stereo-distattn-bugfix 
Fix the distance attenuation of stereo local injectors
 2019-01-15 10:54:54 -08:00
sabrina-shanman
c875492d50 Be more efficient with MaterialParam in FBXSerializer::getTexture 2019-01-15 10:29:12 -08:00
SamGondelman
9803043512 web entity fixes 2019-01-15 09:51:55 -08:00
Andrew Meadows
4771fa5f27 fix zones using FBX models with non-trivial mesh.modelTransform 2019-01-15 09:17:48 -08:00
Dante Ruiz
4ab7308669 addressing code review requests 2019-01-14 14:04:01 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -08:00
sabrina-shanman
5173577a92 Fix issues with uv scale checking 2019-01-14 10:11:30 -08:00
Brad Hefta-Gaub
a115af6353
Merge pull request #14674 from kencooke/audio-asan-warnings3 
Fix ASAN warning due to mixed signed/unsigned arithmetic
 2019-01-14 09:32:22 -08:00
SamGondelman
6fd34bf1f0 setup qml surface contexts 2019-01-14 09:26:57 -08:00
sabrina-shanman
00a9e9e92f Add support for Maya material uv scale/translation 2019-01-11 17:14:10 -08:00
sabrina-shanman
5b207775e7 Remove redundant TextureParam transform variables 2019-01-11 17:12:09 -08:00
Seth Alves
1ef047a329 revert unneeded change to LimitedNodeList 2019-01-11 16:49:09 -08:00
Dante Ruiz
8252481ce7 Delete domain entities only 2019-01-11 16:00:10 -08:00
Seth Alves
b71f4e0204 remove commented-out code 2019-01-11 15:53:49 -08:00
Seth Alves
6ca9ab6fba avoid shutdown crash 2019-01-11 15:53:49 -08:00
Seth Alves
ecb34450bd quiet uneeded logging 2019-01-11 15:53:49 -08:00
Seth Alves
114bcc003a quiet build warnings 2019-01-11 15:53:49 -08:00
Seth Alves
36040597ba rename variable for consistency 2019-01-11 15:53:49 -08:00
Seth Alves
6589db628a fix a couple shutdown crashes and a class of asan warning 2019-01-11 15:53:49 -08:00
Seth Alves
6cd5770505
Merge pull request #14690 from sethalves/plugin-versioning 
Plugin versioning
 2019-01-11 15:20:05 -08:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities 
case 20020: faster avatar entities
 2019-01-11 14:13:05 -08:00
Howard Stearns
62ed84aa19 more log purge 2019-01-11 12:34:44 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
Andrew Meadows
bc19689910 remove unnecessary culling of properties 2019-01-10 17:32:52 -08:00
Seth Alves
d31cdd3779 review 2019-01-10 15:35:40 -08:00
Seth Alves
e941dbb4a9 review 2019-01-10 15:33:34 -08:00
Seth Alves
fd8702d5a6 use const references when querying plugin metadata 2019-01-10 15:20:53 -08:00
Seth Alves
6a88941166 put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version. 2019-01-10 15:07:06 -08:00
Andrew Meadows
0098dedcbb don't update server for AvatarEntity queryAACube 2019-01-09 18:25:12 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap 
cap the number of considered message channels in PacketQueue
 2019-01-09 17:43:36 -08:00
Andrew Meadows
9ea6968e35 fix bug where attached AvatarEntities do not update in timely fashion 2019-01-09 17:40:18 -08:00
Andrew Meadows
b9667a0679 fix merge conflict after rebase 2019-01-09 17:28:00 -08:00
Andrew Meadows
9d6acf007a fix build after rebase 2019-01-09 17:28:00 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
63ed0a3a98 move blob conversion recipes to EntityItemProperties 2019-01-09 17:28:00 -08:00
Andrew Meadows
855497e604 MyAvatar.updateAvatarEntity(id, data) works in theory 2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0 MyAvatar.setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
329ec84104 MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings 2019-01-09 17:28:00 -08:00
Andrew Meadows
4dd6e23fef fix typo in comment 2019-01-09 17:28:00 -08:00
Andrew Meadows
cbcd70aee6 namechanges and comments to help clarify necessary fixes 2019-01-09 17:28:00 -08:00
Andrew Meadows
9f404ef006 Agent bots can manipulate AvatarEntities again 2019-01-09 17:28:00 -08:00
Andrew Meadows
9b253690db bump packet version number 2019-01-09 17:28:00 -08:00
Andrew Meadows
d622635a71 fix wording in comment to reflect new 'HostType' parameter 2019-01-09 17:27:14 -08:00
Andrew Meadows
320ba9177c remove cruft 2019-01-09 17:27:14 -08:00
Andrew Meadows
c4115bece3 remove unused ScriptEngine instance 2019-01-09 17:27:14 -08:00
Andrew Meadows
09f3b8f485 add bit of sanity checking for incomming AvatarEntities data 2019-01-09 17:27:14 -08:00
Andrew Meadows
0083c77280 add EntityTypes::extractEntityTypeAndID(), remove one spaghetti 2019-01-09 17:27:14 -08:00
Andrew Meadows
1815d71158 fix data corruption bug 2019-01-09 17:27:14 -08:00
Andrew Meadows
ce660bee9b fix compile errors after rebase 2019-01-09 17:27:14 -08:00
Andrew Meadows
61b8d005b5 scripts can edit AvatarEntities again 2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b cleanup 2019-01-09 17:27:14 -08:00
Andrew Meadows
fe2ee68b79 add EntityItemProperties::copyFromJSONString() 2019-01-09 17:27:14 -08:00
Andrew Meadows
e37b5b52f0 correctly load AvatarEntities from settings redux 2019-01-09 17:27:14 -08:00
Andrew Meadows
026c6301a6 correctly load AvatarEntities from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
263d6cb7ad only change parentID=AVATAR_SELF_ID for non-clientOnly case 2019-01-09 17:27:14 -08:00
Andrew Meadows
e4cc3fa976 minor cleanup 2019-01-09 17:27:14 -08:00
Andrew Meadows
01fc442695 save AvatarEntities settings as strings 2019-01-09 17:27:14 -08:00
Andrew Meadows
d1927340f5 remove redundant addToNeedsParentFixupList() 2019-01-09 17:27:14 -08:00
Andrew Meadows
d3fea94540 send AvatarEntities via raw data packet 2019-01-09 17:27:14 -08:00
sabrina-shanman
f349e48a25 Fix support for FBX texture scaling using ModelUVTranslation/ModelUVScaling 2019-01-09 17:14:03 -08:00
luiscuenca
95fca826a5 Add fit AABox for avatar and implement multisphere on shapeManager 2019-01-09 17:49:19 -07:00
Simon Walton
1245abbb53
Merge branch 'master' into avatar-mixer-entities-stats 2019-01-09 16:07:26 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377 
Trait-level flow control
 2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout 
Set minimum timeout for retransmits within reliable network service
 2019-01-09 15:35:40 -08:00
John Conklin II
e4abb66199
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates 
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
 2019-01-09 14:55:23 -08:00
birarda
3c6b7e3bd0 add a cap to cycled message channels in SendQueue 2019-01-09 13:06:30 -08:00
SamGondelman
45ec7fe3e1 working on ignorePickIntersection and web entities 2019-01-09 12:03:35 -08:00
Ken Cooke
b854840f43 Fix ASAN warnings due to mixed signed/unsigned arithmetic 2019-01-09 10:03:35 -08:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
Simon Walton
73d688610f Track stats for total AvatarData bytes, traits bytes and identity bytes 2019-01-08 18:33:00 -08:00
luiscuenca
39dc25ea92 Merge branch 'master' into multiSphereAvatar04 
# Conflicts:
#	interface/src/avatar/OtherAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
 2019-01-08 15:41:33 -07:00
SamGondelman
292071febb fix model groupCulled 2019-01-08 14:34:19 -08:00
SamGondelman
5dd59dd9e9 correct lighting of layered shapes 2019-01-08 14:02:57 -08:00
luiscuenca
f19201fc92 Other avatar detailed collisions on motion state 2019-01-08 14:09:13 -07:00
SamGondelman
10068cc42c merge with master 2019-01-08 12:14:32 -08:00
SamGondelman
928ea55d95 fix light crash? 2019-01-08 11:47:28 -08:00
Roxanne Skelly
910c359443 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-08 10:50:45 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
Jamil Akram
4c6b14bf72
Merge pull request #14642 from dback2/propertyRangeAudit 
Entity property range/step audit
 2019-01-08 09:42:59 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones 
Case 15518: shaped zones
 2019-01-08 09:06:45 -08:00
David Back
0791443c5c Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 18:29:36 -08:00
Roxanne Skelly
d54fec4476 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 18:17:40 -08:00
SamGondelman
f60b272f11 fix crash 2019-01-07 17:24:07 -08:00
SamGondelman
3341d75eda merge with master 2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
David Back
84b2a7d474 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 15:42:02 -08:00
David Back
3aa245036b
Merge branch 'master' into propertyRangeAudit 2019-01-07 15:36:18 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8 
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
 2019-01-07 14:53:27 -08:00
SamGondelman
791257bd0a convert old created to quint 2019-01-07 14:17:01 -08:00
Simon Walton
c88af5c4be Merge branch 'master' into reliable-service-min-timeout 2019-01-07 13:28:13 -08:00
SamGondelman
ff3545beab working with texture transform fallthrough 2019-01-07 13:28:00 -08:00
SamGondelman
4210d4a7cd write created as quint64 2019-01-07 13:24:38 -08:00
SamGondelman
fa66ed766d one more try 2019-01-07 12:31:52 -08:00
David Rowe
683e633469 Fix play back of input recording's numeric values 2019-01-08 09:18:53 +13:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
SamGondelman
5cded6938b possible fix for texture path 2019-01-07 11:55:34 -08:00
SamGondelman
d57e3b57aa possible fix for created to/from string 2019-01-07 11:10:36 -08:00
David Back
d25948fbd3 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 10:36:27 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats 
Only keep aggregated thread stats for Avatar Mixer
 2019-01-07 10:17:26 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
Roxanne Skelly
0a76554d57 Remove debugging code 2019-01-05 14:04:26 -08:00
Andrew Meadows
5c750b40c9 fix copy-n-paste errors in EntityItem::contains() for cylinders 2019-01-05 08:03:29 -08:00
Roxanne Skelly
6d791a80c2 Bump protocol version for BulkAvatarTraits and add some guard code 
around packet parsing.
 2019-01-04 19:04:01 -08:00
SamGondelman
b5b7574c48 set created 2019-01-04 16:52:11 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager 
MS19925: Avatar Packager
 2019-01-04 16:22:06 -08:00
David Back
5ea84fb952 CR fixes 2019-01-04 15:39:27 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Thijs Wenker
94146ab997 CR fixes 2019-01-04 23:59:22 +01:00
Clement
cfbb4e29d1 Only keep aggregated thread stats 2019-01-04 14:51:58 -08:00
David Back
1d3006028a Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-04 14:43:03 -08:00
SamGondelman
1452d237e2 trying to fix avatar entity issue 2019-01-04 14:34:46 -08:00
Shannon Romano
3faf12b141
Merge pull request #14637 from howard-stearns/data-url-for-web-entity 
data url for web entity
 2019-01-04 14:21:55 -08:00
Roxanne Skelly
4f9cce1ea9 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-04 13:46:45 -08:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Andrew Meadows
a642af23b7 enable shapeType=ellipsoid and expose zone shapeType to UI 2019-01-04 12:37:23 -08:00
Andrew Meadows
a656ea723e special handling of SPHERE case in EntityItem::contains() 2019-01-04 12:37:23 -08:00
Andrew Meadows
65e920039c cleaner return logic for EntityItem::contains() cylinder cases 2019-01-04 12:37:23 -08:00
Andrew Meadows
7625aebaa8 remove reduntant model-networking link dependency 2019-01-04 12:37:23 -08:00
Andrew Meadows
a8325b5c00 add ZoneEntityItem::contains() and support for shapes 2019-01-04 12:37:23 -08:00
Andrew Meadows
bb15b3a5d5 remove ShapeInfo::contains() which was a Bad Idea 2019-01-04 12:37:23 -08:00
Andrew Meadows
b480720409 proper shape support for EntityItem::contains(point) 2019-01-04 12:37:23 -08:00
Andrew Meadows
1fabaf0db4 rename getCollisionGeometryResource to fetchCollisionGeometryResource 2019-01-04 12:37:23 -08:00
Andrew Meadows
0072684d98 remove cruft and fix error in transform to mesh frame 2019-01-04 12:37:23 -08:00
Thijs Wenker
b105607cb2 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:13:29 +01:00
Thijs Wenker
a3f72a7a08 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:10:35 +01:00
David Back
ad25d50934 follow-up merge from PR 14585 2019-01-04 12:01:13 -08:00
David Back
eff9d11437 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-04 11:07:28 -08:00
Seth Alves
b9217e2767
Merge pull request #14655 from danteruiz/unknown-steamvr-headsets 
omit unknown device names from clear-story data
 2019-01-04 10:09:20 -08:00
Jeff Clinton
c2c744b44e
Merge pull request #14622 from SimonWalton-HiFi/avatar-scaling-delayed 
Correctly set avatar-scale timestamp when changing in Avatar class
 2019-01-04 10:00:46 -08:00
Ryan Huffman
b680e9c52a Update avatar packager with CR feedback 2019-01-04 09:59:17 -08:00
Ryan Huffman
c2ceeb3d76 Apply AvatarPackager code review cleanup 2019-01-04 09:41:31 -08:00
Shannon Romano
bdac7fe298
Merge pull request #14647 from hyperlogic/feature/improve-eye-look-at-interest-calculation 
Update eye look at interest calculation
 2019-01-04 09:16:53 -08:00
Thijs Wenker
8625037285 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 15:29:07 +01:00
Andrew Meadows
65a7e15f5d don't send AvatarEntity updates when not necessary 2019-01-03 17:57:11 -08:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats 
Fix network stats to use low-level values
 2019-01-03 16:54:03 -08:00
Sam Gondelman
0e6eecc64b
Update PacketHeaders.h 2019-01-03 15:20:55 -08:00
Ken Cooke
83e1efd2f0 Improved reference distance = 2m 2019-01-03 15:12:42 -08:00
Sam Gondelman
5a6f9eb9e3
Merge branch 'master' into NOverlays8 2019-01-03 15:11:48 -08:00
Shannon Romano
9b6dfd17cc
Merge pull request #14585 from SamGondelman/NOverlays7 
Case 20321: More Entity Property Cleanup
 2019-01-03 15:07:50 -08:00
Antonina Savinova
a493f01012
Merge pull request #14551 from Atlante45/fix/headers 
Fix non self-sufficient headers.
 2019-01-03 15:04:39 -08:00
Ken Cooke
53dece5451 Clamp near-field distance attenuation to max gain 2019-01-03 14:50:44 -08:00
Ken Cooke
5148b60c73 Parameterize distance attenuation by reference distance (where gain = unity) 2019-01-03 14:43:15 -08:00
SamGondelman
a2fe8ef9e7 merge with master 2019-01-03 13:51:07 -08:00
Dante Ruiz
f5de217b4c removing debug statment 2019-01-03 13:40:44 -08:00
Roxanne Skelly
2b1547b9fa Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-03 13:39:19 -08:00
Anthony Thibault
fa137f0586 Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation 2019-01-03 13:19:11 -08:00
Thijs Wenker
c95da0a595 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/src/Application.cpp
 2019-01-03 22:17:54 +01:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Dante Ruiz
fe1a8a6b76 omit unknown device names from clear story 2019-01-03 11:46:03 -08:00
Roxanne Skelly
443b54d931 comment and naming cleanup 2019-01-03 11:25:39 -08:00
Clement
a0ede77e4f Fix typo 2019-01-03 10:04:38 -08:00
Clement
9475a31f1b Record ACK data in stats 2019-01-03 10:04:38 -08:00
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Clement
c5b60594b6 Record more detailed stats on Retransmit/duplicate 2019-01-03 10:04:38 -08:00
Seth Alves
ad1235ce94 also bump entity protocol version 2019-01-03 08:19:13 -08:00
Seth Alves
a7515a4bde include owningAvatarID in entityPropertyFlagsFromScriptValue 2019-01-03 08:18:34 -08:00
Seth Alves
3ccbd0bc7b disable positionand velocity script edits on grabbed entities 2019-01-03 08:17:52 -08:00
Seth Alves
3c0243419b trying again on avatar-entity grab releases 2019-01-03 08:17:52 -08:00
Seth Alves
54a5805b5c add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities 2019-01-03 08:17:52 -08:00
Seth Alves
05a80ae0e4 don't bootstrap with a traits-based grab 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
bc5079e5d7 fix flawed logic in updateEntityQueryAACubeWorker 2019-01-03 08:17:52 -08:00
Seth Alves
38cc2205ec dimensions is a simulation restricted change 2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de don't crash when releasing an entity that has expired 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Ken Cooke
fdd86876cb Fix the distance attenuation of stereo local injectors 2019-01-03 08:17:28 -08:00
Thijs Wenker
725a14ce80 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 11:06:19 +01:00
David Rowe
14d39d1747 Make mouselook yaw and pitch directly proportional to mouse movement 2019-01-03 15:53:37 +13:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
SamGondelman
a9d798070a wip 2019-01-02 18:08:59 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6 
Case 20281: Add missing Text Entity properties
 2019-01-02 18:07:37 -08:00
David Rowe
36da8bfa58 Remove TODOs 2019-01-03 15:05:21 +13:00
Anthony Thibault
006bd8f939 Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation 2019-01-02 16:58:10 -08:00
David Rowe
2ccef09d00 Make operation clearer 2019-01-03 12:35:44 +13:00
Thijs Wenker
cb91a4bc6d Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 00:10:22 +01:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207 
ACs don't need to call into flagtimeForConnecitonStep
 2019-01-02 13:41:30 -08:00
David Back
b92beca7d1 bad merge 2019-01-02 11:26:38 -08:00
unknown
dde7fbdfce how did these happen 2019-01-02 11:15:22 -08:00
unknown
f8f13e974d property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties 2019-01-02 11:12:10 -08:00
SamGondelman
1a62b59a8f Merge remote-tracking branch 'upstream/master' into matFallthrough 2019-01-02 10:11:46 -08:00
SamGondelman
32bec57cfe Merge remote-tracking branch 'upstream/master' into NOverlays6 2019-01-02 09:53:29 -08:00
Roxanne Skelly
9dfb07c827 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-02 09:22:27 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4 
Case 20134: Grid Entities
 2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
 2019-01-02 09:00:56 -08:00
Thijs Wenker
20c169bd39 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-02 14:03:13 +01:00
David Rowe
3b531f3c99 Update JSDoc 2019-01-02 13:41:55 +13:00
David Rowe
d073dc22ac Misc fixes 2019-01-02 13:39:31 +13:00
Anthony Thibault
d87bc3e898 Update eye look at interest calculation 
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
 2018-12-31 13:37:22 -08:00
David Rowe
f381361c82 Fix typos 2018-12-31 13:53:59 +13:00
David Rowe
d12b504a88 Use Controller axis value timestamp for mouse movement Controller events 2018-12-31 12:15:51 +13:00
David Rowe
84c6bb4797 Introduce optional timestamp into internal Controller axis values 
This can be used to determine if consecutive identifical values should
be output.
 2018-12-31 12:15:51 +13:00
David Rowe
4aa26715c0 Remove unused variable 2018-12-31 12:15:51 +13:00
David Rowe
40e6f1cad5 Fix Controller mouse move missing values during rapid movement 2018-12-31 12:15:51 +13:00
luiscuenca
bd21d0589a Merge branch 'master' into otherAvatarMotionStates01 2018-12-30 10:55:05 -07:00
luiscuenca
4a8bbd79fe other avatars motion states 2018-12-30 10:53:28 -07:00
Thijs Wenker
cb33a91a34 - rename functionality 
- avatar packager works in tablet now
 2018-12-29 03:31:56 +01:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3 
Case 20080: v3 + v4 procedurals and misc shader fixes
 2018-12-28 15:17:50 -08:00
Roxanne Skelly
c9e6d2711d Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2018-12-28 10:33:12 -08:00
Thijs Wenker
1ec8aa8fa5 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-28 17:13:05 +01:00
Ryan Huffman
c21d037800 Fix marketplace uploader not working with projects larger than 128MB 2018-12-27 17:51:27 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics 
(case 20297) Move graphics preparation from Serializers to runtime preparation step
 2018-12-27 15:46:21 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk 
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
 2018-12-27 15:43:17 -08:00
Roxanne Skelly
4fc263ff24 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2018-12-27 14:13:40 -08:00
Thijs Wenker
1a38abe230 - add jointIndexes to new 
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
 2018-12-27 21:47:10 +01:00
howard-stearns
af65e59ba3 Recognize data: URLs in Web entities. 2018-12-27 14:34:59 -05:00
Thijs Wenker
b6359a6cb4 Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager 2018-12-27 14:25:13 +01:00
Ryan Huffman
1da179dc04 Update avatar packager styling 2018-12-27 00:13:45 -08:00
Roxanne Skelly
da70271acf Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits 2018-12-26 13:46:08 -08:00
SamGondelman
87947a7165 try to fix grid color issue 2018-12-25 02:17:37 -05:00
SamGondelman
a25c9395b3 glsl initializer lists are 4.2 2018-12-25 00:46:42 -05:00
Thijs Wenker
a1ef1b4447 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-24 16:48:40 +01:00
vladest
8d9cff3c58 Merge branch 'master' into avatar_app_warnings 2018-12-23 16:45:59 +01:00
Ryan Huffman
b717188ed0 Update avatar project styling 2018-12-22 21:57:09 -08:00
SamGondelman
8dae2502ee fix overlay picking 2018-12-22 02:21:29 -05:00
SamGondelman
64b461274b remove new API 
(cherry picked from commit 5eccaad135)
 2018-12-22 01:45:56 -05:00
SamGondelman
43bc184254 different entity flags for domain/avatar 
(cherry picked from commit 7054188f21)
 2018-12-22 00:55:27 -05:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Roxanne Skelly
3a282045ff Checkpoint trait-level flow control 2018-12-21 15:48:58 -08:00
Thijs Wenker
ad2d9bc79a - fst read/write should work 
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
 2018-12-21 19:34:54 +01:00
Adam Smith
a9f59fae71
Merge pull request #14631 from highfidelity/revert-14547-NOverlays5 
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
 2018-12-21 10:32:59 -08:00
Thijs Wenker
ea901aa179 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 01:59:11 +01:00
Adam Smith
3c89d51994
Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix 
Case 20391: Fix crash when importing a glTF model that contains embedded buffers
 2018-12-20 16:55:37 -08:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
SamGondelman
835615fbbd separate out v3 and v4 2018-12-20 16:33:13 -08:00
Ryan Huffman
556f516be6 Update uploader screen 2018-12-20 16:30:08 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
SamGondelman
9155853889 working on material fallthrough 2018-12-20 16:03:58 -08:00
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
sam gateau
7e1f75e0f3 Fixing the debug of shadow frustum for real 2018-12-20 13:16:41 -08:00
luiscuenca
52bfaafd91 Fix crash on glTF import when the file contains embedded buffers 2018-12-20 13:25:19 -07:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities
 2018-12-20 19:10:22 +00:00
Thijs Wenker
79a9c82168 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-20 18:56:33 +01:00
sam gateau
21577ba311 fixing warnings and the debug of shadows 2018-12-20 09:27:15 -08:00
David Kelly
2c647462b1 ACs don't need to call into flagtimeForConnecitonStep 2018-12-20 10:15:44 -07:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge 
MS20253: Only emit screenChanged once screen has changed
 2018-12-20 08:58:53 -08:00
Sam Gateau
8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-19 20:01:48 -08:00
Sam Gateau
80a55e2ae9 Compiling 2018-12-19 20:01:14 -08:00
sam gateau
253a71a20c updating some code and probably broken in this version 2018-12-19 18:22:01 -08:00
SamGondelman
bf704c2d0d remove gl_DepthRange 2018-12-19 16:21:12 -08:00
Simon Walton
9cb53af023 Correct set avatar-scale timestamp when changing in Avatar class 2018-12-19 16:13:12 -08:00
SamGondelman
05e0fb464e new improved polylines 2018-12-19 15:01:49 -08:00
SamGondelman
3578df7a0e material targeting 2018-12-19 13:28:33 -08:00
Ryan Huffman
202326dbac Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager 2018-12-19 12:03:30 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Adam Smith
828672343a
Merge pull request #14523 from SamGondelman/NOverlays2 
Case 20131: Cleanup some Entity Properties
 2018-12-19 11:33:24 -08:00
Thijs Wenker
cb74313de8 create projects / style changes 2018-12-19 19:23:24 +01:00
Zach Fox
7fee0fc1e4 Fix MS20253: Only emit screenChanged once screen has changed 2018-12-19 09:50:52 -08:00
sam gateau
9c436bc28c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-19 09:31:41 -08:00
Jeff Clinton
16c7619aa7
Merge pull request #14608 from SamGondelman/zone 
Case 19080: Fix zone with invalid script not loading
 2018-12-19 08:49:33 -08:00
Jeff Clinton
16e3914cd7
Merge pull request #14598 from amantley/ripOutCruft 
Fix for Camera-perspective-is-off-in-first-person-view, master branch
 2018-12-18 17:15:58 -08:00
sam gateau
b8d96d98b8 fixing warnings from the build 2018-12-18 16:25:24 -08:00
sam gateau
5b50b0332d more fixes 2018-12-18 15:30:45 -08:00
sam gateau
265b1591d6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-18 14:43:12 -08:00
sam gateau
2f18555ee0 removing comments and dead code, rewiring the debug 2018-12-18 14:42:45 -08:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
SamGondelman
7231116e43 fix zone with invalid script not loading 2018-12-18 13:04:56 -08:00
Jeff Clinton
889f110357
Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter 
fix a bug that broke Entities.setVoxel().  Fix polyvox textures
 2018-12-18 12:15:07 -08:00
vladest
a99ba052b8 Remove duplicate signals 2018-12-18 20:30:53 +01:00
Sam Gateau
d0d771ce1e Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-17 18:48:07 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
amantley
42a17980cb fixed mac build conflict, unused variable 2018-12-17 16:21:22 -08:00
Adam Smith
14ab53571f
Merge pull request #14564 from sabrina-shanman/hfm_prep 
(case 20274) Create the HFM Preparation Step
 2018-12-17 15:17:19 -08:00
amantley
3e1beb2dca removed white space and stray semi colon 2018-12-17 15:05:51 -08:00
Simon Walton
0d14e0bcf7 Set minimum timeout for retransmits 2018-12-17 14:07:21 -08:00
amantley
defdc9fbcb removed humanIK joint name code from fbx serializer 2018-12-17 10:56:53 -08:00
amantley
6e5c52972a removed member declarations in hfm.h and debug print statements 2018-12-17 10:42:08 -08:00
Sam Gateau
318bf20ede Shadow is working correctly in both pipelines 2018-12-17 00:27:07 -08:00
Angus Antley
77fa4e7d13 took out the unnecessary hfm.jointindex code 2018-12-16 17:29:16 -08:00
vladest
63aa27475e Merge branch 'master' into avatar_app_warnings 2018-12-15 19:08:56 +01:00
sam gateau
a4b9ec50e9 one step closer 2018-12-14 17:00:58 -08:00
SamGondelman
6094a2f0a0 add back line entities, undo polyline changes temporarily 2018-12-14 15:41:11 -08:00
SamGondelman
5dd00bed1d new improved polylines 2018-12-14 14:15:56 -08:00
sabrina-shanman
f25810104e Remove remaining references to VaryingSet1 in hfm model parts/building 
tasks
 2018-12-14 11:18:44 -08:00
sabrina-shanman
e7b0b345e9 Merge branch 'hfm_prep' into hfm_prep_graphics (VaryingSet1 removed) 2018-12-14 10:47:54 -08:00
sabrina-shanman
a36e75672e Remove dependency on VaryingSet1 2018-12-14 10:40:28 -08:00
sabrina-shanman
c7022988ea Revert "Add VaryingSet1 to Task aliases" 
This reverts commit 25e3d49941.
 2018-12-14 09:14:07 -08:00
Sam Gateau
0b03012e5e introducing the Shadow Stage 2018-12-14 06:55:34 -08:00
Sam Gateau
e07bc208f3 introducing the Shadow Stage 2018-12-14 00:58:07 -08:00
Sam Gateau
30277213c6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-13 20:40:50 -08:00
sam gateau
8bfca612e3 Separating the state view dependant from the shadow to be able to have several versions in flight 2018-12-13 17:56:14 -08:00
sabrina-shanman
77a7eb9e04 Remove unused debug variable in BuildGraphicsMeshTask::run 2018-12-13 13:38:04 -08:00
Ryan Huffman
78c4c2599e Add start of marketplace uploading and project file list 2018-12-13 13:27:31 -08:00
sabrina-shanman
332a195fa3 Fix cross-platform linker errors in model-baker 2018-12-13 13:06:12 -08:00
sabrina-shanman
e8a2622ed6 Move graphics prep to baker and add related tasks for splitting 
up the model
 2018-12-13 11:15:56 -08:00
sabrina-shanman
b021c3c46d Add model-baker logging category 2018-12-13 10:37:35 -08:00
sabrina-shanman
ec748c60cf Give more appropriate names for some model-related constants and move them into HFM.h 2018-12-13 10:37:35 -08:00
sabrina-shanman
c41174a823 Re-name baker::ImportContext to baker::BakeContext 2018-12-13 10:33:03 -08:00
sam gateau
94ae345daf Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-13 08:45:29 -08:00
Sam Gateau
7f193d0e7c WEll it sn not going to be that simple.... 2018-12-13 00:32:59 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
SamGondelman
770da220d7 cleanup entity properties more and start polyline work, remove lines 2018-12-12 16:47:35 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
SamGondelman
b261665072 working on lines 2018-12-12 09:39:01 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Sam Gateau
8599a340ed Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-11 19:02:48 -08:00
SamGondelman
250baa9c72 add missing properties to text entities 2018-12-11 15:42:24 -08:00
sabrina-shanman
9e63caa84a Fix linker error for model-baker on Android/Linux 2018-12-11 12:54:44 -08:00
sabrina-shanman
566d09dc9c Add model preparation step to ModelCache using new library model-baker 2018-12-11 11:15:54 -08:00
sabrina-shanman
25e3d49941 Add VaryingSet1 to Task aliases 2018-12-11 11:15:54 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype 
(case 20037) Add robust MIME type detection for loading models in ModelCache
 2018-12-11 18:41:55 +00:00
SamGondelman
cd83be162c merge with NOverlays3 2018-12-11 10:38:55 -08:00
Brad Hefta-Gaub
43bbba6635
Merge pull request #14554 from sethalves/break-parenting-loops 
fix some parenting loops crashes
 2018-12-11 10:02:17 -08:00
Sam Gateau
d5b127d258 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-10 21:35:41 -08:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent 
Add method to check entities joint hierarchy
 2018-12-11 01:06:38 +00:00
sabrina-shanman
79e9bff225 Nest if statement for invalid id checking in hfm::FormatRegistry::getSerializerForMediaType 2018-12-10 16:18:11 -08:00
sabrina-shanman
31d1512701 Simplify url empty check in GeometryReader::run 2018-12-10 16:12:23 -08:00
SamGondelman
5eccaad135 remove new API 2018-12-10 13:05:39 -08:00
sabrina-shanman
b960b66542 Fix mac warning for std::move on temporary object 2018-12-10 11:10:29 -08:00
sabrina-shanman
8792824960 Remove FormatSerializerRegister as it is unused 2018-12-10 09:58:59 -08:00
sam gateau
4ab003091a Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-10 08:30:53 -08:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
Sam Gateau
b09d0b10e9 cleaning light clusters 2018-12-09 22:54:49 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts 
fix realod all scripts functionality broken by PR14478
 2018-12-09 17:30:36 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219 
FB19219 - Make avatarapp to handle wearables update via drag&drop
 2018-12-09 17:20:13 -08:00
Sam Gateau
653370e284 Assemble lighting stage works 2018-12-09 11:39:35 -08:00
Sam Gateau
79cad36c58 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-08 19:14:21 -08:00
vladest
c05e3e7d09 Fix Avatar apps warnings. Added notification for HMD.active property 2018-12-08 19:12:02 +01:00
Seth Alves
c1e2653526 check for and break parenting loops in hasAncestorOfType, findAncestorOfType, isParentPathComplete 2018-12-08 07:42:03 -08:00
SamGondelman
7054188f21 different entity flags for domain/avatar 2018-12-07 17:59:47 -08:00
Jamil Akram
4e7a777fda
Merge pull request #14486 from amantley/jointNameMapping 
FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names
 2018-12-07 17:07:37 -08:00
sam gateau
28d36c81e0 there and back , trying to converge with the new Assemble Lighting Stage task 2018-12-07 16:24:51 -08:00
sabrina-shanman
031085b384 Remove now unused HFMSimpleFormat 2018-12-07 16:17:33 -08:00
John Conklin II
69876bdec2
Merge pull request #14548 from SamGondelman/mirrorFix 
Case 19473 (#2): Fix Mirror tonemapping
 2018-12-07 16:11:59 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash 
Case 19740: Improve startup times by pre-compiling shaders with splash screen
 2018-12-07 16:10:52 -08:00
Clement
d179b91f69 Fix non self-sufficient headers. 2018-12-07 15:26:49 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Sam Gondelman
ccdf1c8614
Merge branch 'master' into NOverlays4 2018-12-07 14:27:34 -08:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3 2018-12-07 14:26:59 -08:00
sabrina-shanman
f2e69aec5e Fix mac warning for OBJSerializer::getFactory not marked with override 2018-12-07 13:41:33 -08:00
Jeff Clinton
998ec20854
Merge pull request #14539 from Atlante45/fix/script-loading 
Fix ESS scripts getting stuck on load
 2018-12-07 12:07:44 -08:00
sabrina-shanman
7cbe3776f5 Simplify serializer registration process 2018-12-07 12:05:27 -08:00
Stephen Birarda
e3e400c86f
Merge pull request #14549 from birarda/bug/no-initial-send 
fix for initial send of non-instanced trait
 2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub
9428f1de33
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst 
Don't fetch avatars' .fst files from within the AvatarData class
 2018-12-07 12:01:58 -08:00
Dante Ruiz
177a94b9a9 fix realod all scripts functionality 2018-12-07 11:48:03 -08:00
birarda
51fd742722 fix for initial send of non-instanced trait 2018-12-07 11:17:44 -08:00
SamGondelman
8431b3b0c1 correct order of mixes 2018-12-07 10:39:10 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
Alexander Ivash
600d09e533 relax 'isWearable()' condition to match latest changes in 'master' 2018-12-07 11:23:17 +03:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
Sam Gateau
50fcd7f40a trying... 2018-12-06 22:45:44 -08:00
amantley
f8ae0227c3 added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp 2018-12-06 20:16:03 -08:00
Sam Gateau
b24a2d33bf Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-06 19:51:05 -08:00
Sam Gateau
4fff4acde2 Merge branch 'punk' of github.com:samcake/hifi into punk 2018-12-06 19:50:46 -08:00
Stephen Birarda
fb3cdabd87
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock 
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
 2018-12-06 17:28:45 -08:00
sam gateau
e941833676 gathering the lighting stage jobs in their own task away from the renderer specificities 2018-12-06 17:27:13 -08:00
amantley
ca0133a2a6 put the lean joint back in 2018-12-06 16:24:06 -08:00
sabrina-shanman
6ea4769173 Re-name MIMETypeLibrary to MediaTypeLibrary and update related references 2018-12-06 13:39:18 -08:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4 2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3 2018-12-06 12:37:18 -08:00
Sam Gondelman
533e0e0326
Merge branch 'master' into NOverlays2 2018-12-06 12:29:38 -08:00
Sam Gondelman
50efb48a58
Update GeometryCache.cpp 2018-12-06 12:26:18 -08:00
Luis Cuenca
37854ab05e
Add jsdoc information 2018-12-06 11:58:48 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Sam Gondelman
a7c083e97a
Merge branch 'master' into NOverlays2 2018-12-06 11:24:27 -08:00