Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 22:01:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77579 commits 72 branches 59 tags 1.2 GiB
Commit graph

4752 commits

Author SHA1 Message Date
Wayne Chen
0edbf12fa3 removing extra onLevelChanged 2019-03-22 15:26:57 -07:00
Wayne Chen
1f71a291a5 displaying offset values 2019-03-22 14:54:18 -07:00
Wayne Chen
554a144b0e adding tool to change avatar inputs properties 2019-03-22 14:54:17 -07:00
Wayne Chen
584fa1f17b more wip 2019-03-22 14:54:17 -07:00
Wayne Chen
6cf8b06c6d more wip on adding qml to adjusting ui position 2019-03-22 14:54:16 -07:00
Wayne Chen
d0116abc52 separating out bubble icon qml - adding support for transparency 2019-03-22 14:54:13 -07:00
Wayne Chen
cd7b6e7ed0 moving file as MicBarApplication 2019-03-22 14:50:12 -07:00
Wayne Chen
84fcd50b3b adding user speaking level rotated vertically and muted symbol 2019-03-22 14:49:11 -07:00
Wayne Chen
48b4fe37b4 don't display gated state 2019-03-22 14:35:01 -07:00
Wayne Chen
db6bf46ee7 adding more opacity, cleanup 2019-03-22 14:33:54 -07:00
Wayne Chen
8e8ceaac47 moving file as MicBarApplication 2019-03-22 14:21:24 -07:00
Wayne Chen
d063882d37 adding user speaking level rotated vertically and muted symbol 2019-03-22 14:18:19 -07:00
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -07:00
Wayne Chen
5b6ce8736d adding new icons with gated icon 2019-03-22 14:16:28 -07:00
Wayne Chen
811fa8dcb2 allowing bubble icon to toggle 2019-03-22 14:16:28 -07:00
Wayne Chen
087f613d60 fixing muted text 2019-03-22 14:16:28 -07:00
Wayne Chen
835153c0df don't display gated state 2019-03-22 14:16:28 -07:00
Wayne Chen
e129201d2a adding more opacity, cleanup 2019-03-22 14:16:27 -07:00
Wayne Chen
ddacc0ee60 bubble icon opacity to 0.3 2019-03-22 14:16:27 -07:00
Wayne Chen
3ceb1598f6 adding working bubble icon 2019-03-22 14:16:27 -07:00
Wayne Chen
915d22bb15 adding bubble icon (not working) 2019-03-22 14:16:27 -07:00
Wayne Chen
1ba366c0d7 moving file as MicBarApplication 2019-03-22 14:16:27 -07:00
Wayne Chen
0def39dbaa adding user speaking level rotated vertically and muted symbol 2019-03-22 14:16:27 -07:00
Roxanne Skelly
efffb8b819
Merge pull request #15239 from roxanneskelly/Case20617 
Case 20617 - People app filter bar breaks when deleting connections
 2019-03-22 11:31:46 -07:00
Shannon Romano
9f19ee61e2
Merge pull request #15236 from howard-stearns/termsofservice 
update terms of service links
 2019-03-21 19:35:34 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio 
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
 2019-03-21 18:03:58 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui 
Case 21771: Possible Entity Scipt Ban Incident
 2019-03-21 13:10:54 -07:00
Roxanne Skelly
87d75ec75c Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
Howard Stearns
5888adfd90 update terms of service links 2019-03-20 17:08:42 -07:00
Roxanne Skelly
3775633cc3 Case 20407 - Pay-In API doesn't display error when no username specified 2019-03-20 15:29:13 -07:00
Shannon Romano
e256c34823
Merge pull request #15191 from roxanneskelly/Case21467 
Case 21728 - tab in marketplace search bar causes an update of search results
 2019-03-20 14:22:10 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025 
Case 21025 conditionalizing TabletWebView features
 2019-03-20 14:21:37 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393 
Case20393 - Add item counts to interface categories
 2019-03-19 17:53:30 -07:00
Roxanne Skelly
27fa0dc4c6 CR fixes 2019-03-19 17:24:19 -07:00
Roxanne Skelly
ab61f65ea2 CR fix 2019-03-19 17:08:04 -07:00
Roxanne Skelly
94739aa7c7 Case 21769 - updatable items not showing up as updatable 
after clicking 'show updates' button.
 2019-03-19 13:44:16 -07:00
Roxanne Skelly
b6e583087e Stand-alone Tagging: tagged places not coming first in GOTO list 2019-03-18 17:40:01 -07:00
Roxanne Skelly
fe28eaca7c fix typo 2019-03-18 11:23:48 -07:00
Wayne Chen
db22fa9eec show up audio screen using Settings > Audio 2019-03-18 09:23:17 -07:00
danteruiz
5f3e31b119 add ui to kick api 2019-03-15 18:15:18 -07:00
Thijs Wenker
714115adef - Video, and new Docs url in QML 2019-03-16 02:09:01 +01:00
Roxanne Skelly
9182db8bd4 Case 21025 conditionalizing TabletWebView features 2019-03-15 12:56:43 -07:00
Roxanne Skelly
b220b76874 Merge branch 'master' of https://github.com/highfidelity/hifi into Case21467 2019-03-14 13:05:08 -07:00
Roxanne Skelly
f971d17acc Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-14 12:36:42 -07:00
Roxanne Skelly
4470cf9ae5 Marketplace category dropdown UI tweaks 2019-03-14 12:35:54 -07:00
Wayne Chen
10eae54d8c changing content height and snap mode to allow scroll 2019-03-14 12:08:08 -07:00
Wayne Chen
a3dfd09e26 adding scrolling in audio settings window 2019-03-13 17:03:53 -07:00
Roxanne Skelly
c3ecc29c4b Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-13 16:04:34 -07:00
Roxanne Skelly
559351a6eb Case 21701 - Items were showing up in marketplace as "updates" when they 
weren't
 2019-03-13 15:33:46 -07:00
Roxanne Skelly
42bf812019 Case 21704 - marketplace button formatting fixes 2019-03-13 15:03:29 -07:00
Roxanne Skelly
822e5ceb98 Case 21703 - Disable SUBMIT before balance is retrieved 
to prevent sending a send-money request with too large
of a balance
 2019-03-13 13:42:55 -07:00
Roxanne Skelly
2dc38df779 Case 20393 - Display item counts in categories dropdown in Marketplace 2019-03-13 10:17:39 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
Wayne Chen
6b82b8cd7f fix for steam complete profile bug 2019-03-12 17:55:14 -07:00
Shannon Romano
95bdf29f35
Merge pull request #15151 from roxanneskelly/Case20622 
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
 2019-03-12 17:42:47 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
80821e8b7e changing mic bar indicator when muted in PTT 2019-03-11 16:15:47 -07:00
Wayne Chen
ca5ff3381b changing position of the mute warning setting 2019-03-11 16:02:18 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Roxanne Skelly
c9cb284c19 Case 21467 - only update search when search field content has changed 2019-03-11 14:33:00 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero 
Case 21639: RC81: Adding Hero support in simulation of avatars
 2019-03-11 14:13:49 -07:00
r3tk0n
8aedc98a58 Fix QML formatting issue. 2019-03-11 10:54:48 -07:00
r3tk0n
c1ed01115d Fix logic for HMD vs Desktop. 2019-03-11 09:58:35 -07:00
Wayne Chen
cf3694e8e3 fixing error in master + getting ptt to show up 2019-03-10 19:00:41 -07:00
Wayne Chen
15eb90f634
Merge pull request #16 from wayne-chen/pttSwitchToItem 
fixng ptt checkbox
 2019-03-10 17:18:47 -07:00
Wayne Chen
54973375a4 fixng ptt checkbox 2019-03-10 17:18:18 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Wayne Chen
2eaa1e63d3 switch from column layout to item 2019-03-10 17:07:02 -07:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Roxanne Skelly
74320fe7be Case 20622 - Qml Marketplace - Fix categories dropdown UI issues 2019-03-08 17:24:43 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
88d8163b04 updating compile failure + icons/settings update 2019-03-08 16:07:46 -08:00
Wayne Chen
39db3979b9 changing text display 2019-03-08 16:07:09 -08:00
Wayne Chen
cb0fdd2ef2 laying groundwork for audio app + fixing deadlocks 2019-03-08 16:06:45 -08:00
r3tk0n
88a125aff0 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
8a5924077a changing text display 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Shannon Romano
c3b8f6ed93
Merge pull request #15145 from roxanneskelly/StandaloneTags 
Case 21642 - verification dialog when user hits return in goto search
 2019-03-08 15:29:34 -08:00
Howard Stearns
1d52ed1524
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox 
do not scroll inventory items underneath modal dialog
 2019-03-08 15:27:44 -08:00
Howard Stearns
fac162c2bc
Merge pull request #15144 from howard-stearns/about-blockchain 
Change "about" blockchain from Elements to EOS
 2019-03-08 15:17:31 -08:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers 
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
 2019-03-08 14:56:56 -08:00
Roxanne Skelly
b3f5d76d0f CR Fix 2019-03-08 14:37:15 -08:00
Howard Stearns
8791252acd do not scroll inventory items underneath modal dialog 2019-03-08 14:27:56 -08:00
Roxanne Skelly
88a4b5c983 Case 21642 - verification dialog when user hits return in goto search 
text entry+return should throw up verification dialog for first time to
non-optimized domain
 2019-03-08 14:01:47 -08:00
Howard Stearns
24b08bd25d Change "about" blockchain from Elements to EOS 2019-03-08 13:59:16 -08:00
Roxanne Skelly
70cc6594c7 CR fixes 2019-03-08 12:43:43 -08:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
Roxanne Skelly
750dbfae21 Stand-alone Tags: Throw up popup for first unoptimized domain 
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
 2019-03-08 10:48:42 -08:00
Shannon Romano
ef44218fe3
Merge pull request #15128 from roxanneskelly/case21315etc 
Case 21315, Case 21326, Case 21370
 2019-03-08 08:37:23 -08:00
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370 
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
 2019-03-07 13:58:51 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Howard Stearns
8ebab88613 Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master 2019-03-06 13:08:19 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus 
Case 21340: avatar doctor project page status
 2019-03-06 12:36:18 -08:00
Howard Stearns
ddfd437696 ensure error message when marketplace update fails 2019-03-06 11:37:17 -08:00
Howard Stearns
366dd935dd trading in has nothing to do with whether you own the new item 2019-03-06 11:36:34 -08:00
Howard Stearns
416cde4c1f fix uses of updated_item_id that got lost 2019-03-06 11:36:08 -08:00