NissimHadar
|
eea89655f6
|
WIP - Readme to install on Mac.
|
2018-11-19 10:33:04 -08:00 |
|
NissimHadar
|
4c763fd0d6
|
WIP - Readme to install on Mac.
|
2018-11-19 10:31:06 -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 |
|
Wayne Chen
|
3555276817
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-11-19 09:02:30 -08:00 |
|
Wayne Chen
|
b8d8710604
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-11-19 09:02:16 -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 |
|
NissimHadar
|
558e5cff2e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-11-18 08:40:48 -08:00 |
|
vladest
|
db82994b4d
|
Merge branch 'master' into qml_warning_fix
|
2018-11-18 16:10:21 +01:00 |
|
Sam Gateau
|
837b321004
|
merging with master
|
2018-11-17 10:35:05 -08:00 |
|
vladest
|
932d1dbcd7
|
Fixed width binding loop warning
|
2018-11-17 17:20:02 +01:00 |
|
vladest
|
53b7cc1376
|
Fix QML achoring warnings on Layouts
|
2018-11-17 15:06:25 +01: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 |
|
Sam Gateau
|
5f062bbcf5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-11-16 20:05:08 -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 |
|
Simon Walton
|
2d2cc0eaca
|
Use a random session id for a sequence of chunks
|
2018-11-16 15:56:39 -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 |
|
Simon Walton
|
5883035991
|
Gcc doesn't like QTemporaryFile in a map so store unique ptrs
|
2018-11-16 14:50:03 -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 |
|
Wayne Chen
|
4f1361c0ea
|
adding keyboard following login dialog
|
2018-11-16 12:31:22 -08:00 |
|
birarda
|
6daac008ff
|
sanitize throttle start and backoff values from DS settings
|
2018-11-16 12:00:18 -08:00 |
|
sam gateau
|
9dd6c8d9d9
|
Merge branch 'master' of github.com:highfidelity/hifi into one
|
2018-11-16 11:55:44 -08:00 |
|
Wayne Chen
|
a2a09bc2b9
|
fixing compile error
|
2018-11-16 11:16:24 -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 |
|
Simon Walton
|
5f51ed0210
|
Keep pending content per remote address
|
2018-11-16 09:44:21 -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 |
|
Sam Gateau
|
0166d7748a
|
Merging with master around rc76 cut time
|
2018-11-15 22:52:37 -08:00 |
|
NissimHadar
|
6440c13bfe
|
Updated manual.
|
2018-11-15 18:50:56 -08:00 |
|
Wayne Chen
|
27f02c072a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-11-15 18:49:49 -08:00 |
|
Wayne Chen
|
7d40cf9348
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-11-15 18:49:13 -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 |
|
Wayne Chen
|
02248e77e4
|
got the overlay to start recentering
|
2018-11-15 17:03:55 -08:00 |
|
Simon Walton
|
22c3f5239a
|
Relay upoaded content.zip chunks to temp file
Entities uploads still build in-memory. Move out chunk
handling to new routine.
|
2018-11-15 16:59:52 -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 |
|