Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 19:07:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54631 commits 25 branches 0 tags 1.1 GiB
Commit graph

17478 commits

Author SHA1 Message Date
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
howard-stearns
85347e3269 new location protocol 2017-03-27 15:55:05 -07:00
Dante Ruiz
02535722ba removed visible to others opition from general settings 2017-03-27 23:31:41 +01:00
Andrew Meadows
18544581e6 remove warnings about implicit float cast 2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f Merge pull request #10007 from hyperlogic/feature/ik-debug-draw 
Added Developer > Avatar > Show IK Targets
 2017-03-27 14:29:02 -07:00
David Kelly
5c1e085e7b Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 11:29:18 -07:00
David Kelly
76657a670c added notifications (faked user name for now), along with switch to avatar entities 2017-03-27 11:28:57 -07:00
Dante Ruiz
cba7adf32a removed qDebug 2017-03-27 19:08:41 +01:00
Dante Ruiz
f4255735a9 make login screen show up on the tablet on startup 2017-03-27 18:03:38 +01:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
Triplelexx
07e6b766b5 rename FILENAME constants 2017-03-26 23:10:50 +01:00
Triplelexx
dc64065668 Merge remote-tracking branch 'upstream/master' into 21224 
update
 2017-03-26 22:20:24 +01:00
Triplelexx
a1db20c5fc cleanup for QA 
added sorting
 2017-03-26 22:18:37 +01:00
Seth Alves
bb28976d0e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-26 09:32:35 -07:00
Triplelexx
8f507942cf change storage location 
still unsure what is best. this is consistent and doesn't require login
 2017-03-25 19:10:12 +00:00
Seth Alves
3abd6b3948 Merge pull request #10006 from druiz17/tablet-help 
Ported help into the tablet
 2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704 Merge branch 'tablet-ui' into tablet-ui-audio-screen 2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
humbletim
96f905362b alternative way to connect the button? 2017-03-25 01:17:27 -04:00
Triplelexx
d1eee19d7d move more Bookmark functionality into base class 2017-03-25 01:01:25 +00:00
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Anthony J. Thibault
49a95089d1 Remove hacks for debug rendering of IK targets 
A AnimContext class was introduced.  This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.

(cherry picked from commit a028d3ba58)
 2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3 Added developer option to draw IK targets in world. 
(cherry picked from commit 7e7803c648)
 2017-03-24 16:20:52 -07:00
Triplelexx
bda1d54209 create AvatarBookmarks 
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
 2017-03-24 22:58:36 +00:00
Dante Ruiz
6178a86a46 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-24 23:56:33 +01:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00
Anthony J. Thibault
f7de74109b Added jsdoc documentation for some of MyAvatar properties and methods 2017-03-24 15:10:26 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request #9976 from mittens/21215 
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
 2017-03-24 08:52:12 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
Anthony J. Thibault
8915ecd23d compile time option to switch from touch to mouse events for web tablet 2017-03-23 13:54:17 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Dante Ruiz
e708c6478e Merge branch 'tablet-popup' into tablet-help 2017-03-23 17:35:45 +01:00
Dante Ruiz
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Triplelexx
09cbace975 remove unused getBodyForwardDirection 2017-03-22 21:54:21 +00:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
trent
36619cd2e4 Fixed issue with duplicate physics status icons per sub-object. 2017-03-22 15:07:29 -04:00
Triplelexx
fd312f6bf8 rename fronts to forwards 2017-03-22 18:49:34 +00:00
Dante Ruiz
3a89654111 saving work 2017-03-22 19:14:53 +01:00
Triplelexx
8df0395754 change getFrontDirection to getForwardDirection 2017-03-21 22:28:12 +00:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Seth Alves
91cac892d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 14:04:58 -07:00
Chris Collins
4c789c44aa Merge pull request #9922 from birarda/bug/stuck-ess 
fix a couple of ESS issues during ES/ESS restart
 2017-03-21 12:44:53 -07:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08:00
Chris Collins
ea13151d55 Merge pull request #9945 from mnafees/21233 
21233: Remove Scripts Editor option from Edit menu and all related files
 2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi
fb0adae0b1 Scripts debug window in Tablet UI 2017-03-21 15:04:38 +01:00
Zach Pomerantz
20ea13e00a Merge pull request #9897 from zzmp/record/noise-gate 
Add AudioNoiseGate to recordings played through Interface
 2017-03-21 00:21:20 -04:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Vladyslav Stelmakhovskyi
cedc3cf8b6 Fix naming. Move variable instantiation within scope 2017-03-20 23:43:01 +01:00
Stephen Birarda
a4d72c4e67 make AudioScriptingInterface a Dependency 2017-03-20 13:40:15 -07:00
Zach Fox
6c4b23195b One-line warning fix...I swear I've done this before 2017-03-20 13:26:50 -07:00
Zach Fox
0506fc0033 New goTo() behavior; Fix goBack 2017-03-20 12:55:38 -07:00
Vladyslav Stelmakhovskyi
13cd500c2e Make runningscripts able to open even if there is no scripts running 2017-03-20 20:46:37 +01:00
Brad Hefta-Gaub
bc5d7d8698 Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 
zero velocity of deactivated dynamic entities
 2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub
af790d8474 Merge pull request #9875 from birarda/bug/spin-strafe 
fix double snap turn strafing
 2017-03-20 10:08:05 -07:00
Chris Collins
af2748410d Merge pull request #9932 from Triplelexx/21231 
21231 - Remove About Interface from File menu
 2017-03-20 09:55:57 -07:00
Chris Collins
509057c6d8 Merge pull request #9941 from Triplelexx/21232 
21232 - Remove Mini Mirror from View menu
 2017-03-20 09:55:37 -07:00
Chris Collins
ed27c550af Merge pull request #9939 from ctrlaltdavid/21237 
Disable Developer > Assets > ATP Asset Migration menu item
 2017-03-20 06:29:33 -07:00
Chris Collins
2e6291f470 Merge pull request #9929 from ctrlaltdavid/21235 
Replace Developer > Network > Disk cache editor with menu action
 2017-03-20 06:26:36 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Mohammed Nafees
3612b9fccc Remove Edit > Scripts Editor and all related source files 2017-03-20 00:25:50 -04:00
Vladyslav Stelmakhovskyi
696825580e Merge branch 'tablet-ui' into tablet-ui-login-logout 2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi
5e162a6447 Implemented login facility for tablet UI 2017-03-18 14:38:49 +01:00
Triplelexx
8e086a8fc8 fix build error 2017-03-18 03:51:55 +00:00
Triplelexx
a9b1a38665 remove Mini Mirror from View menu 
Avatar inputs only contains the audio meter now.
 2017-03-18 00:53:13 +00:00
David Rowe
ab7d82edb6 Use #ifdef instead of comment 2017-03-18 12:56:34 +13:00
David Rowe
38bb48e72c Disable Developer > Assets > ATP Asset Migration menu item 2017-03-18 12:13:13 +13:00
David Rowe
e3b9d588ec Merge branch 'master' into 21235 
# Conflicts:
#	interface/src/Menu.cpp
#	interface/src/ui/DialogsManager.h
 2017-03-18 09:42:36 +13:00
Brad Hefta-Gaub
a75acd139b Merge pull request #9885 from sethalves/model-scripting 
Model scripting
 2017-03-17 13:13:17 -07:00
Triplelexx
eba6c8de5e remove About Interface from File menu 2017-03-17 17:37:19 +00:00
Andrew Meadows
60e0eb0cf9 Merge pull request #9917 from Atlante45/fix/sit 
Cancel Avatar velocity when sitting down.
 2017-03-17 10:04:25 -07:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
David Rowe
939b4f1612 Remove Developer > Network > Disk Cache Editor menu item and dialog 2017-03-17 13:49:09 +13:00
Atlante45
5a1ce4bb05 CR 2017-03-16 17:46:47 -07:00
Atlante45
9155cc6334 Fix windows warnings 2017-03-16 17:44:56 -07:00
David Rowe
e21d7d9edf Add Developer > Network > Clear Disk Cache menu action 2017-03-17 13:34:11 +13:00
David Rowe
dc71f502f0 Delete Developer > Network > RAM Caches Size menu item and dialog 2017-03-17 13:09:06 +13:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Atlante45
42316e713d CR drive keys 2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878 CR 2017-03-16 16:24:36 -07:00
Atlante45
7517f224a8 Add MyAvatar drive keys capture capability 2017-03-16 15:44:17 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Andrew Meadows
6f4d9bfba3 Merge pull request #9858 from kunalgosar/logBolding 
Change to Log Font and Formatting
 2017-03-16 13:09:37 -07:00
Zach Fox
b3821bb02d fix location vs AddressManager woes 2017-03-16 12:57:21 -07:00
Seth Alves
eba2417f41 Merge pull request #9912 from AndrewMeadows/model-cleanup-4 
minor cleanup of render pipeline for models and avatars
 2017-03-16 10:39:43 -08:00
kunalgosar
e7a16d4294 code standard fixes 2017-03-16 10:53:35 -07:00
Zach Fox
05fec328c0 Make tablet popups work like they should 2017-03-16 10:38:46 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
Andrew Meadows
361e03fc78 remove unused variable 2017-03-15 16:57:31 -07:00
Seth Alves
693aee0628 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-15 16:54:40 -07:00
howard-stearns
84fd17bd88 use location.metaverseServerUrl instead of hardcoded value. 2017-03-15 16:33:23 -07:00
Andrew Meadows
d3fa28d4bc remove cruft and fix indentation 2017-03-15 16:17:59 -07:00
howard-stearns
155e1b8e85 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 15:45:36 -07:00
Andrew Meadows
f250c0d298 simpler bindTransform() for ModelMeshPartPayload 2017-03-15 14:41:13 -07:00
Vladyslav Stelmakhovskyi
a4c0ce4240 Typo fix 2017-03-15 22:13:37 +01:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Seth Alves
b66ff19595 prefer-avatar-finger-over-stylus setting now defaults to true 2017-03-15 09:51:30 -08:00
Anthony Thibault
495deba771 Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races 
Fixes for race conditions in DebugDraw
 2017-03-15 10:38:26 -07:00
Zach Pomerantz
789bb7c855 rename audio(Mic)OutboundPPS 2017-03-15 13:30:39 -04:00
Seth Alves
c53b0dff93 Merge pull request #9891 from druiz17/tablet-xbox-fix 
Allow the user to bring up the tablet when a message is open
 2017-03-15 08:43:28 -08:00
Seth Alves
563d59bda9 Merge pull request #9886 from vladest/tablet-ui-entity-statistics 
Tablet ui entity statistics
 2017-03-15 08:40:52 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Vladyslav Stelmakhovskyi
181c7da51a Fixed warnings 2017-03-15 14:55:53 +01:00
Dante Ruiz
45829574c2 Allow the user to bring up the tablet when a message is open in the tablet 2017-03-15 00:02:42 +01:00