David Rowe
|
8420afd143
|
Fix title not not going back to "Settings" upon Save or Cancel
|
2018-09-06 14:00:33 +12:00 |
|
Anthony Thibault
|
3a3ffcc98c
|
First pass at improving anim stats.
|
2018-09-05 18:14:06 -07:00 |
|
amantley
|
6fb335429d
|
starting to re-implement the walking state detection for smoothwalking
|
2018-09-05 17:55:27 -07:00 |
|
sam gateau
|
4ef8f29522
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-05 17:50:21 -07:00 |
|
sam gateau
|
21f65d8a78
|
position are used correctly for evaluting bounds in the Mesh
|
2018-09-05 17:50:06 -07:00 |
|
Simon Walton
|
adf0a9a414
|
Convert priority age from microseconds to seconds
|
2018-09-05 17:41:00 -07:00 |
|
Sam Gateau
|
03f51352aa
|
Merge pull request #13932 from SamGondelman/framebuffer
Fix framebuffer debugging
|
2018-09-05 17:38:21 -07:00 |
|
Simon Walton
|
d2650f7ede
|
Modified priority function from Andrew
|
2018-09-05 17:22:07 -07:00 |
|
Alexia Mandeville
|
901de120a6
|
Removing flavortext
|
2018-09-05 17:20:49 -07:00 |
|
SamGondelman
|
cde2dc2eaa
|
please work
|
2018-09-05 17:04:05 -07:00 |
|
sabrina-shanman
|
84a2512f31
|
Fix collision pick scale not being used
|
2018-09-05 16:51:27 -07:00 |
|
sabrina-shanman
|
e8ce152687
|
Scale collision picks relative to parent by adding and using more
specialized transform nodes.
|
2018-09-05 16:51:28 -07:00 |
|
Roxanne Skelly
|
4fa7ac1af2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into featuredStories
|
2018-09-05 16:51:25 -07:00 |
|
Roxanne Skelly
|
bb8d9c5cf0
|
For stories, base the notification popups off of the action_string instead of a hard-coded value.
|
2018-09-05 16:50:08 -07:00 |
|
Alexia Mandeville
|
1e697ad45f
|
Removing labels, adding flavor text, moving links
|
2018-09-05 16:25:18 -07:00 |
|
David Rowe
|
a7099025dc
|
Fix up some Settings dialogs' titles
|
2018-09-06 11:15:14 +12:00 |
|
David Rowe
|
960bf00e12
|
Modify look of HMD mode Settings dialogs' titles
|
2018-09-06 11:02:24 +12:00 |
|
Sam Gateau
|
912e0abb0a
|
Merge pull request #13891 from samcake/black
Improving the LOD manager behavior for better scaling
|
2018-09-05 16:01:09 -07:00 |
|
David Kelly
|
b022697dfa
|
volume slider on users fixed
|
2018-09-05 15:36:07 -07:00 |
|
David Rowe
|
398724de73
|
Make Save in HMD settings dialogs return to previous dialog
Same as Cancel key does.
|
2018-09-06 10:23:45 +12:00 |
|
Alexia Mandeville
|
dcf2e00bd7
|
Adding placeholder text
|
2018-09-05 14:55:12 -07:00 |
|
amantley
|
73e628bb8d
|
merge with master fixes
|
2018-09-05 14:42:49 -07:00 |
|
sam gateau
|
15f54ac47d
|
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
|
2018-09-05 14:37:20 -07:00 |
|
sam gateau
|
1feaf286b4
|
keeping position separated from the other attributes
|
2018-09-05 14:35:50 -07:00 |
|
Ryan Huffman
|
335f66d165
|
Add filtering support to entity list
|
2018-09-05 14:30:48 -07:00 |
|
Ryan Huffman
|
739530cb85
|
Limit Entity List to only getting the properties it needs
|
2018-09-05 14:30:36 -07:00 |
|
Ryan Huffman
|
a9a5bf1e97
|
Replace entity list UI with custom, brute-force solution
|
2018-09-05 14:30:19 -07:00 |
|
Ryan Huffman
|
f2cc2f1485
|
Update entity list UI to be updated in a single batch
|
2018-09-05 14:30:19 -07:00 |
|
Ryan Huffman
|
f6ac755bae
|
Add profiling to edit.js fof the entity list
|
2018-09-05 14:30:19 -07:00 |
|
Ryan Huffman
|
133ac0662a
|
Move entity list qml to scripts dir
|
2018-09-05 14:30:19 -07:00 |
|
David Rowe
|
097b4c177a
|
Merge branch 'master' into M17901
|
2018-09-06 09:30:10 +12:00 |
|
John Conklin II
|
649a22a70b
|
Merge pull request #13930 from misslivirose/fix-17828
Fix MS 17828: Explore Desktop Text Visible
|
2018-09-05 13:44:37 -07:00 |
|
John Conklin II
|
dc02ff66f5
|
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
mark and cycle trait instances needing to be sent on mixer reconnect
|
2018-09-05 12:43:27 -07:00 |
|
Wayne Chen
|
841080ea72
|
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
|
2018-09-05 11:54:21 -07:00 |
|
Wayne Chen
|
77bb6fa4d5
|
adding position to try again zone; updating whitespace
|
2018-09-05 11:53:49 -07:00 |
|
Sam Gateau
|
f5843c24d4
|
Merge branch 'black' of github.com:samcake/hifi into black-bis
|
2018-09-05 11:36:53 -07:00 |
|
Sam Gateau
|
2ced6d9681
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-09-05 11:35:59 -07:00 |
|
sam gateau
|
0e614ad578
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-05 11:35:08 -07:00 |
|
sam gateau
|
ce86e94e6f
|
Add simple optim and instrumentation for tthe number of input buffer changes per frame"
|
2018-09-05 11:34:33 -07:00 |
|
Thijs Wenker
|
198ec294ac
|
restore window parent on presentationMode switch
|
2018-09-05 20:13:48 +02:00 |
|
sam gateau
|
8344cb9aff
|
REfactor the FBXReader_Mesh for different vertex formats
|
2018-09-05 11:07:04 -07:00 |
|
Simon Walton
|
f7e84995b4
|
Only build the sortable vector once, now we're using vectors for the priority sort
|
2018-09-05 10:58:37 -07:00 |
|
Anthony Thibault
|
584d39744f
|
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
HMD mode bug fix for avatars with no eyes
|
2018-09-05 10:57:21 -07:00 |
|
Anthony Thibault
|
536de03637
|
Merge pull request #13935 from hyperlogic/bug-fix/takeoff-to-in-air-glitch
Fix for glitch when entering in-air state from takeoff.
|
2018-09-05 10:56:34 -07:00 |
|
Seth Alves
|
1bea6c9ea3
|
if not already logged in, show login dialog at launch-time rather than connect-to-domain-time
|
2018-09-05 10:38:12 -07:00 |
|
Wayne Chen
|
c6229c5c60
|
updating serverless file to have dynamic oops
|
2018-09-05 10:37:45 -07:00 |
|
Wayne Chen
|
179138aa10
|
updating serverless file to have dynamic oops
|
2018-09-05 10:36:06 -07:00 |
|
Andrew Meadows
|
db28ac0224
|
Merge pull request #13926 from FlameSoulis/fix/Build_LINUX.md-18.04
Updated and Revised BUILD_LINUX.md - Includes Ubuntu 18.04 steps
|
2018-09-05 10:18:26 -07:00 |
|
Andrew Meadows
|
4a1bd98584
|
Merge pull request #13914 from SamGondelman/avatarmanager
Miscellaneous low-level performance improvements
|
2018-09-05 10:12:05 -07:00 |
|
Wayne Chen
|
ebedbabace
|
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
|
2018-09-05 09:06:36 -07:00 |
|