Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 13:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75274 commits 74 branches 59 tags 1.2 GiB
Commit graph

28149 commits

Author SHA1 Message Date
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
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
Ryan Huffman
f27ee1767c Fix rename not working correctly in AvatarPackager 2019-01-04 08:43:43 -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
Jamil Akram
486a4b6e75
Merge pull request #14646 from hyperlogic/bug-fix/drop-after-delay-drop-down-width 
Make the Out of Range Strategy drop down wider
 2019-01-03 16:32:13 -08:00
Anthony Thibault
7e68f539d3 Only use the camera position for lookAt in first person. 2019-01-03 15:27:44 -08:00
Ryan Huffman
93f53cf43d Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 14:18:40 -08:00
Ryan Huffman
847496048f Fix waiting-for-inventory sticking around on avatar uploader 2019-01-03 13:51:45 -08:00
Ryan Huffman
7ca7e0f234 Revert unintended changes in avatar packager 2019-01-03 13:45:00 -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
Thijs Wenker
68521e11a7 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
#	interface/resources/qml/hifi/avatarPackager/InfoBox.qml
 2019-01-03 22:13:04 +01:00
Thijs Wenker
ecc578c2dd - error messages 
- style changes
 2019-01-03 22:00:22 +01:00
Ryan Huffman
7953507cb8 Update avatar project rename to have audio and highlighting 2019-01-03 11:59:16 -08:00
Ryan Huffman
c13badcbc8 Fix project rename focus and create project not initializing 2019-01-03 10:20:13 -08:00
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Thijs Wenker
37d00d9519 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 18:18:07 +01:00
Ryan Huffman
9c96f7bd01 Add RalewayButton 2019-01-03 08:21: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
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Thijs Wenker
a035a2f639 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 11:09:27 +01: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
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
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
NissimHadar
65d975fe5b Added detection of Rift and Vive controllers. 2019-01-02 16:53:38 -08:00
Ryan Huffman
61ac9d0050 Update various styling in Avatar Packager 2019-01-02 16:47:09 -08:00
NissimHadar
4918f7d186 Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo 2019-01-02 16:24:52 -08:00
Thijs Wenker
cb91a4bc6d Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 00:10:22 +01:00
Ryan Huffman
41effbf862 Remove unused variable in MarketplaceItemUploader.cpp 2019-01-02 15:01:00 -08:00
Ryan Huffman
d29233872e Remove avatar packager from Android builds 2019-01-02 14:59:47 -08: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
NissimHadar
56ee91dc60 Fixed Ubuntu warnings. 2019-01-02 13:23:20 -08:00
NissimHadar
1e8e633025 Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo 2019-01-02 11:47:34 -08:00
Anthony Thibault
71991c2e2f Added max angles and isTalking into the lookAtCostFunction 2019-01-02 11:05:01 -08:00
SamGondelman
32bec57cfe Merge remote-tracking branch 'upstream/master' into NOverlays6 2019-01-02 09:53:29 -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
NissimHadar
c0a784fa94 Get graphics card type works on Mac laptop 2019-01-01 12:44:09 -08: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
NissimHadar
a3dde612d1 Can get total memory on Mac 2018-12-31 11:56:27 -08:00
NissimHadar
9c00bdcddb getCPUBrand works on Mac 2018-12-31 11:00:29 -08:00
Anthony Thibault
95c93e59a7 Make the Out of Range Strategy drop down wider 
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
 2018-12-31 09:23:33 -08:00
NissimHadar
bb54353644 Compilation error. 2018-12-30 22:36:15 -08:00
NissimHadar
4b4ef4412a Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo 2018-12-30 20:24:16 -08:00
NissimHadar
76ce63da64 Can read graphics card type. 2018-12-30 20:24:00 -08:00
David Rowe
d12b504a88 Use Controller axis value timestamp for mouse movement Controller events 2018-12-31 12:15:51 +13:00
NissimHadar
6debd996c5 Added method to get total system memory in MB. 2018-12-29 21:59:18 -08:00
NissimHadar
3a9214747a Can read number of logical processors 2018-12-29 20:49:54 -08:00
NissimHadar
63ea300921 Can get CPU brand. 2018-12-29 17:24:44 -08:00
Thijs Wenker
cb33a91a34 - rename functionality 
- avatar packager works in tablet now
 2018-12-29 03:31:56 +01:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master 
Fix for Oculus reset view issue
 2018-12-28 16:24:40 -08:00
NissimHadar
246c4dab94 Created the PlatformInfo scripting object. 2018-12-28 14:41:55 -08:00
NissimHadar
c28167f797 Initial creation of class - has COPY of getOperatingSystemType(). 2018-12-28 14:24:19 -08:00
John Conklin II
4f3dd390b5
Merge pull request #14625 from SamGondelman/deprecateDashed 
Case 20392: Deprecated 3D Overlay dashed/isDashed
 2018-12-28 10:16:27 -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
24aaeee5fd Disable back button on avatar upload page 2018-12-27 22:55:54 -08:00
Ryan Huffman
8f70865cf7 Fix marketplace upload finishing before inventory item is valid 2018-12-27 21:02:56 -08:00
Ryan Huffman
83a60a541b Fix styling and flow issues in avatar uploader 2018-12-27 18:53:07 -08:00
Ryan Huffman
c21d037800 Fix marketplace uploader not working with projects larger than 128MB 2018-12-27 17:51:27 -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
Ryan Huffman
a79bf783d2 Fix MyAvatar::collisionWithEntity not firing 2018-12-27 15:12:23 -08:00
Ryan Huffman
9e7f89e2b0 Update link text for avatar project files 2018-12-27 14:38:46 -08:00
Ryan Huffman
89b03a3cdc Add info popup box for avatar project files 2018-12-27 14:30:44 -08:00
Thijs Wenker
656d96c725 Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
 2018-12-27 21:52:57 +01: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
Ryan Huffman
882975f01c Update icons in avatar packager 2018-12-27 12:43:43 -08:00
Thijs Wenker
2f32458f72 recent projects 2018-12-27 19:52:56 +01: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
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
8c56e35f69 Add granular status to avatar upload 2018-12-23 00:13:01 -08:00
Ryan Huffman
b717188ed0 Update avatar project styling 2018-12-22 21:57:09 -08:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Ryan Huffman
9955de6288 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 11:43:49 -08:00
Ryan Huffman
748135eef9 Fix login-required size and projectFiles warning 2018-12-21 11:43:20 -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
Thijs Wenker
1da5b3fae2 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 19:20:16 +01:00
Ryan Huffman
7602da6f92 Add AvatarProjectUpload.qml 2018-12-21 08:16:18 -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
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
Ryan Huffman
556f516be6 Update uploader screen 2018-12-20 16:30:08 -08:00
Brad Davis
c985eb3e80 Fix for Oculus reset view issue 2018-12-20 16:07:55 -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
SamGondelman
837c261fd5 deprecated dashed/isDashed 2018-12-20 11:28:42 -08: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
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
Zach Fox
22c2954423
Merge pull request #14568 from zfox23/MS20187_itemTrash 
Implement MS20187: Add trash can feature to Inventory
 2018-12-19 18:19:29 -08:00
Zach Fox
b0ce3a54d5 Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash 2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff Un-wear things when trashing them if worn 2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3 Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash 2018-12-19 15:03:36 -08:00
Wayne Chen
50d57e8b60 sending user to previous location on second launch 2018-12-19 12:37:08 -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
Ryan Huffman
c2aca64b11 Add start of opening uploaded avatar in inventory 2018-12-19 11:30:21 -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
Zach Fox
116edcc224
I have no idea how this happened 2018-12-19 09:36:05 -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
a7e7a2426e
Merge pull request #14538 from ElderOrb/FB19355 
FB19355 - When I have avatar entities as children of my avatar, the A…
 2018-12-19 09:09:54 -08:00
Jeff Clinton
c80b3dea52
Merge pull request #14611 from wayne-chen/fixScriptsNotBeingSaved-78 
MS20356: Running Scripts list doesn't persist between Interface restarts
 2018-12-19 08:52:40 -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
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing 2018-12-18 17:11:10 -08:00
Jeff Clinton
f51bdead20
Merge pull request #14606 from wayne-chen/fixFileLoginMenuButton 
MS#20355: HMD persisting extra login windows
 2018-12-18 17:04:46 -08:00
Wayne Chen
017eb9d1a3 adding fix for scripts not being saved 2018-12-18 16:32:44 -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
Ryan Huffman
ad471387f7 Integrate marketplace upload API 2018-12-18 13:08:55 -08:00
vladest
84fcf5bf8b Remove duplicate signals #2 2018-12-18 22:07:54 +01:00
Wayne Chen
b82ba8c085 do nothing with file>login in login state 2018-12-18 12:51:01 -08:00
Jeff Clinton
2ff4905ed3
Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78 
MS20352: Keep me logged in checkbox as on by default
 2018-12-18 11:57:17 -08:00
Wayne Chen
b5c3d7c3ed
Merge pull request #14596 from wayne-chen/loginForSmallAvatars-master 
MS20332: HMD Login Prompt-- small avatars cannot reach easily
 2018-12-18 10:49:26 -08: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
Wayne Chen
50902080ce fixing typos 2018-12-17 16:48:02 -08:00
Wayne Chen
816733b55f reverting to master 2018-12-17 16:47:11 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -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
amantley
a81576f311 Merge remote-tracking branch 'upstream/master' into ripOutCruft 
sync
 2018-12-17 14:20:00 -08:00
Wayne Chen
5d89ed2a81 matching master 2018-12-17 13:46:55 -08:00
Wayne Chen
28fd1380df adding target scale and default avatar to login state 2018-12-17 13:37:28 -08:00
Jeff Clinton
a5ae4081a5
Merge pull request #14588 from wayne-chen/loginInitiative2 
MS20328: New login breaks nitpick
 2018-12-17 10:14:09 -08:00
Wayne Chen
711457b2d7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-17 09:12:29 -08:00
sam gateau
5a6f30b458 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-17 08:26:24 -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
Wayne Chen
899918006f fixing for autotester 2018-12-14 17:12:27 -08:00
Shannon Romano
78c9fb2b91
Merge pull request #14580 from wayne-chen/loginInitiative2 
MS20319: fixing keyboard position offset
 2018-12-15 00:51:03 +00:00
Shannon Romano
a89c53cc52
Merge pull request #14581 from zfox23/MS20308_unknownItems 
Fix MS20308: Allow users to checkout uncertifiable items
 2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b Fix MS20308: Allow users to checkout uncertifiable items 2018-12-14 11:17:56 -08:00
Wayne Chen
befca68917 fixing keyboard position offset 2018-12-14 10:57:42 -08:00
Sam Gateau
30277213c6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-13 20:40:50 -08:00
Shannon Romano
131b53e4df
Merge pull request #14315 from wayne-chen/loginInitiative2 
2nd initiative for encouraging login
 2018-12-14 01:59:35 +00:00