Commit graph

306 commits

Author SHA1 Message Date
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Stephen Birarda
9ee063bdc1 remove the access token from API urls and put in Authorization header 2014-09-17 16:00:20 -07:00
Craig Hansen-Sturm
7b3f61ddc2 Merge pull request #3428 from ZappoMan/sendPositonOrientationInSilentPackets
Send positon orientation in silent packets
2014-09-16 13:39:06 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
Stephen Birarda
4cef21aa4f don't prepend relative paths with hifi scheme 2014-09-16 09:14:06 -07:00
Stephen Birarda
3b21348a63 make sure AddressManager signal is connected to before file event 2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities
New Entities Features
2014-09-12 13:57:45 -07:00
Stephen Birarda
f0ead98a2a put back LocationScriptingInterface so it works prior to replacement 2014-09-12 13:28:18 -07:00
Stephen Birarda
892e0e7cbf fix node auth url, NAN break on windows 2014-09-12 11:43:50 -07:00
Stephen Birarda
88a75a3585 fix for goToUser from ChatWindow 2014-09-12 11:27:54 -07:00
Stephen Birarda
1084483dd5 fix for default param of default constructed quat 2014-09-12 11:22:34 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
2014-09-12 08:18:09 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Stephen Birarda
23a0ef2de1 remove some spacing in AddressManager 2014-09-11 12:13:13 -07:00
Stephen Birarda
6d21c4bf0d make lookup for hostnames case insensitive 2014-09-11 11:07:42 -07:00
Stephen Birarda
684aa97b98 add port parsing for domain hostname in address bar 2014-09-11 11:00:24 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
Stephen Birarda
ee6a90dd54 allow domain to pass down its ID from config 2014-09-10 15:13:02 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
ZappoMan
f234dbf9a1 converting voxel files to new versioned format with buffer breaks 2014-09-05 10:51:08 -07:00
Stephen Birarda
e338c600c3 add debug to show that domain connection is being attempted 2014-09-04 09:29:29 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
Andrzej Kapolka
e9e3671710 Increment the version number. 2014-08-21 18:14:10 -07:00
ZappoMan
3a5a38c342 support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file 2014-08-19 10:53:45 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
AndrewMeadows
4b7208ac53 Merge pull request #3280 from huffman/19907
Code Review for Job #19907
2014-08-18 10:20:01 -07:00
Stephen Birarda
c58bae9021 attempt to change buffers to 1MB only 2014-08-14 14:27:09 -07:00
Stephen Birarda
1e65a093f2 decouple audio-mixer packet receipt from main thread 2014-08-14 12:37:57 -07:00
Stephen Birarda
64c11ebf8f don't change the socket buffer sizes if it is already larger 2014-08-14 10:36:54 -07:00
Stephen Birarda
ec260dbab2 change both send and receive socket buffers 2014-08-13 15:50:11 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
Philip Rosedale
0e72c6a0b6 Merge pull request #3269 from ey6es/metavoxels
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
2014-08-12 00:40:14 -07:00
Ryan Huffman
cb76e3ead0 Merge branch 'master' of github.com:highfidelity/hifi into 19907 2014-08-11 18:44:31 -07:00
Ryan Huffman
d1672b510d Add DomainHandler::disconnectedFromDomain signal 2014-08-11 18:41:07 -07:00