Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
54172 commits 75 branches 59 tags 1.2 GiB
Commit graph

17387 commits

Author SHA1 Message Date
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
Zach Fox
9c4e367245 Merge pull request #10213 from zfox23/fixGoToFocus 
FB 4156; Fix GoTo text field focus; other GoTo tweaks
 2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352 Entirely remove addressBarToggle() 2017-04-17 12:13:01 -07:00
Dante Ruiz
3eb9b37c29 Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign 2017-04-17 16:41:15 +01:00
David Kelly
3e268fbf68 put shareable_url in UserStory details when creating 2017-04-17 07:38:24 -07:00
Anthony J. Thibault
a10b157aff First pass at having an explicit Hips IK target. 
Also, AnimManipulator nodes support setting position and rotation on a single joint.
 2017-04-14 17:00:44 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110 avatar-action-far-grab works now 2017-04-14 12:44:54 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Chris Collins
c545558b8a Merge pull request #10199 from AndrewMeadows/avatar-should-vanish 
Avatar should vanish when teleporting far away
 2017-04-12 12:28:46 -07:00
Zach Fox
39587d5308 lol 2017-04-12 10:54:28 -07:00
Seth Alves
cc77fce95f hinge is sort-of working 2017-04-12 07:12:05 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Andrew Meadows
b8a3c856be update model transform even when out of view 2017-04-11 15:03:11 -07:00
Zach Fox
6569de697d Merge pull request #10187 from zfox23/fix/getAvatar_Fix 
Fix FB3999; Fix crashes caused by getAvatar() design bug
 2017-04-11 11:17:48 -07:00
samcake
79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-11 10:00:34 -07:00
Seth Alves
bf16309917 Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 
avoid invisible avatars redux
 2017-04-11 07:07:03 -07:00
Stephen Birarda
db6fc40277 fix ScriptAvatar promotion of AvatarData 2017-04-10 22:15:45 -07:00
Stephen Birarda
b8620f6919 make getAvatar in AvatarManager Q_INVOKABLE 2017-04-10 22:15:45 -07:00
Stephen Birarda
e7299a5435 add missing include for ScriptAvatar in AvatarManager 2017-04-10 22:15:45 -07:00
Stephen Birarda
84a5807ff1 return ScriptAvatarData raw pointer from getAvatar 2017-04-10 22:15:45 -07:00
Zach Fox
54ca8bd89e grab audio loudness from correct avatar 2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts 2017-04-10 22:15:45 -07:00
Stephen Birarda
4ed22ad7ac move audio loudness to AvatarData, change AvatarData to ScriptOwnership 2017-04-10 22:15:44 -07:00
Seth Alves
05bf1930ca Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame 
Added accessor to get Avatar default pose in avatar space
 2017-04-10 12:55:02 -07:00
samcake
16e6f0900d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-10 10:12:23 -07:00
Philip Rosedale
c74778116a Merge pull request #10156 from Triplelexx/21256 
21256 - Add packet loss % to stats
 2017-04-09 18:00:01 -07:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
Triplelexx
7936637e9c and tired.. 2017-04-09 11:02:35 +01:00
Triplelexx
54eb7c10c6 distracted 2017-04-09 10:50:22 +01:00
Triplelexx
ec6885a2fb change audioPacketLoss stat to display largest of upstream/downstream loss 2017-04-09 09:49:41 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
Anthony J. Thibault
e065c1bac4 Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API 2017-04-07 14:12:03 -07:00
Anthony J. Thibault
40844d2a49 Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API. 2017-04-07 14:03:31 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug 
Stop WebEntities Running Files and Commands
 2017-04-07 13:44:03 -07:00
Andrew Meadows
92495d9622 delete in proper order on shutdown 2017-04-07 11:10:48 -07:00
Andrew Meadows
8773497f7e remvoe commented out cruft 2017-04-07 11:08:06 -07:00
Andrew Meadows
1fb88a0315 add a helpful comment 2017-04-07 11:08:06 -07:00
Andrew Meadows
6d627aa9bc don't remove other avatars on sign-out 2017-04-07 11:08:06 -07:00
Andrew Meadows
2f18e51f6b lock mutex around fading avatar list 2017-04-07 11:08:06 -07:00
Andrew Meadows
662c34c266 fix avatar scale animation and avatar render debug 2017-04-07 11:06:16 -07:00
Triplelexx
4c2823b42d change increment operator 2017-04-07 18:21:43 +01:00
Andrew Meadows
40e223cb82 cleanup unused return values and redundant variables 2017-04-07 09:58:04 -07:00
Andrew Meadows
2775b17a65 unravel one loop of spaghetti 2017-04-07 09:56:26 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
Triplelexx
fcfd206e9c change implict conversions 2017-04-07 17:47:04 +01:00
Triplelexx
27a404d0ea remove extra lines 2017-04-07 07:09:18 +01:00
Triplelexx
279997d905 change display plugin to deactivate when window minimized 2017-04-07 06:49:28 +01:00
Seth Alves
584905a618 fix warning 2017-04-06 15:41:35 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
trent
21f810e040 Fixed formatting concerns as well as a benign order-of-constructor warning. 2017-04-06 14:50:16 -04:00
trent
76d3e6d598 Added an assert for out-of-bounds values in the smoothing function; also clamped the values that I was sending in on the avatar-side. 2017-04-06 13:21:59 -04:00
Triplelexx
1b2887d5b1 change paintGL to return if window is minimized 2017-04-06 17:06:06 +01:00
Triplelexx
f588612fc3 add audioPacketLoss % display in stats 2017-04-06 16:04:14 +01:00
trent
43b3a6c624 Addressing some style inconsitency issues, as well as making the position/orientation times constants. 2017-04-05 21:31:13 -04:00
Dante Ruiz
90f5d02c99 goto toggle option 2017-04-06 00:13:53 +01:00
trent
c739db7562 Added quadratic ease-in-and-out smoothing to remote avatars position/orientation updates (through... one path, at least?). 2017-04-05 17:39:52 -04:00
samcake
1a9005ed8b Avoid unexpected changes 2017-04-05 13:57:40 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
kunalgosar
8749428ede dont assume no query tags 2017-04-04 13:51:34 -07:00
howard-stearns
6f79b2eaeb send initial path in location update (e.g., on login) 2017-04-04 12:05:43 -07:00
kunalgosar
cc81bcab66 updating url check from hifi master 2017-04-04 11:58:38 -07:00
Kunal Gosar
e5c075f107 fix typo and namespace 2017-04-04 11:54:58 -07:00
kunalgosar
8e4229b211 dont redirect people from webentity 2017-04-04 11:54:58 -07:00
kunalgosar
3b88553699 check scripts 2017-04-04 11:54:58 -07:00
kunalgosar
9d0667cb31 add url tag to web entities 2017-04-04 11:54:58 -07:00
kunalgosar
19ab7526d3 apply profile to relevant entities 2017-04-04 11:54:21 -07:00
kunalgosar
9b758dbdba updated headers 2017-04-04 11:54:21 -07:00
kunalgosar
a0f0879087 added file type filter and interceptor 2017-04-04 11:54:21 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
Lexx
af95741a7e Merge branch 'master' into 21224 2017-04-04 18:24:49 +01:00
Triplelexx
b4b5d4fe9b resolve merge conflict 2017-04-04 18:15:12 +01:00
Triplelexx
01b13d7032 fix crash when pressing "Bookmark Avatar" button 
also modified LocationBookmarks for consistency
 2017-04-04 18:05:00 +01:00
Vladyslav Stelmakhovskyi
072e024d9a Fixed warning in JSConsole 2017-04-04 16:10:37 +02:00
Thijs Wenker
2b85563413 Merge pull request #10115 from sethalves/fix-fast-talking 
Fix fast talking
 2017-04-04 02:13:09 +02:00
Seth Alves
fbf2014f04 Merge pull request #10102 from vladest/tablet-ui-goto 
Put current address to location instead of inputfield
 2017-04-03 16:09:58 -07:00
Seth Alves
55c2d36752 math fixes, cleanups 2017-04-03 15:30:06 -07:00
Seth Alves
2a43c41954 Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking 2017-04-03 14:44:13 -07:00
Seth Alves
7ac09398be include deltaTime in audioAttack running average 2017-04-03 14:44:05 -07:00
Andrew Meadows
66ff551a7c Merge pull request #10080 from ZappoMan/footActions 
add foot IK targets as actions, map Kinect feet to foot targets
 2017-04-03 12:06:14 -07:00
Seth Alves
7f1095c590 use deltaTime rather than calling usecTimestampNow 2017-04-03 11:55:08 -07:00
Seth Alves
9e08925d7e involve clock time in _mouthTime calculation 2017-04-03 11:34:29 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui 
Tablet ui -- misc changes + landscape mode
 2017-04-03 10:43:34 -07:00
Seth Alves
c45514a557 Merge pull request #10066 from vladest/tablet-ui-connection-dialog 
Implemented no connection dialog for Tablet UI
 2017-04-03 09:57:00 -07:00
Seth Alves
98a54d9119 Merge pull request #10101 from ctrlaltdavid/21252 
Fix tablet scrolling getting stuck to mouse pointer
 2017-04-03 09:52:45 -07:00
Seth Alves
0f936f7511 Merge pull request #10078 from hyperlogic/feature/avatar-skeleton 
Expose Avatar Skeleton to JavaScript
 2017-04-03 09:39:35 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987 Fix tablet window getting stuck to pointer if release mouse off tablet 2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248 
Fix HTML controls not working properly in the tablet
 2017-04-01 08:41:44 -07:00
Chris Collins
cc8b52fff4 Merge pull request #10095 from druiz17/tablet-webView2.0 
Tablet webview now uses mobile format
 2017-04-01 08:33:09 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Dante Ruiz
b10f491c6e Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0 2017-04-01 00:58:37 +01:00
Dante Ruiz
d1bf3e4bf2 fixed webview mobile view 2017-04-01 00:58:09 +01:00
Andrew Meadows
0181783290 Merge pull request #10064 from samcake/ambient 
Fix the sharp reflection happening after  pr 10036 and bugs on backend 4.1
 2017-03-31 16:04:00 -07:00
Chris Collins
b36f688a5a Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default 
use tablet-ui stylus as default, rather than avatar finger
 2017-03-31 15:34:37 -07:00
David Rowe
25ac82f162 Don't send "move" events for non-move events 2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240 Fix controls in HTML pages not responding to mouse events on tablet 2017-04-01 10:40:06 +13:00
Clément Brisset
9d0676dd87 Merge pull request #10088 from huffman/stable-merge 
Stable merge
 2017-03-31 14:27:42 -07:00
howard-stearns
5c8b2ba1c3 restore lost code 2017-03-31 13:28:14 -07:00
Seth Alves
54c66aff07 use tablet-ui stylus as default, rather than avatar finger 2017-03-31 13:18:40 -07:00
Vladyslav Stelmakhovskyi
7558765042 Script log now back to HUD 2017-03-31 14:20:15 +02:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
ZappoMan
53c439ffba add foot IK targets as actions 2017-03-30 19:11:16 -07:00
Anthony J. Thibault
22901a40c8 Expose Avatar skeletons to JavaScript 2017-03-30 17:27:40 -07:00
Ryan Huffman
150dcd7dec Merge remote-tracking branch 'upstream/master' into stable-merge 2017-03-30 14:22:27 -07:00
Howard Stearns
3056bb16a2 typo, and delete request on abort/fail 2017-03-30 12:40:54 -07:00
Triplelexx
8aa3e56ad4 remove dead code 2017-03-30 19:47:50 +01:00
Triplelexx
57d6213175 remove dead code 2017-03-30 19:42:25 +01:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
Triplelexx
ae3f04288d cleanup 2017-03-30 14:56:04 +01:00
Triplelexx
aa9a2532a9 fix for displaying "Bookmark Avatar" dialog in tablet ui 2017-03-30 13:54:33 +01:00
Triplelexx
bec70976d8 change hidden overloading 2017-03-30 12:07:19 +01:00
David Rowe
06910d1881 Add comment re scrollbar stability in tablet 2017-03-30 14:20:02 +13:00
David Rowe
f954767b84 Get entities list and entity properties scrollbars working on tablet 2017-03-30 14:04:03 +13:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
Howard Stearns
af25e0e21f Don't consider changes to location details as update-worthy if we're not discoverable. 2017-03-29 17:55:57 -07:00
Triplelexx
50e35a220b Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
Howard Stearns
3a7edebb94 Adjust reporting of availability to metaverse. 2017-03-29 16:12:50 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Delamare2112
3ebe1a0015 Add AvatarInputs::loudnessToAudioLevel 2017-03-29 14:01:27 -07:00
Howard Stearns
b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-29 13:30:15 -07:00
Delamare2112
2f6add3398 Expose LimitlessSpeechRecognition to scripts 2017-03-29 12:56:08 -07:00
Delamare2112
4f7cbd5b7c Add limitless connection and scripting interface 2017-03-29 12:47:58 -07:00
samcake
9bc7e41642 Remove extra calls for binding default textures, not needed 2017-03-29 10:57:08 -07:00
Vladyslav Stelmakhovskyi
209de29b2a Intial commit. Basically works. Need some testing 2017-03-29 17:36:05 +02:00
Howard Stearns
c795d2ca3b Four-way discoverability. (Needs testing.) 2017-03-28 18:31:08 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Triplelexx
255e781cc7 check-in after menu experiments 
https://highfidelity.fogbugz.com/f/cases/3714
 2017-03-29 00:48:14 +01:00
howard-stearns
c2a49a582e send credentials to local metaverse servers, and initial users data 
integration.
 2017-03-28 16:44:16 -07:00
Seth Alves
6df4dda746 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 11:42:14 -07:00
Seth Alves
39ec53d69a Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy 
Mark the system TabletProxy object as Cpp ownership.
 2017-03-28 10:08:05 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders 
Added inputMode property to Web3DOverlay
 2017-03-28 10:07:37 -07:00
Anthony J. Thibault
ec6ef01600 Mark the system TabletProxy object as Cpp ownership. 
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
 2017-03-28 09:53:00 -07:00
Seth Alves
b50a02ea19 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 08:16:59 -07:00
Dante Ruiz
65be71fa69 min diff 2017-03-28 00:05:02 +01:00
Dante Ruiz
7434cc5644 force vto to false on start up 2017-03-28 00:02:02 +01:00