Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53444 commits 75 branches 59 tags 1.2 GiB
Commit graph

19875 commits

Author SHA1 Message Date
Chris Collins
1175f65cb0 Merge pull request #10162 from vladest/goto-white-buttons-fix 
Check if offset outside image, set to last image
 2017-04-07 15:58:48 -07:00
David Kelly
948a821824 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 14:30:22 -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
David Kelly
174b2978e3 username stays around now when tabbing to connections 2017-04-07 14:01:36 -07:00
Howard Stearns
57d8ec883e Merge pull request #10163 from davidkelly/dk/3938 
updated availability combo dialog
 2017-04-07 13:57:17 -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
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
David Kelly
870e003311 Scattered X glyphs around the letterbox and combo dialogs 2017-04-07 11:12:54 -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
Vladyslav Stelmakhovskyi
a1892b351f Cant use underscores outside class internals 2017-04-07 19:40:46 +02:00
David Kelly
ee9bc0bfa4 updated availability combo dialog 2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi
9a563ba02f Check if offset outside image, set to last image 2017-04-07 19:17:09 +02: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
David Kelly
12b5b91754 Merge pull request #10161 from howard-stearns/fix-pal-connections-help 
fix pal connections-tab help trigger
 2017-04-07 09:34:11 -07:00
Howard Stearns
468cc7f19b Merge pull request #10150 from davidkelly/dk/3930 
friends checkbox speedup
 2017-04-07 09:27:39 -07:00
David Kelly
cb092d67dd Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 09:01:59 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
Vladyslav Stelmakhovskyi
f88ba7bc57 Yahoo, Reddit etc now works correctly 2017-04-07 15:45:33 +02:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column 
fix sorting by pal connections-tab friends column
 2017-04-06 15:43:21 -07:00
David Kelly
179a445f59 updated connection instructions 2017-04-06 15:21:10 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936 
pal selection changes
 2017-04-06 14:58:46 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -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
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
David Kelly
46a7d28e16 Merge pull request #10144 from howard-stearns/notice-login-change-in-pal 
notice login/logout change in pal
 2017-04-06 12:57:22 -07:00
David Kelly
e0a1422345 pal selection changes 2017-04-06 12:07:51 -07:00
samcake
19d080c4cc Merging 2017-04-06 11:33:41 -07:00
howard-stearns
1d60a55d5f notice login/logout change in pal 2017-04-06 11:20:08 -07:00
David Kelly
85c78da839 updated, plus fixed some annoying errors in logs from Pal.qml 2017-04-06 11:16:51 -07:00
Vladyslav Stelmakhovskyi
16fa7988f6 TabletWebView redesigned to single WebView instance 2017-04-06 17:53:46 +02:00
Triplelexx
f588612fc3 add audioPacketLoss % display in stats 2017-04-06 16:04:14 +01:00
David Kelly
06bd9c97bf remove info button from avatar image 2017-04-05 18:21:54 -07:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
Dante Ruiz
5bb4edf18c Merge branch 'master' of github.com:highfidelity/hifi into goto-fix 2017-04-06 00:16:59 +01:00
Dante Ruiz
90f5d02c99 goto toggle option 2017-04-06 00:13:53 +01:00
samcake
1a9005ed8b Avoid unexpected changes 2017-04-05 13:57:40 -07:00
samcake
8356e5495f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-05 13:12:21 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
24b89275f2 fix new model dialog textInput 2017-04-05 18:00:43 +01: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
Howard Stearns
b0fa784267 Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach 
Dk/pal improvements mostly zach
 2017-04-04 10:03:10 -07:00
David Kelly
08ac25473f wording change 2017-04-04 09:53:09 -07:00
Ryan Huffman
8b6dd2a835 Change default avatar to ball and stick avatar 2017-04-04 09:39:06 -07:00
Vladyslav Stelmakhovskyi
367555acdb Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set 2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi
332f9bb283 Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error 2017-04-04 16:22:40 +02: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
David Kelly
4d6886d1f4 cr feedback, plus changed 'People' to 'Connections' in a couple places 2017-04-03 17:03:14 -07:00
Seth Alves
cb787c2862 Merge pull request #10104 from druiz17/tablet-webView3.0 
Remove unnecessary prints and code for tabletWebView.qml
 2017-04-03 16:10:54 -07: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
d1827cf12c Merge pull request #10002 from fayeli/tablet-photobooth 
Photobooth Improvements: Using Tablet & Ability to Rotate Model
 2017-04-03 16:05:13 -07:00
David Kelly
4629accc9c style updates 2017-04-03 15:35:53 -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
David Kelly
2f1b6be24d Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi 2017-04-03 10:55:55 -07:00
Dante Ruiz
3090629f77 clean up code 2017-04-03 18:51:39 +01: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
Vladyslav Stelmakhovskyi
990e1379e3 Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task 
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
 2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi
156166ce4a Fixed another warning in TabletAddressDialog.qml 
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
 2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi
9e96888534 Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown' 
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
6b7f3f7125 Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time. 
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
849d65f95f Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null 
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
 2017-04-03 19:32:09 +02: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
Vladyslav Stelmakhovskyi
d207dae5b7 Put current address to location instead of inputfield 2017-04-02 20:02:40 +02: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