sabrina-shanman
|
8dd36e465b
|
Merge branch 'master' into crash_ray-pick-dtor_pointer-only
|
2018-09-25 09:22:30 -07:00 |
|
sabrina-shanman
|
eca31e7a99
|
Fix instantiating abstract class when creating visual pick result for pointers
|
2018-09-25 09:20:57 -07:00 |
|
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 |
|
Zach Fox
|
1ac2800e18
|
Fix wallet dot logic
|
2018-09-24 17:50:37 -07:00 |
|
sabrina-shanman
|
5dbebd4aae
|
Add comment explaining why visualPickResult is a copy
|
2018-09-24 17:36:24 -07:00 |
|
Zach Fox
|
be304ea975
|
Small bugfixes again
|
2018-09-24 17:33:23 -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 |
|
sabrina-shanman
|
7f189e4d10
|
Make visualPickResult used by Pointers a private copy
|
2018-09-24 17:15:56 -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 |
|
Andrew Meadows
|
a3f946dee1
|
activate OtherAvarar in physics sim on position change
|
2018-09-24 16:27:37 -07:00 |
|
Roxanne Skelly
|
e3943f210d
|
Save 'enabled' configuration between restarts
|
2018-09-24 16:16:56 -07:00 |
|
Roxanne Skelly
|
c1d2f00c9b
|
Fix url.toString()
|
2018-09-24 15:45:38 -07:00 |
|
Wayne Chen
|
69d5299362
|
patching fix for previous commits
|
2018-09-24 15:22:46 -07:00 |
|
Brad Davis
|
72fc686ec1
|
Fix timer managmement during shutdown
|
2018-09-24 14:52:13 -07:00 |
|
Zach Fox
|
a76c3f028d
|
Small bugfixes
|
2018-09-24 14:46:00 -07:00 |
|
Roxanne Skelly
|
16dba169c5
|
Tray Notifier code review fixes
|
2018-09-24 14:36:54 -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 |
|
SamGondelman
|
ad73cb3996
|
fix avatar highlighting
|
2018-09-24 14:02:35 -07:00 |
|
Wayne Chen
|
ac5814a1f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
|
2018-09-24 13:57:23 -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 |
|
Roxanne Skelly
|
6f4c376d9f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-24 13:45:24 -07:00 |
|
Roxanne Skelly
|
d5baadbefa
|
Modify --url hifiapp: behavior to trigger through appUI when first
starting interface.
Also, menu names and order follow UX documentation.
|
2018-09-24 13:43:55 -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 |
|
Andrew Meadows
|
c1d65f5118
|
update avatar shape after it loads
|
2018-09-24 12:07:08 -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 |
|
Stephen Birarda
|
b31837168d
|
fix bad lock, optimize some operations, clarify comment
|
2018-09-24 11:27:20 -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 |
|
Zach Fox
|
57c303440b
|
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
|
2018-09-24 09:32:53 -07:00 |
|
Dante Ruiz
|
d4450ac780
|
fix equip and keeping new functionallity
|
2018-09-21 15:59:00 -07:00 |
|
Seth Alves
|
86e502637e
|
Make Settings thread safe
|
2018-09-21 15:46:35 -07:00 |
|
Roxanne Skelly
|
61cbee72af
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-21 12:31:36 -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 |
|
Zach Fox
|
6284074ff9
|
Don't show banner when app is open but continue updating data
|
2018-09-21 10:47:59 -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 |
|
Zach Fox
|
e75a45af92
|
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
|
2018-09-21 09:43:30 -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 |
|
Roxanne Skelly
|
6e051b7431
|
Checkpoint tray notifications
* Fix app launch
* refactor notifications code
* fixup wording
|
2018-09-20 15:55:35 -07:00 |
|
Kerry Ivan Kurian
|
c1cc031bd0
|
Remove cruft and refactor
|
2018-09-20 14:50:27 -07:00 |
|
Zach Fox
|
33c04631ea
|
Comments on Confluence doc
|
2018-09-20 14:37:46 -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 |
|