Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 12:57:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75712 commits 76 branches 59 tags 1.2 GiB
Commit graph

28298 commits

Author SHA1 Message Date
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -08:00
amantley
7777162351 got the spine2 rotationa and the head spline working 2019-01-18 15:28:41 -08:00
Adam Smith
da7cd6b2f7
Merge pull request #14691 from SamGondelman/multifrustum 
Case 20394: Fix multi-frustum view updating
 2019-01-18 15:23:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter 
Limit upstream bandwidth to the Avatar Mixer
 2019-01-18 13:32:03 -08:00
Jeff Clinton
09b16d2d7a
Merge pull request #14735 from SamGondelman/snap 
Case 20724: Fix Snap app settings issue
 2019-01-18 13:00:18 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits 
case 15962: case 20481: Mouse grab with traits
 2019-01-18 11:56:41 -08:00
luiscuenca
43244193e8 Mesh picking against default pose with transformed ray 2019-01-18 12:46:18 -07:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp 
Change Avatar App design for avatar collisions
 2019-01-17 16:06:17 -08:00
Shannon Romano
c764f5182f
Merge pull request #14717 from roxanneskelly/Case20277 
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
 2019-01-17 15:36:31 -08:00
Wayne Chen
238f020392
remove trailing whitespace 2019-01-17 14:20:47 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
Andrew Meadows
74f9a415d3 move _cauterizationNeedsUpdate back to MyAvatar 2019-01-17 13:58:34 -08:00
luiscuenca
007e3ac577 Fix warning and wrong ID 2019-01-17 14:53:06 -07:00
Seth Alves
4fbc257be0 don't cauterize head-children when they are grabbed 2019-01-17 13:34:36 -08:00
luiscuenca
2158e084d4 Add avatar joints filter to intersection calculation 2019-01-17 14:01:36 -07:00
John Conklin II
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging 
case 20654: Updating user activity logging for login experience
 2019-01-17 12:59:12 -08:00
Wayne Chen
123f2d71e5 dismissing login dialog on popup if bad linking 2019-01-17 11:38:42 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
Wayne Chen
79ffc311e1 code cleanup + adding password error 2019-01-17 10:19:40 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
amantley
e5b16ef174 implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp 2019-01-16 18:31:52 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
673c4ad434 fixing error message spacing 2019-01-16 17:22:00 -08:00
Wayne Chen
3ad0f60dd5 fixing error message spacing 2019-01-16 17:20:01 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
f4d4220e58 adding final create failure message handling, ui improvements 2019-01-16 17:05:56 -08:00
Wayne Chen
c54bce3953 fixing desktop login page crash 2019-01-16 17:05:55 -08:00
Wayne Chen
d38a657c54 filling username with oculus username, checking create error 2019-01-16 17:05:54 -08:00
Wayne Chen
671f15b63c removing isLogIn 2019-01-16 17:05:53 -08:00
Wayne Chen
3b3b86888e adding blur to login bg 2019-01-16 17:05:53 -08:00
Wayne Chen
fbc2dc5103 adding changes to forms 2019-01-16 17:05:52 -08:00
Wayne Chen
5c54930910 adding tablet close upon login 2019-01-16 17:05:52 -08:00
Wayne Chen
2d16e71e74 adding sending oculus ID including username 2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4 better check for if oculus is running 2019-01-16 17:05:51 -08:00
Wayne Chen
ca0916886a adding more qml for oculus login 2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0 fixing typos in callback implementation 2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b changing request to have a callback function passed 2019-01-16 17:05:51 -08:00
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
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
Wayne Chen
1fc51445d0 adding files for staging login 2019-01-16 17:05:47 -08:00
SamGondelman
9727c8fd38 CR 2019-01-16 14:14:01 -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
Roxanne Skelly
6cb12daf74 CR Fixes 2019-01-15 17:49:13 -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
b1c34eb9ec update queryAACube during grab rather than only when grab is released 2019-01-15 16:01:44 -08:00
Wayne Chen
3b913db609
fixing typo 2019-01-15 14:21:37 -08:00
Clement
8480624797 Limit upstream data to avatar mixer 2019-01-15 14:18:53 -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
David Rowe
184c11ca44 Fix tablet sometimes not working after domain change 2019-01-16 08:54:29 +13:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -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
Antonina Savinova
6499c4f0ea
Merge pull request #14700 from SimonWalton-HiFi/update-icons 
New icons for interface and server-console
 2019-01-14 16:04:55 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
luiscuenca
824a93f900 Fix menu update on app reopened 2019-01-14 12:27:59 -07:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -08:00
SamGondelman
6fd34bf1f0 setup qml surface contexts 2019-01-14 09:26:57 -08:00
luiscuenca
43d967329c Change Avatar App design for avatar collisions 2019-01-14 10:13:12 -07:00
luiscuenca
65896b3b6f Fix shape LOD 2019-01-13 11:30:39 -07:00
Dante Ruiz
8252481ce7 Delete domain entities only 2019-01-11 16:00:10 -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
Simon Walton
d271bcd6f4 New icons for interface and server-console 2019-01-11 14:50:13 -08:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
amantley
8cba72743e changed the value for the top threshold that triggers a vertical reset, this stops unwanted recentering 2019-01-11 08:46:20 -08:00
SamGondelman
6d12f5704e fix multi-frustum view updating 2019-01-10 15:47:19 -08:00
Seth Alves
0603431ac8 initialize _logger with null pointer 2019-01-10 15:16:33 -08:00
Seth Alves
c8db50cb20 start up logger before loading plugins. 
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:06:22 -08:00
Andrew Meadows
16da42723e use glm::abs() instead of absf() 2019-01-10 10:15:39 -08:00
Andrew Meadows
f7b7db5ab4 fix warning on OSX, use correct format for float literals 2019-01-10 09:14:37 -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
8206daf1a6 send update when loading AvatarEntity from Settings 2019-01-09 17:28:00 -08:00
Andrew Meadows
e2d6e6f3dc more correct AvatarEntityData settings when switching domains 2019-01-09 17:28:00 -08:00
Andrew Meadows
27318a3f17 update AvatarEntitData blobs before writing to JSON during recordings 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
cbda905e3b fix typo 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
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
43fc86fe54 restore non-human-readable avatarEntityDataSettings format 2019-01-09 17:27:14 -08:00
Andrew Meadows
dedc14434b fix compile warnings on windows 2019-01-09 17:27:14 -08:00
Andrew Meadows
320ba9177c remove cruft 2019-01-09 17:27:14 -08:00
Andrew Meadows
121a591023 delete old AvatarEntities on domain reset on login 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
6da8c5545e remove debug code 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
ec384d7dbb more correct reload AvatarEntityData from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
0ed936520d MyAvatar saving to settings works again 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
01fc442695 save AvatarEntities settings as strings 2019-01-09 17:27:14 -08:00
luiscuenca
95fca826a5 Add fit AABox for avatar and implement multisphere on shapeManager 2019-01-09 17:49:19 -07:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377 
Trait-level flow control
 2019-01-09 15:57:13 -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
Wayne Chen
ba8620b644 updating user activity logging 2019-01-09 13:51:40 -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
amantley
3b5d8db650 updated the json to have a spline node at the root 2019-01-08 17:33:14 -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
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
Roxanne Skelly
910c359443 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-08 10:50:45 -08:00
David Back
d9e229d38e remove add Grid entity button, fix color 2019-01-07 18:20:20 -08:00
David Back
90e2feb977 replace placeholder icon with real icon from Alan 2019-01-07 18:20:20 -08:00
David Back
e0e9a7de15 tabs 2019-01-07 18:20:20 -08:00
David Back
9013eee352 add grid entities to create - icons pending 2019-01-07 18:20:19 -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
3341d75eda merge with master 2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
SamGondelman
62dbca6ce7 fix export entities 2019-01-07 14:08:52 -08:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
Shannon Romano
963bbbad19
Merge pull request #14661 from danteruiz/grabbing-web-entites 
allow mouse pointer to pick against collidable entities
 2019-01-07 10:24:48 -08:00
Dante Ruiz
4b99a795dd code review changes 2019-01-07 09:09:35 -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
6d791a80c2 Bump protocol version for BulkAvatarTraits and add some guard code 
around packet parsing.
 2019-01-04 19:04:01 -08:00
Dante Ruiz
0dc5e7743f allow mouse pointer to pick against collidable entities 2019-01-04 17:49:38 -08:00
luiscuenca
2a367509cd Fix warnings 2019-01-04 18:02:18 -07:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager 
MS19925: Avatar Packager
 2019-01-04 16:22:06 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Thijs Wenker
b0db81b861 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-05 00:01:25 +01:00
Thijs Wenker
94146ab997 CR fixes 2019-01-04 23:59:22 +01:00
Ryan Huffman
7433870c2f Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 14:43:46 -08:00
Thijs Wenker
5d40e1e480 - CR/style fixes 
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
 2019-01-04 23:39:04 +01:00
Shannon Romano
9855e9bee8
Merge pull request #14650 from NissimHadar/20301-addPlatformInfo 
Case 20301 - add platform info
 2019-01-04 14:37:17 -08:00
Ryan Huffman
63172ec87b Fix marketplace item update failing on submitted items 2019-01-04 14:21:10 -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
Ryan Huffman
51ce19e026 Fix modified const var in MarketplaceItemUploader 2019-01-04 12:08:23 -08:00
Ryan Huffman
6d5b9a88e4 Remove dead code in AvatarUploadStatusItem 2019-01-04 11:29:07 -08:00
Ryan Huffman
b680e9c52a Update avatar packager with CR feedback 2019-01-04 09:59:17 -08:00
Ryan Huffman
f38a469e65 Update avatar packager to force focus on inventory when opened 2019-01-04 09:55:21 -08:00
Jamil Akram
2c247bc3df
Merge pull request #14592 from huffman/fix/myavatar-collisions 
Fix MyAvatar::collisionWithEntity not firing
 2019-01-04 09:43:29 -08:00
Ryan Huffman
c2ceeb3d76 Apply AvatarPackager code review cleanup 2019-01-04 09:41:31 -08:00