Commit graph

71813 commits

Author SHA1 Message Date
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian
0a43c17ce0 Use entity-specific glyphs in marketplace item tester 2018-09-24 21:15:08 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings
make settings thread safe
2018-09-24 17:24:50 -07:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
2018-09-24 16:30:49 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings
Android settings (AEC)
2018-09-24 13:55:30 -07:00
John Conklin II
1f6f51993d
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit
Remove verbose logging of keyboard messages in edit.js and gridTool.js
2018-09-24 12:54:43 -07:00
John Conklin II
45b206d748
Merge pull request #14065 from SamGondelman/blendshapeCrash
Fix blendshape crash on avatar removal
2018-09-24 12:39:52 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74
Fix entity list selection failing when selecting entities not in list
2018-09-24 11:02:36 -07:00
SamGondelman
d772cdb34a please 2018-09-24 10:16:35 -07:00
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton
Fix Interstitial GoTo button stretch
2018-09-21 11:44:48 -07:00
John Conklin II
fa5bb84628
Merge pull request #14043 from huffman/fix/entity-list-sort-visible-lock-74
Fix sorting of entity list not working as expected
2018-09-21 11:44:17 -07:00
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
Fixing double loginFailed
2018-09-21 11:36:06 -07:00
John Conklin II
9c2a7931fb
Merge pull request #14036 from AndrewMeadows/crowd-update-tuning
tweak avatar update priority coefficients for load tests
2018-09-21 09:44:15 -07:00
Kerry Ivan Kurian
f9c25f2f32 Allow user to select asset type in marketplace item tester 2018-09-20 16:36:06 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight
Fix AMD highlighting effect
2018-09-20 16:17:10 -07:00
Kerry Ivan Kurian
c1cc031bd0 Remove cruft and refactor 2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
Kerry Ivan Kurian
afa8e44e66 Refactor 2018-09-20 10:53:32 -07:00
Andrew Meadows
cf85c617a2 tweak avatar update priority coefs for load tests 2018-09-20 09:56:50 -07:00
Kerry Ivan Kurian
5445d6f670 Switch to localhost before replacing content 2018-09-19 16:06:43 -07:00
Kerry Ivan Kurian
38fd9523ee Attempt to load content set
This does not result in the user seeing the content set.
2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
66bf45c3ef Update location only if certificate id 2018-09-19 15:18:18 -07:00
Kerry Ivan Kurian
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Wayne Chen
8d0e55c1cd Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-19 13:00:33 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
2018-09-19 12:38:28 -07:00
John Conklin II
6c63f92f39
Merge pull request #13933 from SamGondelman/accelerationSpread
Fix particle acceleration spread
2018-09-19 11:49:42 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Brad Davis
783ea21951 Fix AMD highlighting effect 2018-09-19 11:21:12 -07:00
Wayne Chen
8b3fff120a Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 16:28:33 -07:00
Wayne Chen
be5f498c2f reversion 2018-09-18 15:47:54 -07:00
Wayne Chen
48e4b38312 reversion 2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c reverting domain handler change 2018-09-18 15:26:12 -07:00
Kerry Ivan Kurian
cfa9d185f0 Add full resource paths to list in marketplace item tester 2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b Enable marketplace item test for avatar file 2018-09-18 13:25:01 -07:00
Kerry Ivan Kurian
645ad2bb7a Enable marketplace item test for avatar url 2018-09-18 12:36:03 -07:00
Zach Fox
d487914656 Prevent text notification from appearing when not necessary 2018-09-18 11:28:59 -07:00
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs
Fixing Model animation bugs
2018-09-18 11:28:37 -07:00
Kerry Ivan Kurian
8f5923d562 Show installed apps on start of marketplace item tester
Also, refactor a bit.
2018-09-18 11:23:32 -07:00
Wayne Chen
f82063ed46 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 09:17:28 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml 2018-09-17 15:17:43 -07:00