Seth Alves
|
33065fb51c
|
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
|
2018-03-01 11:07:37 -08:00 |
|
Seth Alves
|
3e114f2b55
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-28 11:17:08 -08:00 |
|
Elisa Lupin-Jimenez
|
061a189e9f
|
Merge pull request #12520 from elisa-lj11/selection_tool_log_spam
Fixed log spam undefined error
|
2018-02-28 09:37:17 -08:00 |
|
Ken Cooke
|
328b5a1e8b
|
Merge pull request #12479 from kencooke/audio-nearfield-hrtf
Near-field HRTF
|
2018-02-28 07:44:24 -08:00 |
|
Ken Cooke
|
bc7b983f48
|
Fast approximation of the azimuth parallax correction
|
2018-02-28 04:44:20 -08:00 |
|
Thijs Wenker
|
6bf1c9878f
|
Merge pull request #12473 from misslivirose/fix-log-spam
Logspam fix for editing in HMD mode
|
2018-02-28 01:59:25 +01:00 |
|
Elisa Lupin-Jimenez
|
b8fd640ddf
|
fixed log spam undefined error
|
2018-02-27 16:44:45 -08:00 |
|
Seth Alves
|
a44ddbbc26
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-27 14:09:05 -08:00 |
|
John Conklin II
|
b4000c04bc
|
Merge pull request #12432 from highfidelity/feat/content-settings
Add content archives to domain server web interface
|
2018-02-27 13:30:53 -08:00 |
|
Howard Stearns
|
1fb0f898b4
|
Merge pull request #12505 from howard-stearns/wallet-help
new wallet help
|
2018-02-27 13:18:36 -08:00 |
|
Howard Stearns
|
0e4f3460b3
|
Merge pull request #12497 from howard-stearns/end-seeding
End seeding
|
2018-02-27 13:18:13 -08:00 |
|
Sam Gondelman
|
354fae5063
|
Merge pull request #12513 from SamGondelman/revertShadows
Revert can cast shadow work
|
2018-02-27 13:13:09 -08:00 |
|
Ken Cooke
|
41ccf6afd8
|
Compensate the near-field azimuth correction for the parallax baked into the HRTF dataset
|
2018-02-27 12:49:32 -08:00 |
|
howard-stearns
|
e21d9f7950
|
Merge branch 'wallet-help' of github.com:howard-stearns/hifi into wallet-help
|
2018-02-27 12:05:00 -08:00 |
|
howard-stearns
|
30896c264b
|
reduced text
|
2018-02-27 12:04:41 -08:00 |
|
howard-stearns
|
53b976b400
|
fix typo in bank href
|
2018-02-27 11:46:06 -08:00 |
|
Zach Fox
|
1119998c7a
|
Fix semicolon
|
2018-02-27 11:45:59 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
|
2018-02-27 11:33:05 -08:00 |
|
howard-stearns
|
1f2d270419
|
Merge branch 'master' of github.com:highfidelity/hifi into wallet-help
|
2018-02-27 11:20:56 -08:00 |
|
Ryan Huffman
|
a6a38d8b3d
|
Merge pull request #12511 from birarda/feat/content-settings
merge master into feat/content-settings
|
2018-02-27 10:03:28 -08:00 |
|
Stephen Birarda
|
9cc348ef27
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-27 09:59:37 -08:00 |
|
Seth Alves
|
9a25128b44
|
remove some leftover code
|
2018-02-27 09:39:15 -08:00 |
|
Zach Fox
|
9170244312
|
Make WindowScriptingInterface available to tablet
|
2018-02-27 09:36:02 -08:00 |
|
Seth Alves
|
7976a1f95e
|
make localhost work again
|
2018-02-27 09:24:48 -08:00 |
|
Seth Alves
|
636c271dc3
|
merge from upstream
|
2018-02-27 09:21:08 -08:00 |
|
John Conklin II
|
abe7c29b5e
|
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
Export boolean entity properties properly
|
2018-02-27 09:18:46 -08:00 |
|
Ken Cooke
|
cc7b9a254b
|
Optimized compute of distance attenuation
|
2018-02-27 09:02:03 -08:00 |
|
Ken Cooke
|
bb2f3cac2c
|
Use named constant for the onset of near-field corrections (1 meter)
|
2018-02-27 08:51:55 -08:00 |
|
Ryan Huffman
|
44f3b00a92
|
Merge pull request #12509 from huffman/feat/content-settings
Fix entity data not being stored when Id and DataVersion are null
|
2018-02-27 08:43:44 -08:00 |
|
howard-stearns
|
053640f216
|
a guess a linking bank
|
2018-02-27 08:36:45 -08:00 |
|
Ryan Huffman
|
88931d9c95
|
Fix entity data not being stored when Id and DataVersion are null
|
2018-02-27 08:33:20 -08:00 |
|
howard-stearns
|
ce0ae61947
|
Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help
|
2018-02-27 08:10:17 -08:00 |
|
John Conklin II
|
48f0cded05
|
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
|
2018-02-27 07:53:25 -08:00 |
|
John Conklin II
|
25144f0fec
|
Merge pull request #12456 from Atlante45/fix/min-spec-crash
Fix crash when passing --checkMinSpec flag
|
2018-02-26 17:35:46 -08:00 |
|
Clément Brisset
|
2a7a71db13
|
Merge pull request #12477 from Atlante45/new-master
Merge stable back into master
|
2018-02-26 17:18:24 -08:00 |
|
howard-stearns
|
eb683d4793
|
mail is a link
|
2018-02-26 17:09:33 -08:00 |
|
Stephen Birarda
|
7e3d4d7503
|
Merge pull request #12506 from birarda/feat/content-settings
merge upstream/master into upstream/feat/content-settings
|
2018-02-26 18:08:58 -07:00 |
|
Stephen Birarda
|
19fac01445
|
Merge pull request #12507 from huffman/feat/content-settings
Fix writeSubclassData in octree data
|
2018-02-26 18:08:20 -07:00 |
|
Ryan Huffman
|
8a8830bbd4
|
Fix writeSubclassData in octree data
|
2018-02-26 17:06:25 -08:00 |
|
Stephen Birarda
|
aa7bd2066a
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-26 17:02:00 -08:00 |
|
Stephen Birarda
|
2af0e5fc2b
|
Merge pull request #12501 from huffman/feat/content-settings
Code review changes
|
2018-02-26 17:58:08 -07:00 |
|
howard-stearns
|
2f6e2f6b84
|
new wallet help
|
2018-02-26 16:52:41 -08:00 |
|
Ryan Huffman
|
ec210e1750
|
Move OctreeUtils to OctreeDataUtils
|
2018-02-26 16:51:42 -08:00 |
|
Ryan Huffman
|
3fa538d42d
|
Add RawEntityData subclass
|
2018-02-26 16:32:09 -08:00 |
|
Atlante45
|
2a204533f4
|
Add comments to startup processes
|
2018-02-26 16:25:41 -08:00 |
|
Stephen Birarda
|
f13412dd56
|
Merge pull request #12500 from birarda/feat/content-settings
fixes for comments from code reviews
|
2018-02-26 17:12:30 -07:00 |
|
humbletim
|
d3bae87066
|
* remove unneeded Q_DECLARE_METATYPEs
* CR feedback
|
2018-02-26 19:07:55 -05:00 |
|
Stephen Birarda
|
9c546ce43d
|
Merge pull request #12503 from Atlante45/feat/backups-integration
timing CR for content archives
|
2018-02-26 16:48:50 -07:00 |
|
Seth Alves
|
c599a03557
|
Merge pull request #25 from druiz17/serverless-domains
Be able to delete entities from within serverless domain.
|
2018-02-26 15:44:55 -08:00 |
|
Dante Ruiz
|
ced500f23e
|
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
|
2018-02-26 15:41:51 -08:00 |
|