Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 23:38:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71755 commits 69 branches 57 tags 1.2 GiB
Commit graph

3994 commits

Author SHA1 Message Date
Alexander Ivash
877bce23d2 explicitely specify localRotations on joint change, otherwise it will be updated by engine 2018-08-18 16:32:31 +03:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable 
Use Create Entities as Grabbable option when adding asset to world
 2018-08-16 09:22:23 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll 
Auto scroll
 2018-08-14 20:56:53 -07:00
Roxanne Skelly
50b0a458ce Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled. 2018-08-14 16:32:56 -07:00
Roxanne Skelly
5a8da4ce97 Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app 2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll 2018-08-14 15:27:22 -07:00
Ryan Huffman
19f27ec911
Merge pull request #13810 from ctrlaltdavid/M11360 
Don't auto-action entry in HMD file dialog when single-click
 2018-08-14 12:57:28 -07:00
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208 
Improve text in Avatar app's pop-ups
 2018-08-14 08:48:04 -07:00
unknown
c622a587e3 Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-11 07:59:56 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340 
Only update gain if it really changed
 2018-08-10 16:20:24 -07:00
Zach Fox
096be16bb1 Only restart timer if feedMouseArea doesn't contain mouse 2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c PropagateComposedEvents 2018-08-10 15:30:32 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges 
New Default Strafe Animations Plus Animation Tuning Support
 2018-08-10 15:03:30 -07:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
David Rowe
3a356de49f Don't auto-action entry in HMD file dialog when single-click on it 2018-08-11 09:46:11 +12:00
Alexander Ivash
c1ebadfdd8 adjust text in 'get wearables' popup 2018-08-11 00:43:39 +03:00
unknown
5d1cc3696a Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 12:10:57 -07:00
Alexander Ivash
9b9e30e829 add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD 2018-08-10 20:14:15 +03:00
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -07:00
Zach Fox
e39dd250cd Things will 'just work' once backend is in place 2018-08-10 10:01:09 -07:00
Zach Fox
1699d3ed6a Wording change in Availability 2018-08-10 09:35:40 -07:00
Alexander Ivash
3bfe173371 allow saving wearables right after adding new one 2018-08-10 19:15:35 +03:00
Alexander Ivash
9304d6c5c4 reset UI to default state & disable controls on removing last wearable 2018-08-10 18:42:08 +03:00
Alexander Ivash
90fb0d7be6 add possibility to add wearable from external url 2018-08-10 17:59:11 +03:00
Alexander Ivash
9234813e08 bring back 'get more' wearables button 2018-08-10 14:54:15 +03:00
Alexander Ivash
1771e4c742 better handling of 'modified' inside AdjustWearables dialog 2018-08-10 12:58:45 +03:00
Alexander Ivash
e900e034a3 couple Spinbox fixes: 
- stop resetting value in 'valueFromText'. The issue with such approach is that is is not possible to understand whether value was really changed or, for example, focus did change
- instead, propagate validator to TextInput which makes not possible to type bad text (which eliminate the reason for original fix)
- specify correct inputMethodHints to guide onscreen keyboards
 2018-08-10 12:58:45 +03:00
Alexander Ivash
56194bba8e bind 'is soft' to backend API, always show 'Hips' for soften entity 2018-08-10 12:58:45 +03:00
Alexander Ivash
da68a8906e show displayText if specified (to allow override combobox current value) 2018-08-10 12:58:45 +03:00
Alexander Ivash
550e39ac84 add possibility to change joints using combobox 2018-08-10 12:58:45 +03:00
Alexander Ivash
f8c1ba48ad update UI accordingly to the updated mockup 2018-08-10 12:58:44 +03:00
Alexander Ivash
a85ed2a2f5 show 'edit wearables' button even if avatar doesn't have any wearables 2018-08-10 12:58:44 +03:00
David Kelly
3b7d1cb6cf Only update gain if it really changed 
and only fire UserActivity if we really do change the gain
 2018-08-09 14:55:07 -07:00
Zach Fox
c0e2b3a240 Happening Now -> Featured 2018-08-09 11:49:29 -07:00
Zach Fox
4248f342b4 Fix MS17469: Fix conditionals for needing more paginated results when ListView changes 2018-08-09 10:22:09 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
Zach Fox
af9dc8acca Turn on only for Annoucements 2018-08-07 11:51:38 -07:00
Zach Fox
4cee6b720a Implement auto-scrolling on Places cards (TODO for Connections) 2018-08-07 11:50:38 -07:00
amantley
08889b627a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-06 09:16:53 -07:00
John Conklin II
00a8b73814
Merge pull request #13751 from danteruiz/fix-flying 
fix flying
 2018-08-03 19:27:47 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
David Rowe
f9d9324a14 Improve text in Avatar app's pop-ups 2018-08-04 10:55:57 +12:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a 
Don't allow Web surfaces created by non-client scripts to access files
 2018-08-03 15:25:41 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
Zach Fox
7905c91289
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing 
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
 2018-08-01 14:23:26 -07:00
John Conklin II
c444bb11ba
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit 
Avatarapp: base 'SquareLabel' on button from Uit
 2018-08-01 13:10:33 -07:00
John Conklin II
082a3bca89
Merge pull request #13679 from ElderOrb/FB16840 
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
 2018-08-01 11:46:59 -07:00
John Conklin II
bda9ed7f1a
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix 
use 'light' color scheme
 2018-08-01 11:23:10 -07:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -07:00
Alexander Ivash
6e6eae2160 Avatarapp: base 'SquareLabel' on button from Uit 2018-07-31 22:03:34 +03:00
John Conklin II
09d1964f1d
Merge pull request #13670 from ElderOrb/animate_get_more_avatars 
Avatarapp: hover animation for 'get more avatars' button
 2018-07-31 09:51:58 -07:00
John Conklin II
221dd3ee88
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes 
FB16992 - Layout changes to the two lightboxes in the Avatar app
 2018-07-31 09:36:16 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -07:00
amantley
637a214165 added the anim stack print out static object for the list of motion and weights 2018-07-27 17:25:00 -07:00
John Conklin II
9c37e30fe6
Merge pull request #13678 from ElderOrb/FB17023 
FB17023 - Make visible avatar url in the avatar app
 2018-07-27 14:57:25 -07:00
amantley
b28ce40f09 adding the anim stack print out feature half way done 2018-07-27 08:46:40 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
amantley
91b9865f27 Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-07-24 17:14:24 -07:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
Alexander Ivash
c9d9f7363a use 'light' color scheme 2018-07-24 23:19:11 +03:00
Alexander Ivash
dfb20c4afc FB16840 - Qml spinboxes in UI toolkit should focus the underlying field when clicked on 2018-07-24 23:02:06 +03:00
Alexander Ivash
c13f27e2eb FB17023 - Make visible avatar url in the avatar app 2018-07-24 22:10:18 +03:00
amantley
aa92865b21 added the code to display the alphas for the motion blends 2018-07-23 17:45:24 -07:00
howard-stearns
48184c102b Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad pal refresh that remembers your place 2018-07-23 15:25:06 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings 
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
 2018-07-23 15:19:46 -07:00
Alexander Ivash
e12569c747 FB16992 - Layout changes to the two lightboxes in the Avatar app 2018-07-23 23:24:17 +03:00
Alexander Ivash
091de4a9b5 Avatarapp: hover animate 'get more avatars' 2018-07-23 22:33:47 +03:00
amantley
962f3c6c53 added a placeholder for the animation stack stats that will be added 2018-07-20 14:16:20 -07:00
MuteTab
97e5d65592 Added conditional check for VR vs non-VR menu. 2018-07-19 14:30:06 -07:00
Qliemillar
566c837bba
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix 
fix 'the drop down does not shows the wearable'
 2018-07-19 12:23:48 -06:00
Wayne Chen
37131d75e9
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537 
MS16537: Updating "Forgot Username/Forgot Password" behavior
 2018-07-18 16:32:55 -07:00
howard-stearns
0a47672d64 machinery for fetching next page of inifinite scroll before it really 
needed, and use in our infinite scrolls
 2018-07-18 13:00:03 -07:00
Alexander Ivash
fe96ad2389 fix 'the drop down does not shows the wearable' 2018-07-18 21:16:47 +03:00
Wayne Chen
0cbcae9181 reverting onLinkActivated brackets 2018-07-18 10:44:37 -07:00
Zach Fox
919bfce7ab Simplify 2018-07-18 09:00:01 -07:00
Wayne Chen
3b7f88a4a8 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-17 17:08:43 -07:00
Zach Fox
ef4265de4b Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button 2018-07-17 16:16:43 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup 
Fix MS16562: Massive PAL speedup!
 2018-07-16 16:45:01 -07:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
John Conklin II
33fb759c0a
Merge pull request #13599 from danteruiz/fix-combobox 
fixing combo boxes
 2018-07-13 10:33:33 -07:00
Zach Fox
2da911ad84 Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup 2018-07-13 09:47:49 -07:00
Zach Fox
04f856019d Fix MS16701: Uninstall installed app before updating 2018-07-12 16:27:19 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
Wayne Chen
089831b6ee Adding potential fix 2018-07-12 14:15:16 -07:00
Dante Ruiz
1c64ebc3ca fixing combo boxes 2018-07-12 13:57:48 -07:00
Sam Gondelman
2597568a0a
Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls 
Rollback PR 12888 by deleting alternative +android files
 2018-07-12 12:06:35 -07:00
Cristian Luis Duarte
b1d39e4959 Rollback PR 12888 by deleting alternative +android files 2018-07-11 21:21:12 -03:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze 
Fix haze on Mac (bug #15515)
 2018-07-11 20:04:22 +02:00
howard-stearns
8b713a437f don't store undefined in a qml int. 2018-07-10 12:14:31 -07:00
howard-stearns
886df959d1 expose totalPages and totalEntries, and use the later to display 
connections count
 2018-07-10 11:26:23 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows 
Create App: Native windows
 2018-07-09 14:25:13 -07:00
Alexander Ivash
425209189d reduce precision 2018-07-07 03:03:24 +03:00
Alexander Ivash
7feb9910c9 use rotation degrees instead of quaternions for comparison 
re-query entity properties after editing it to get actual changes
 2018-07-07 02:36:19 +03:00
Alexander Ivash
4716be01f6 eliminate binding loop which could lead to not updating spinbox UI 2018-07-07 02:36:19 +03:00
Alexander Ivash
536395d199 only compare properties which exist for both objects in 'numeric comparer' 
note: this is attempt to quick-n-dirty workaround weird issue with having colors informaiton inside 'dimensions' in the latest master

example:

 "blue": 0.2367398738861084,
   "green": 0.08945406973361969,
   "red": 0.25246158242225647,
   "x": 0.25246158242225647,
   "y": 0.08945406973361969,
   "z": 0.2367398738861084
 2018-07-07 02:36:19 +03:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
Thijs Wenker
4b2e0765db - cleanup (parent) signals InteractiveWindow after window is closed 2018-07-06 20:24:43 +02:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Thijs Wenker
eed1f66e71 Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-06 20:01:48 +02:00
Alexander Ivash
67fb8af87c update avatarapp on avatar switch 2018-07-06 21:00:56 +03:00
Alexander Ivash
e943a607b0 'Wear wearable' => 'Wear wearables' (from QA feedback) 2018-07-06 21:00:56 +03:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
68041dc93c get rid of TextStyle1..11 per request from Dante 2018-07-06 21:00:55 +03:00
Alexander Ivash
9b5135b66b remove debug outputs per Dante's request 2018-07-06 21:00:55 +03:00
Alexander Ivash
48fc81b082 Buy wearables from Marketplace [new line] 
Wear wearable from My Purchases [new line]
 2018-07-06 21:00:55 +03:00
Alexander Ivash
a9f10b2305 avatarisland link should direct to 11.5848,-8.10862,-2.80195 2018-07-06 21:00:55 +03:00
Alexander Ivash
12c0292595 experimental fix for Mukul's issue 2018-07-06 21:00:55 +03:00
Alexander Ivash
e4d6528ab9 fix trashcan overlay over 'guy-in-circle' 2018-07-06 21:00:55 +03:00
Alexander Ivash
41a9b22bf6 long text truncation 2018-07-06 21:00:55 +03:00
Alexander Ivash
8d921b123d The new layout from zeplin (https://zpl.io/aMm76Yr) 2018-07-06 21:00:55 +03:00
Alexander Ivash
46992f04ad replace bodymart & avatarisland images 2018-07-06 21:00:55 +03:00
Alexander Ivash
939749e084 The keyboard should appear at the bottom of the screen. 2018-07-06 21:00:55 +03:00
Alexander Ivash
3f86f3d91f present avatar model name without marketId in black 2018-07-06 21:00:55 +03:00
Alexander Ivash
0ad11c4a6e Open 'Learn to make a custom…' in default external browser 2018-07-06 21:00:55 +03:00
Alexander Ivash
2581157794 "The button changes from Confirm to overwrite, and the button style changes from blue to red" 2018-07-06 21:00:55 +03:00
Alexander Ivash
345c294d47 invalidate avatar model on using custom avatar url 
disable navigation if no marketId
 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a reflect changes in grabbed wearable position/rotation in UI 2018-07-06 21:00:55 +03:00
Alexander Ivash
c7570dbf83 integrate onscreen keyboard 2018-07-06 21:00:54 +03:00
Alexander Ivash
5381dce8d8 get rid of 'isExternal' due to changes requirements 
show avatar thumbnail if url was specified & valid, show 'guy-in-circle' otherwise
 2018-07-06 21:00:54 +03:00
Alexander Ivash
9925bc2822 don't treat empty display name as an error 2018-07-06 21:00:54 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 2018-07-06 21:00:54 +03:00
Alexander Ivash
67b2512a2a query avatar model name for current avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
6ff2ea96f4 crop avatar thumbnails to fit aspect ratio 2018-07-06 21:00:54 +03:00
Alexander Ivash
9a4ea07614 limit avatar name to 14 characters + … at the end 2018-07-06 21:00:54 +03:00
Alexander Ivash
ee856266c7 allow updating existing avatars 2018-07-06 21:00:54 +03:00
Alexander Ivash
b4c4ab88f0 update logging 2018-07-06 21:00:54 +03:00
Alexander Ivash
fdd7644cba use numeric animation for avatar bookmark & page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
3c78ba0060 resolve constant switching between hover/no-hover for page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
afc09c13b2 specify updated shadow params from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
99affb22f5 show spinner during avatar thumbnails loading 2018-07-06 21:00:54 +03:00
Alexander Ivash
567298b59b shadow for wearables indicator (based on mockups) 2018-07-06 21:00:54 +03:00
Alexander Ivash
6efcea2c27 adjust settings layout according to mockups, update style9 2018-07-06 21:00:54 +03:00
Alexander Ivash
b7614684de add check for duplicate names into 'create favorites dialog', style accordingly to mockups 2018-07-06 21:00:54 +03:00
Alexander Ivash
a26248e1d2 switch to regexp-based method of extracting marketplaceId from url 2018-07-06 21:00:54 +03:00
Alexander Ivash
1778e59142 blue version of TextStyle3 should only be used for avatar name under favorites 2018-07-06 21:00:54 +03:00
Alexander Ivash
a4a1ac5d12 The height of the “Take it off” button should be the same as “save” button 
“m” and “deg” should align with “Position” and “Rotation” text
The step size in degrees should be 1 degree
 2018-07-06 21:00:54 +03:00
Alexander Ivash
17acb5e106 when the user clicks on it should take the user to the marketplace info page of the avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
9f7fd3faa2 add slight animation on hover 2018-07-06 21:00:54 +03:00
Alexander Ivash
462d2d5d80 fix 'card moves rapidly between hover and non-hover' 2018-07-06 21:00:54 +03:00
Alexander Ivash
459a1906a5 make highlight border width 4 per request from Mukul 2018-07-06 21:00:54 +03:00