Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 10:36:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53231 commits 76 branches 59 tags 1.2 GiB
Commit graph

1702 commits

Author SHA1 Message Date
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
Vladyslav Stelmakhovskyi
209de29b2a Intial commit. Basically works. Need some testing 2017-03-29 17:36:05 +02:00
Vladyslav Stelmakhovskyi
9822193644 Set z-order of comboboxes to make sure lowest will no overlap higher ones 2017-03-29 14:41:18 +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
Dante Ruiz
a76e5ef8d9 improve the design of the tablet goto 2017-03-28 23:02:23 +01:00
Zach Fox
fce2049630 Trivial removal of commented code 2017-03-27 16:45:03 -07:00
Seth Alves
48ea9acfb3 Merge pull request #10016 from druiz17/tablet-goto 
Porting goto to the tablet
 2017-03-27 10:04:11 -08:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
Dante Ruiz
b8eac7abef revoming useless code 2017-03-27 16:17:50 +01: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
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Dante Ruiz
2a59139c76 trying to fix focus issue 2017-03-25 01:17:37 +01:00
Dante Ruiz
9e2768cc84 saving work 2017-03-25 01:06:21 +01:00
Dante Ruiz
119a71d0d1 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto 2017-03-24 23:55:18 +01:00
Dante Ruiz
d9046a1982 goto on the tablet 2017-03-24 23:54:54 +01: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
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
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
Zach Fox
3f95982f34 Fix bug due to incorrect merge... 2017-03-23 14:00:50 -07:00
Zach Fox
98ee02f84f Use OpacityMask instead of hack; fix connectionsTab 2017-03-23 10:49:31 -07:00
Zach Fox
a7623dcac8 Use OpacityMask instead of hack; fix connectionsTab 2017-03-23 10:48:44 -07:00
Dante Ruiz
ae111ff2e9 Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto 2017-03-23 18:25:31 +01: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
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Zach Fox
692ef369c7 Attempted Stale PAL fix - hard to test! 2017-03-22 15:14:11 -07: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
Zach Fox
bf191eabb7 Some new stale PAL behavior 2017-03-22 13:35:48 -07:00
Triplelexx
2515563a0b change getFront to getForward 2017-03-21 22:35:07 +00:00
Zach Fox
058faa8c0f Row color bugfix 2017-03-21 10:03:51 -07:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08: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
Zach Fox
29e97381eb PAL open, user leaves, gray out row 2017-03-20 17:20:28 -07:00
Faye Li
9cab8b6c4a end of day commit 2017-03-20 17:04:29 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Faye Li
1d095b8158 added back forward and back button on nav bar 2017-03-20 15:57:59 -07:00
Faye Li
b6bf58d5be rearrange layout of main tablet go to screen 2017-03-20 15:28:30 -07:00
Zach Fox
d16acc5a7f Stale PAL Notification 2017-03-20 15:24:49 -07:00
Zach Fox
0506fc0033 New goTo() behavior; Fix goBack 2017-03-20 12:55:38 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Seth Alves
f48557b06b Merge pull request #9943 from vladest/tablet-ui-login-logout 
Tablet ui login logout
 2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi
5335bf8862 Menu items in Tablet UI now wrapped 2017-03-18 15:58:16 +01: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
a9b1a38665 remove Mini Mirror from View menu 
Avatar inputs only contains the audio meter now.
 2017-03-18 00:53:13 +00:00
Faye Li
33a7ff825e indicate expecting json file on button text 2017-03-17 11:37:38 -07:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
David Rowe
07e4b0ce41 Fix title menu icon getting stuck on white 2017-03-17 11:28:14 +13:00
David Rowe
069e66b875 Fix stack functions 2017-03-17 11:19:50 +13:00
David Rowe
f1947769d6 Fix tablet settings dialogs' titles and make QML consistent 2017-03-17 11:15:56 +13:00
Zach Fox
b3821bb02d fix location vs AddressManager woes 2017-03-16 12:57:21 -07:00
Zach Fox
05fec328c0 Make tablet popups work like they should 2017-03-16 10:38:46 -07:00
David Rowe
1080e21afd Tidying 2017-03-16 19:28:28 +13:00
David Rowe
89eb073855 Fix dialog height changing as drop-down value is changed 2017-03-16 19:28:12 +13:00
David Rowe
74db9dc573 Fix drop-down hiding behind buttons 2017-03-16 19:27:47 +13:00
David Rowe
3c1506237a Fix not all warning text displaying 2017-03-16 19:27:27 +13:00
David Rowe
7efda8bead Make clicking on dialog background defocus current control 2017-03-16 19:27:06 +13:00
David Rowe
9e458fd180 Fix keyboard in tablet custom query dialog 2017-03-16 19:26:41 +13:00
Faye Li
10ebb6efd7 simplify asset server button 2017-03-15 16:55:21 -07:00
Faye Li
42216b6986 create import entities button on create tab 2017-03-15 16:47:31 -07:00
howard-stearns
84fd17bd88 use location.metaverseServerUrl instead of hardcoded value. 2017-03-15 16:33:23 -07:00
howard-stearns
c0c92fd8d1 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 15:20:28 -07:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Zach Fox
786180291b Bugfixes and improvements 2017-03-15 11:46:33 -07:00
Zach Pomerantz
789bb7c855 rename audio(Mic)OutboundPPS 2017-03-15 13:30:39 -04: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
df82c30e83 Merge pull request #9892 from hyperlogic/bug-fix/tablet-running-scripts-improvements 
Tablet Running Scripts dialog fixes
 2017-03-15 08:38:40 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
howard-stearns
6c88bc98b4 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 09:24:30 -07:00
Zach Fox
0a6bcd7fca Massive performance boost 2017-03-14 16:24:06 -07:00
Anthony J. Thibault
3a788d31de Tablet Running Scripts dialog fixes 
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable.  We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
  The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
 2017-03-14 15:38:53 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
Dante Ruiz
4c686eaa67 fix tablet menu stack focus issue 2017-03-14 21:20:41 +01:00
Vladyslav Stelmakhovskyi
e2a4011b05 Coloring implemented 2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077 Servers stats added. TODO: coloring 2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi
d9ca8a826d TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats 2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi
99c74cec41 Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi
0accce5337 TabletComboBoxPreference.qml not needed anymore 2017-03-14 15:53:41 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca Merge branch 'tablet-ui' into tablet-ui-graphics 2017-03-14 15:37:36 +01:00
Seth Alves
c89a4c4786 Merge pull request #9874 from hyperlogic/bug-fix/toolbar-fade 
Fix for visible empty toolbar when switching from desktop to HMD mode.
 2017-03-14 05:33:54 -08:00
Seth Alves
f8a6a82371 Merge pull request #9881 from ctrlaltdavid/21197 
Browse for avatar in Marketplace from tablet avatar settings dialog
 2017-03-14 05:33:11 -08:00
David Rowe
43687d4773 Tidying 2017-03-14 21:41:04 +13:00
David Rowe
d141d5b683 Add keyboard 2017-03-14 21:36:57 +13:00
David Rowe
f3a99a2437 Implement avatar browser for tablet avatar settings 2017-03-14 15:36:51 +13:00
David Rowe
2e96b8a59b Merge branch 'tablet-ui' into 21197 2017-03-14 14:47:22 +13:00
Zach Fox
e3d0842ddc Implement browser in PAL 2017-03-13 18:39:47 -07:00
David Rowe
7504c124e4 Make attachment model browser dialog modal 2017-03-14 13:34:06 +13:00
David Rowe
01c313ad60 Fix QML errors 2017-03-14 13:33:20 +13:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Anthony J. Thibault
40b7e34c0b Fix for visible empty toolbar when switching from desktop to HMD mode. 2017-03-13 14:23:13 -07:00
Zach Fox
d04b1da1c2 Merging from PAL_v2_Zach 2017-03-13 12:54:01 -07:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209 
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-14 08:50:01 +13:00