Commit graph

73942 commits

Author SHA1 Message Date
Ryan Huffman
b7fe3d47be
Merge pull request #14433 from huffman/fix/entity-properties-styling
Fix several entity tool window styling issues
2018-11-19 16:17:50 -08:00
John Conklin II
378742f896
Merge pull request #14431 from Atlante45/fix/throttle
Turn off throttling behavior when not throttling
2018-11-19 14:48:05 -08:00
Ryan Huffman
007396346c Fix grid tool styling 2018-11-19 14:07:24 -08:00
Simon Walton
987f5317a9
Merge pull request #14428 from birarda/bug/traits-in-budget
consider avatar traits bytes in budget and omit if over
2018-11-19 12:58:48 -09:00
Ryan Huffman
c87748830f
Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity
MS19903: don't trigger virtual keyboard scroll on non input focus.
2018-11-19 13:52:22 -08:00
Ryan Huffman
7694aa8e66 Fix draggable number going into edit too often 2018-11-19 13:51:25 -08:00
Ryan Huffman
193b9752b8 Fix styling of properties window when narrow 2018-11-19 13:50:56 -08:00
Clement
359a841f69 Turn off throttling behavior when not throttling 2018-11-19 12:28:04 -08:00
Thijs Wenker
84e8e21d85 don't trigger virtual keyboard scroll on non input focus. 2018-11-19 21:08:21 +01:00
birarda
a0a87e7170 consider avatar traits bytes in budget and omit if over 2018-11-19 10:55:05 -08:00
Jeff Clinton
484de06cf4
Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict
Don't check for presence of particular keys in models json
2018-11-19 10:29:10 -08:00
John Conklin II
6b25179aa9
Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue
Dismiss keyboard when backout of the login screen
2018-11-19 09:58:54 -08:00
John Conklin II
d63a850ec0
Merge pull request #14409 from danteruiz/keyboard-touchups
keyboard address some feedback
2018-11-19 09:48:00 -08:00
Jeff Clinton
870619b19d
Merge pull request #14412 from amantley/avatarPipelineOffsets
Avatar Pipeline Joint Rotation Offsets Handling
2018-11-19 08:54:29 -08:00
Seth Alves
b72f462028
Merge pull request #14406 from danteruiz/master-disable-interstitial
disable interstitial for master
2018-11-16 20:13:50 -08:00
Ryan Huffman
7701be0742
Merge pull request #14410 from thoys/fix/create/entityListDoubleClick
CreateApp Fix entity list double click rename / highlight and virtual keyboard issue
2018-11-16 18:41:47 -08:00
Simon Walton
3baebf55c5 Don't enforce key presence in models.json 2018-11-16 17:33:13 -08:00
Thijs Wenker
ba790ae470 fix behavior after merge. 2018-11-17 01:20:36 +01:00
Dante Ruiz
4388763c34 fixing keyboard not being dismissing when backout of the login screen 2018-11-16 16:04:40 -08:00
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
MS19550 - Don't show help for HMDs that aren't plugged in and active
2018-11-16 15:49:46 -08:00
Antonina Savinova
4fc43e197c
Merge pull request #14417 from birarda/feat/throttle-in-domain-settings
add throttle start and backoff to DS settings
2018-11-16 15:22:01 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
Dante Ruiz
a77121a588 keyboard touch ups 2018-11-16 14:20:17 -08:00
Thijs Wenker
7b3d2bed15 CR fixes 2018-11-16 22:10:15 +01:00
Thijs Wenker
e89346c146 making rename functionality list refresh proof 2018-11-16 22:10:14 +01:00
Thijs Wenker
31d37e7e75 Fix entity list double click rename / highlight issue 2018-11-16 22:08:58 +01:00
Jamil Akram
4d6a3b389a
Merge pull request #14413 from dback2/entityListResizeBug
Entity list - fix resizing
2018-11-16 12:59:07 -08:00
Shannon Romano
ba699e3e9b
Merge pull request #14273 from NissimHadar/MAC
Case 19722 - Auto-Tester on Mac.
2018-11-16 12:49:58 -08:00
birarda
6daac008ff sanitize throttle start and backoff values from DS settings 2018-11-16 12:00:18 -08:00
Seth Alves
d19cdc62d7
Merge pull request #14135 from ElderOrb/FB18573
FB18573 - Other avatars' avatar entities may appear to be successfull…
2018-11-16 10:05:22 -08:00
Roxanne Skelly
1b63ffb996
Merge pull request #14414 from howard-stearns/security-setting-post-oculus-store-wording
security settings post-oculus-store wording
2018-11-16 09:35:26 -08:00
NissimHadar
6440c13bfe Updated manual. 2018-11-15 18:50:56 -08:00
NissimHadar
7fba4c4673 Deleted unneeded file. 2018-11-15 17:41:01 -08:00
birarda
bb0f046a72 add throttle start and backoff to DS settings 2018-11-15 17:28:34 -08:00
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
Jamil Akram
35ec0b60ab
Merge pull request #14251 from humbletim/fb18302-deprecated-package-model
FB18302 Remove deprecated Package Model functionality
2018-11-15 15:52:04 -08:00
Ryan Huffman
556aec9412 Fix hiding of properties in Create 2018-11-15 15:27:30 -08:00
David Back
de7f4a4a4d fix entity list resizing 2018-11-15 15:23:18 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
2018-11-15 14:54:26 -08:00
r3tk0n
60832b071c Fix logic for cases with rift headset but no touch controllers. 2018-11-15 14:08:38 -08:00
r3tk0n
34224c4f16 Fix XBox One controller detection. 2018-11-15 14:08:21 -08:00
John Conklin II
60c538309a
Merge pull request #14411 from SamGondelman/fading
Fix for avatar flashing on fade out
2018-11-15 13:58:43 -08:00
John Conklin II
83660ab8e1
Merge pull request #14128 from Zvork/ao
Improved Ambient Occlusion
2018-11-15 13:57:13 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash
Rework audio data memory ownership model to fix injector crashes
2018-11-15 13:25:42 -08:00
amantley
3bf4a7844d moved the jointrotationoffsets to hfmModel.h from fbx.h 2018-11-15 10:56:17 -08:00
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
SamGondelman
597ff773e1 fix for avatar flashing 2018-11-15 10:52:22 -08:00
NissimHadar
e6190eb429 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-15 10:45:05 -08:00
amantley
f9829c270d merged new fbx.h 2018-11-15 10:19:04 -08:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders
Entity properties - new draggable numbers
2018-11-15 10:01:07 -08:00