Gabriel Calero
344774dcec
Merge remote-tracking branch 'upstream/master' into tester_flag
2018-11-05 19:13:04 -03:00
Gabriel Calero
611881e002
Mute when entering a domain
2018-11-05 18:35:57 -03:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4
Author: Zach Fox <fox@highfidelity.io>
Date: Mon Nov 5 13:03:34 2018 -0800
Fix seven bugs
commit a4d36b3845
Merge: 8906b909eb
d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date: Mon Nov 5 10:25:58 2018 -0800
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
commit d0181283dd
Merge: be17ed0910
643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri Nov 2 16:44:31 2018 -0700
Merge pull request #14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed Oct 31 14:15:30 2018 -0700
Change local variable in TestFbx for clarity
commit 0b7ddca5f6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed Oct 31 14:03:20 2018 -0700
Change naming for straggler names in model loading debug dumps
commit becee7f010
Author: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue Oct 30 17:28:42 2018 -0700
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
sabrina-shanman
a98a9b1c0c
Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs
2018-11-05 12:47:34 -08:00
sabrina-shanman
e00024e8b0
Create HFM library
2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -08:00
Zach Fox
a4d36b3845
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-05 10:25:58 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -08:00
Alexander Ivash
3bc274dd10
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-04 23:11:59 +05:30
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
...
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab
Use AccountManager instead of settings
2018-11-02 16:42:18 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update
...
Case 18794 - updates were being reported as gifts in the wallet
2018-11-02 16:42:03 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Dante Ruiz
b33934ec46
fixing Image3DOverlay scaling
2018-11-02 14:24:14 -07:00
NissimHadar
562c9b1196
"works" on Mac
2018-11-02 13:35:38 -07:00
NissimHadar
51272d8fec
Added setGeometry script command.
2018-11-02 13:09:07 -07:00
NissimHadar
70c0addc3f
Removed setWindowSize
- crashes on both Windows and Mac.
...
Fixed typo.
2018-11-02 10:47:17 -07:00
NissimHadar
c7353e6c59
Added setWindowSize
- FOR TESTING ON MAC
2018-11-02 09:57:58 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Sam Gateau
fa0c58fa0e
Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend
2018-11-02 00:08:47 -07:00
NissimHadar
470a490494
Typo.
2018-11-01 17:31:10 -07:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
NissimHadar
d851720cb0
Added method to detect OS type. Needed for testing.
2018-11-01 16:57:28 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Roxanne Skelly
1f8dde6756
Transaction string was assuming items given to the
...
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
2018-11-01 15:44:11 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
d6477993a1
Make it work better with the tablet
2018-11-01 13:08:00 -07:00
Howard Stearns
3e2d6c341b
placeholder svgs
2018-11-01 11:45:25 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Roxanne Skelly
a1eee351e9
Change "Proofs" to "My Submissions" in assets filter.
2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
David Kelly
e6c3e7e67f
initial purge of security tab from wallet
2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Zach Fox
efcda129b7
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
David Rowe
ae2715af31
Add option to start up at home location
2018-11-01 08:57:12 +13:00
Roxanne Skelly
b5a48d31b6
Fix code-review spacing issue
2018-10-31 10:18:04 -07:00
Roxanne Skelly
628ec8ec2b
Removed QmlCommerce.cpp, Ledger.cpp changes as requested
2018-10-31 10:09:01 -07:00
Roxanne Skelly
e5f06690b5
Strip out references to 'my purchases' vs 'my items' code
2018-10-30 17:31:31 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
Roxanne Skelly
0e639f4e34
Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce
2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456
Checkpoint Proofs Filter in Inventory
2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
amantley
53650850da
first change to check if the hips are going through the floor : todo --> in rig disable animation when we are in experimental mode
2018-10-30 14:31:33 -07:00
SamGondelman
dd96881724
don't submit frames while oculus says it's not visible
2018-10-30 12:15:46 -07:00
David Rowe
1a129335dd
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-10-30 19:57:07 +13:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
...
Fix avatars remain stuck in place for other users intermittently
2018-10-29 15:03:43 -07:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988
...
Fix Interface eating memory when minimized
2018-10-29 12:52:10 -07:00
luiscuenca
e49e9cdc56
Set avatar client sooner
2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1
Apply transit logic if avatar instance is client side
2018-10-27 07:15:31 -07:00
David Rowe
1cca975b37
Fix Interface eating memory when minimized
2018-10-27 11:40:02 +13:00
Brad Davis
36edb939c3
Try to fix android crash
2018-10-26 11:23:30 -07:00
Bradley Austin Davis
28b45ce1d9
Resolve compositing glitches
2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170
Working on mac GL issues
2018-10-26 11:23:29 -07:00
David Rowe
e2ae50362e
Add missing JSDoc of Window.interstitialModeEnabled property
2018-10-26 19:21:58 +13:00
David Rowe
51d56ddf22
Make tablet page indicators clickable to scroll tablet
2018-10-26 12:17:04 +13:00
Howard Stearns
9095df4641
fix getting inventory back after showing my items
2018-10-25 12:59:49 -07:00
Howard Stearns
936c2b2cab
don't show price for free items
2018-10-25 12:46:30 -07:00
Howard Stearns
3503d79b05
missed a buy/purchase
2018-10-25 12:39:33 -07:00
Howard Stearns
e3b1e14db6
nix "buy" where possible.
2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247
nix the word "purchase" where possible
2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be
use the switch
2018-10-25 11:29:10 -07:00
Howard Stearns
c85dbb8233
limitedCommerce switch
2018-10-25 11:25:56 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Seth Alves
b9f8c59f61
Merge pull request #13904 from alexiamandeville/menu-updates
...
Resorting Developer menu organization
2018-10-24 19:41:22 -07:00
John Conklin II
7db7131ef4
Merge pull request #14172 from dback2/entityPropertiesRefactor
...
Entity properties refactor / reorder and merge particle explorer into properties
2018-10-24 17:39:17 -07:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
...
Small avatars now have a minimum jump height of 0.25 meters
2018-10-24 17:08:28 -07:00
amantley
7fe53d4399
removed extra const float value
2018-10-24 16:32:18 -07:00
amantley
370801bd85
removed _spine2position variable and added handling for when there is no spine2 joint. In that case the head will do the recentering rotation and the shoulders will not move with the hand azimuth
2018-10-24 16:23:05 -07:00
Howard Stearns
993cb0cfa0
restore separation of inventory vs proofs.
2018-10-24 12:00:17 -07:00
David Back
b3e0d51260
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-24 11:48:56 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation
...
Add animations to Avatar Transit
2018-10-24 10:51:21 -07:00
Howard Stearns
c1cb41875a
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-24 09:56:37 -07:00
Gabriel Calero
28c062b842
Don't show stats in release builds
2018-10-24 11:57:59 -03:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -07:00
humbletim
d8217e9a79
synthesize key release events on Desktop focus change
2018-10-23 22:42:06 -04:00
amantley
5063d0b527
changed handAzimuth to non const function
2018-10-23 16:51:56 -07:00
amantley
56deb500bb
Merge remote-tracking branch 'upstream/master' into shoulderSpaceFix
2018-10-23 16:36:52 -07:00
David Rowe
e879c5a32d
Merge branch 'master' into M19085
...
# Conflicts:
# interface/src/avatar/AvatarManager.h
2018-10-24 12:16:38 +13:00
Howard Stearns
7707d92a95
connect wiring on purchases
2018-10-23 16:07:35 -07:00
amantley
36466a4a9f
Merge remote-tracking branch 'upstream/master' into needToSquat
2018-10-23 16:07:23 -07:00
amantley
e9dae8ebeb
added force stand option for avatar lean behavior, you can now squat to your hearts content
2018-10-23 16:07:18 -07:00
Zach Fox
d1556ae4e8
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 15:51:34 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix
...
Sit State for the seated user in HMD: Squatty Potty Fix
2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
...
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
Stephen Birarda
b789fa96f8
Merge pull request #14192 from Atlante45/fix/traits-race
...
Prevent race on internal client traits members
2018-10-23 14:53:11 -07:00
SamGondelman
0efbdc1ab5
merge with master
2018-10-23 14:33:57 -07:00
Alexia Mandeville
68ab5475fe
Remove duplicate display crash options
2018-10-23 14:13:09 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
amantley
2df9d6c5e9
addressed missing changes for luis
2018-10-23 13:37:56 -07:00
Zach Fox
988bca201b
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:36:46 -07:00
Howard Stearns
97bc84ed87
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-23 13:32:35 -07:00
David Back
9df8ea35bb
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 13:28:35 -07:00
tapalisa
7a684081f0
Merge pull request #14235 from huffman/feat/edit-copy-paste
...
Add copy/paste functionality to edit.js
2018-10-23 13:18:12 -07:00
Zach Fox
897d21bea2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:18:08 -07:00
Howard Stearns
95b86bf5b7
initial limited commerce for oculus store prototype
2018-10-23 13:08:39 -07:00
Alexia Mandeville
178b8ef37b
Removed duplicate menu items
...
Removed duplicates:
Console...
API Debugger
2018-10-23 12:55:02 -07:00
Zach Fox
947391e49e
Fix build errors
2018-10-23 12:45:16 -07:00
amantley
9bc92cb2a3
removed leftover triggers
2018-10-23 12:29:04 -07:00
luiscuenca
fa67e1b269
Remove logs and magic numbers
2018-10-23 11:51:15 -07:00
amantley
0d39343be4
changed if statement to switch in preferencesDialog.cpp, also removed print statement
2018-10-23 11:19:47 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
amantley
39a16703e4
updated wording for the radio buttons for avatar leaning model
2018-10-23 10:52:14 -07:00
Zach Fox
22c3321400
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 09:52:37 -07:00
amantley
3e8663f8e9
removed the dropdown from the avatar app, because it is in settings controls now
2018-10-22 22:31:26 -07:00
amantley
8cb09c37ee
changed the ui to the settings/controls
2018-10-22 21:26:30 -07:00
amantley
472ab1c613
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-22 17:50:56 -07:00
amantley
cce2f295a1
fixed conflict in myskeletonmodel.cpp
2018-10-22 17:49:30 -07:00
Zach Fox
1d8994993c
Whitelist TTS scripting interface to TTS app, which is now a default script
2018-10-22 17:05:31 -07:00
Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item
2018-10-22 15:39:23 -07:00
luiscuenca
afc76fec72
Added overrideNetworkAnimation and restoreNetworkAnimation methods
2018-10-22 15:20:32 -07:00
David Back
e8bda1793f
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-22 15:12:45 -07:00
SamGondelman
09ea32dcc0
fix fading and highlighting issues
2018-10-22 14:12:43 -07:00
Zach Fox
1023e6d2b9
Fix ClipboardScriptingInterface:
2018-10-22 14:00:04 -07:00
Zach Fox
f9cc4f5a69
Count unique source and url pairs
2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b
Only show unique resources
2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc
Tons of improvements
2018-10-22 13:59:57 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
55c1a88404
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Ryan Huffman
9cc2add4a0
Add copy/paste functionality to edit.js
2018-10-22 13:56:07 -07:00
humbletim
2cf633ca02
remove Model Type dropdown and related code paths
2018-10-22 15:05:49 -04:00
humbletim
b1d8a9a96b
remove Qt "whatsthis" dialog icon
2018-10-22 15:04:21 -04:00
humbletim
f7cfc61494
Package Model... -> Package Avatar...
2018-10-22 15:02:33 -04:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
...
Better imports for controls and styles
2018-10-22 11:50:09 -07:00
John Conklin II
bd480bab80
Merge pull request #14226 from Atlante45/fix/octree-scene-stats
...
Only track stats for compatible packets
2018-10-22 11:45:16 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting
...
Add a 'grabbable' option to the new-model dialog
2018-10-22 11:42:40 -07:00
Zach Fox
1eca1bfd55
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-22 11:18:10 -07:00
NissimHadar
c9f9679cf7
Merge branch 'master' of https://github.com/highfidelity/hifi into addNoLogin
2018-10-22 10:55:56 -07:00
NissimHadar
092f88e558
Change parameter name from --no-login
to --no-login-suggestion
2018-10-22 10:55:50 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder
...
Fix crash with BandwidthRecorder
2018-10-22 10:11:26 -07:00
amantley
eb3db9a571
added default to case statement
2018-10-20 16:13:41 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
amantley
e693275b10
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-20 13:42:23 -07:00
amantley
5efb889de5
removed unused variables
2018-10-20 13:42:17 -07:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
...
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix
2018-10-20 13:39:55 -07:00
Brad Hefta-Gaub
23ddb7dea6
Merge pull request #14207 from Atlante45/fix/white-spheres
...
Remove pending avatars data structure
2018-10-20 12:09:51 -07:00
Ryan Huffman
9d13902cd3
Improve paramater names in model dialog window
2018-10-20 11:26:12 -07:00
amantley
a427ddb235
removed extraneous print statements
2018-10-20 09:16:05 -07:00
amantley
55daeb11cd
moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure
2018-10-19 18:43:02 -07:00
amantley
070a517423
changed the recenterModel variables to userRecenterModel
2018-10-19 18:07:03 -07:00
Ryan Huffman
f1258e4445
Add a 'grabbable' option to the new-model dialog
2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
cd4e9a3e08
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
...
Updating highlight textures on Rift Controller
2018-10-19 16:39:17 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
...
hide progress overlays if interstitial mode
2018-10-19 16:35:42 -07:00
Brad Hefta-Gaub
c6fff83805
Merge pull request #14145 from ctrlaltdavid/M17223
...
JSDoc fixes
2018-10-19 16:16:19 -07:00
amantley
a43985ef64
combo box for recenter model is added
2018-10-19 16:03:53 -07:00
Brad Hefta-Gaub
acc6d3e45c
Merge pull request #14144 from ctrlaltdavid/M17222
...
Fix and fill in JSDoc for MyAvatar flying-related functions
2018-10-19 15:57:04 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
...
Disable user hand controllers if they are too far away or not moving.
2018-10-19 14:02:32 -07:00
Anthony Thibault
ef74014075
Small avatars now have a minimum jump height of 0.25 meters
...
This should improve the quality of the jump animation and improve the mobility of small avatars.
2018-10-19 13:55:56 -07:00
Brad Hefta-Gaub
b281c090e3
Merge pull request #14012 from alexiamandeville/controlImageUpdate
...
Adding handshake control to image in Controls Reference
2018-10-19 11:15:11 -07:00
John Conklin II
81fbb5a332
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab
...
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
2018-10-19 10:33:14 -07:00
Zach Fox
2df9d28c5b
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-19 09:42:06 -07:00
Alexander Ivash
5fef331995
address CR comment
2018-10-19 19:35:12 +03:00
Alexander Ivash
5d8a253785
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
...
note: change also resolve a lot of other shutdown errors from QML (related to null parent)
2018-10-19 18:57:07 +03:00
amantley
0837f790eb
combo box changes
2018-10-19 07:46:16 -07:00
John Conklin II
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth
...
Clean up elbow smoothing code
2018-10-18 19:16:32 -07:00
John Conklin II
7c4733a31d
Merge pull request #14053 from ElderOrb/FB17835
...
make extracted from resources avatarbookmarks.json writable
2018-10-18 18:29:02 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap
...
Fix MS18154: Don't snap to cards in My Purchases
2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
...
make room for keyboard and help in SendAsset
2018-10-18 17:53:52 -07:00
luiscuenca
bb5c042f16
Blend network animation
2018-10-18 17:51:20 -07:00
John Conklin II
b2e84a8f3b
Merge pull request #14191 from howard-stearns/new-rez-images
...
new images for My Purchases rez tutorial
2018-10-18 17:50:30 -07:00
John Conklin II
18df79a8a6
Merge pull request #14211 from amantley/crazylegs
...
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
2018-10-18 17:48:26 -07:00
Anthony Thibault
51d767ac2b
Reasonable defaults for position and rotation filtering for vive tracked joints.
2018-10-18 17:46:32 -07:00
NissimHadar
12d092609b
Do not show login dialog if requested not to on the command line.
2018-10-18 17:20:26 -07:00
Anthony Thibault
3e68a1d5a5
Merge branch 'master' into feature/acceleration-limit-filter
2018-10-18 16:51:57 -07:00
amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e
Remove cruft
2018-10-18 16:25:26 -07:00
Zach Fox
41742aaf9e
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 16:22:41 -07:00
Kerry Ivan Kurian
4d7bc3094a
Fix regression
2018-10-18 16:14:53 -07:00
John Conklin II
40a48777dc
Merge pull request #14231 from ctrlaltdavid/M16205a
...
Fix lasers going through tablet to drawInFrontOverlays
2018-10-18 15:36:29 -07:00
Zach Fox
9f91238945
UX/UI improvements
2018-10-18 15:27:16 -07:00
David Rowe
9b4c5e1685
Fix OSX/Linux warnings
2018-10-19 08:20:21 +13:00
Alexander Ivash
64f67d5eb7
update imports for utilities / all other qml files found
2018-10-18 22:03:50 +03:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
Alexander Ivash
a4987e494a
update imports
2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
amantley
12b03b0e07
tinkering with lerping the spine2 position in avatar space
2018-10-18 10:52:13 -07:00
Andrew Meadows
1a685d2409
set script-triggerd sim ownership priority correctly
2018-10-18 10:33:02 -07:00
David Back
abb166486a
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-18 10:17:33 -07:00
Zach Fox
2a9e0041b2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 10:16:07 -07:00
John Conklin II
1cc2569bd8
Merge pull request #13596 from SamGondelman/scriptvec3
...
Replace vec2, vec3, and xColor properties with JS prototypes
2018-10-18 09:47:56 -07:00
amantley
8f4fafe4d0
put some smoothing on the spine2 rotation in myskeletonmodel.cpp
2018-10-18 08:44:01 -07:00
Kerry Ivan Kurian
89a5da80e0
Do not display incomplete metadata
2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
David Rowe
e339f966d9
Remove reference to a function no longer in the API
...
Noticed in passing.
2018-10-18 17:11:48 +13:00
David Rowe
1610d79023
Remove now redundant mouse pointer code that tried to do the same thing
2018-10-18 17:11:26 +13:00