Commit graph

26784 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
bb2f3cac2c Use named constant for the onset of near-field corrections (1 meter) 2018-02-27 08:51:55 -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
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
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
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
humbletim
d3bae87066 * remove unneeded Q_DECLARE_METATYPEs
* CR feedback
2018-02-26 19:07:55 -05:00
Dante Ruiz
ced500f23e Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-26 15:41:51 -08:00
Dante Ruiz
be52b66874 be able to delete entities in serverless domain 2018-02-26 15:41:35 -08:00
Seth Alves
642e7b7c37
Merge pull request #24 from druiz17/serverless-domains
Some bug fixes
2018-02-26 15:25:59 -08:00
humbletim
767569bc40 * changes per CR feedback
* make MeshPart.topology read-only
* JS Graphics API starter documentation
* remove redundant qscriptvalue sequence registrations
2018-02-26 18:00:22 -05:00
Dante Ruiz
c83a8e9a25 minimize diff 2018-02-26 14:51:36 -08:00
Dante Ruiz
5031d94c6d small changes 2018-02-26 14:50:34 -08:00
Ryan Huffman
65a4b3d316 Revert change to packet reading in Socket.cpp 2018-02-26 14:43:50 -08:00
Dante Ruiz
a23c425f5e actions and serverless status fixes 2018-02-26 14:24:51 -08:00
Seth Alves
666fa77be2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 13:53:20 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
Seth Alves
eed388e7c9 avoid a crash if entityTree is null 2018-02-26 13:53:14 -08:00
Ryan Huffman
24da043937
Merge pull request #12437 from sethalves/fix-qt-5-10-udt
fix Qt 5.10 udt packet reading
2018-02-26 13:50:41 -08:00
Seth Alves
d60d8fe702
Merge pull request #12498 from vladest/fix_crash_startup
Search main window by checking object name
2018-02-26 13:06:10 -08:00
Sam Gondelman
d1d6adf447
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1
fix osx shadows
2018-02-26 11:46:43 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -08:00
Anthony J. Thibault
c8af9c6f04 Missing EPSILON 2018-02-26 10:05:15 -08:00
Anthony J. Thibault
0404b722e4 Code review feedback 2018-02-26 10:00:32 -08:00
vladest
77ef0e05a1 Search main window by checking object name 2018-02-26 13:43:50 +01:00
humbletim
3dbe5d79bb fix windows punctilious warnings 2018-02-26 06:01:16 -05:00
humbletim
54dc0240b0 remove bufferviewscripting refs; fix compiler warnings 2018-02-26 05:26:35 -05:00
humbletim
f824edd04e * remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
Seth Alves
f946ce48d6 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-23 16:46:55 -08:00
Seth Alves
5632f9d8fd clean up debug prints. put filename in window title-bar when connected to a serverless domain 2018-02-23 16:46:42 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete
Fix EntityItems not getting destroyed
2018-02-23 16:17:52 -08:00
Seth Alves
77febe0aab save avatar-entities which are created while using a serverless domain 2018-02-23 16:03:08 -08:00
Seth Alves
3be1988260 fix expandToLocalDataAbsolutePath 2018-02-23 14:27:28 -08:00