Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 12:16:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23015 commits 25 branches 0 tags 1.1 GiB
Commit graph

683 commits

Author SHA1 Message Date
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
David Rowe
44083dd343 Add user warning if domain has mismatched packet versions 2015-01-27 13:10:11 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
 2015-01-27 01:21:33 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Andrzej Kapolka
23f9c799dd Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-23 18:20:14 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively 
increasing resolution.
 2015-01-23 13:58:51 -08:00
ZappoMan
3c38a9eb53 add last simulated to the protocal 2015-01-23 13:32:38 -08:00
Stephen Birarda
5b81fa27fc fix for DEFAULT_NODE_AUTH_URL 2015-01-23 13:05:02 -08:00
Stephen Birarda
e34fb66be7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-21 12:41:20 -08:00
Atlante45
2f39b93823 Use QDickCache for every QNAM 2015-01-21 11:12:11 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Stephen Birarda
466ea12d0f turn off verbose HTTP request debug 2015-01-20 15:44:14 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Stephen Birarda
94a9bf52fa handle gvr-interface address lookup 2015-01-20 14:38:33 -08:00
Stephen Birarda
b4d6a44fc2 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-20 11:15:54 -08:00
Stephen Birarda
cd23876afc fix QHttpMultiPart destroy from AccountManager 2015-01-20 11:00:08 -08:00
Stephen Birarda
a66888939c add some debugging for domain switch 2015-01-20 10:51:11 -08:00
Stephen Birarda
483d072709 handle override path from address bar 2015-01-20 10:47:57 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Andrzej Kapolka
f8f9c25d38 Back to JPG compression for heightfield colors. 2015-01-19 14:59:28 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
 2015-01-19 14:18:22 -08:00
Brad Hefta-Gaub
215e3b732e Merge pull request #4134 from ey6es/metavoxels 
Big ol' metavoxel update.  Mostly the switch to "stack" representation for dual contour data, but also includes some heightfield fixes.
 2015-01-19 14:06:02 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Stephen Birarda
990ca8397e add extra debugging for AddressManager connect to domain 2015-01-19 10:23:05 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
df69466887 Moved copyPath/Address out of Menu 
Moved into AddressManager
 2015-01-18 05:48:14 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Stephen Birarda
6f5d9d54ec Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-15 14:15:38 -08:00
Stephen Birarda
250a3de9fe make node mutex in LimitedNodeList recursive for double read lock 2015-01-15 13:34:33 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Stephen Birarda
b8b5b2b6ec don't check the root object for path 2015-01-14 16:56:49 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
38729c5790 Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
Stephen Birarda
6e1ba17c6e handle application title change for place name change 2015-01-13 15:07:45 -08:00
Stephen Birarda
92b8cd2d1e handle storage of user location in new format 2015-01-13 15:02:04 -08:00
Stephen Birarda
16261a5fc1 more updates for new place/location APIs 2015-01-13 14:49:24 -08:00
Stephen Birarda
1af87e57da handle new places API format in AddressManager 2015-01-13 14:21:07 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Atlante45
b6ba82653f Remove glm dependency 2015-01-12 17:00:39 -08:00
Atlante45
80af2adf12 Remove constexpr because windows can't handle them 2015-01-12 16:42:27 -08:00
Atlante45
8415098fc2 Set different caches size depending on cache type 2015-01-12 15:36:36 -08:00
Atlante45
e70e435dcc Added Min/Max values for cache size 2015-01-12 12:45:13 -08:00
Andrzej Kapolka
cad8313e56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-12 12:00:20 -08:00
Atlante45
81bf1e4f53 Some code maintainance 2015-01-12 11:46:38 -08:00
Atlante45
bad96e0ba4 cache size getter/setter 2015-01-12 11:37:42 -08:00
Atlante45
ea0ffd0125 Introduce reserveUnusedResource 2015-01-12 11:37:00 -08:00
Atlante45
cb3f07e6f5 Remove unusedResourcesMaxCount 2015-01-12 11:18:55 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Atlante45
5cdc76ad35 Put cache max size/count as class members 2015-01-11 22:48:42 -08:00
Andrzej Kapolka
e3074d726b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/metavoxels/src/Spanner.cpp
 2015-01-09 11:52:05 -08:00
Atlante45
02b9aaacf8 Bump packet version 2015-01-09 11:16:58 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
441a1e4fee Turns out windows doesn't like constexpr 2015-01-08 18:35:23 -08:00
Atlante45
ea832cfd45 Added constant 2015-01-08 17:33:47 -08:00
Atlante45
77e4a2ef35 Add byte limit to chaches 2015-01-08 17:06:05 -08:00
Andrzej Kapolka
c99e2c3ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-01-08 14:57:03 -08:00
Atlante45
af9525ed33 Bump AvatarData packet number 2015-01-08 11:49:39 -08:00
Clément Brisset
fb6fb8a38d Merge pull request #4050 from birarda/lasagna-not-spaghetti 
put back current address storage in Menu
 2015-01-06 16:29:52 -08:00
Stephen Birarda
9c191be106 use the AddressManager's method to store current address 2015-01-06 16:13:06 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
Stephen Birarda
5fadfa8c17 remove doubled friend declaration, is in macro 2015-01-06 09:35:11 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
ZappoMan
67595ea571 more voxelEctomy 2014-12-30 20:35:21 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
Andrzej Kapolka
135e3bf574 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-30 13:25:57 -08:00
Andrzej Kapolka
c9b3b5ff7d Scale back on first dropped packet, use Qt send/receive buffer size options 
rather than setsockopt/getsockopt.
 2014-12-30 12:30:38 -08:00
Andrzej Kapolka
c78d38b925 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-29 14:38:17 -08:00
Stephen Birarda
e02f81da01 fix a call to address manager in nodelist 2014-12-29 11:00:49 -07:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Stephen Birarda
08581b4dac Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 12:50:32 -08:00
Stephen Birarda
979f5f8fc5 fix for coding standard compliance 2014-12-19 12:19:49 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Stephen Birarda
3a4f75ff62 fix AddressManager domain lookup to handle port 2014-12-18 16:40:02 -08:00
Stephen Birarda
1ab66c2bfe split port and hostname for cleaner domain changes 2014-12-18 16:17:03 -08:00
Stephen Birarda
087ac1db90 send port along with domain hostname lookup 2014-12-18 16:03:13 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
9c038d33b9 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2014-12-18 14:43:01 -08:00
Stephen Birarda
325d0dbce1 include QUuid instead of UUID in UUIDHasher 2014-12-18 14:31:34 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -08:00
Stephen Birarda
e13e9febdc unlock the node mutex if node not found 2014-12-18 14:16:22 -08:00
Stephen Birarda
07f95c597c add read locks for find on tbb hash 2014-12-18 14:08:55 -08:00
Stephen Birarda
df3eca5aca add a comment for the UUID hasher 2014-12-18 14:01:22 -08:00
Stephen Birarda
587df1178d use constant for MSEC to USEC conversion 2014-12-18 13:57:19 -08:00
Atlante45
aa0998dc7d Moved LimitedNodeList into DM 2014-12-18 10:32:34 -08:00
Stephen Birarda
b326ab9839 remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Atlante45
52f2033dce Updated Nodelist class 2014-12-17 15:27:35 -08:00
Atlante45
ce7f72d2cd Update macro 2014-12-17 15:26:47 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Atlante45
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -08:00
Stephen Birarda
1cf88e7666 Merge branch 'master' of https://github.com/highfidelity/hifi into lasagna-not-spaghetti 2014-12-16 10:47:45 -08:00
Andrzej Kapolka
564bce7c10 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-15 17:09:32 -08:00
Andrzej Kapolka
892141fe14 Fix for crash on exit due to cache references' not being cleared. 2014-12-15 16:36:26 -08:00
Stephen Birarda
1b48cf7f5a use DependencyManager for AddressManager 2014-12-15 14:54:20 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Andrzej Kapolka
5e01695899 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-12 12:11:33 -08:00
Stephen Birarda
687072f19c fix for domain failed reconnect after disconnect 2014-12-12 09:47:15 -08:00
Andrzej Kapolka
828813dd07 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-11 14:57:36 -08:00
ZappoMan
628046f13c potential fix to crash on windows startup 2014-12-09 18:26:59 -08:00
Andrzej Kapolka
65bd3a3d26 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-09 18:09:38 -08:00
Andrzej Kapolka
343f610442 Use the 1450 limit everywhere, in case other places are running into the issue 
I experienced with metavoxels.
 2014-12-08 18:45:05 -08:00
Andrzej Kapolka
c96be3fe3d Removed unused functions, stubbing out "stack" layer. 2014-12-05 17:46:28 -08:00
Andrzej Kapolka
7a81e6c9e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 14:30:31 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrzej Kapolka
fecb225a06 Prevent erroneous resource download percentages; Qt reports the total bytes as 
-1 before the actual size is available.
 2014-12-03 12:55:58 -08:00
Andrzej Kapolka
e32c214e4d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 12:08:06 -08:00
Stephen Birarda
49a087018f fix for delayed heartbeats, late socket lookup 2014-12-03 08:22:50 -08:00
Andrzej Kapolka
5b4869f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-01 16:43:39 -08:00
Stephen Birarda
fed7d789f6 have the domain-server write its local port into shared memory 2014-11-30 17:29:18 -08:00
Andrzej Kapolka
1d9c7d7c72 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 10:56:23 -08:00
Andrzej Kapolka
8d3f4a627b Working on quadtree for heightfields. 2014-11-25 14:10:44 -08:00
David Rowe
01867e2459 Display "--" for ping values if not yet valid 2014-11-24 18:32:47 -08:00
Andrzej Kapolka
0a976ad262 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 11:26:29 -08:00
Stephen Birarda
1aa98dfc4c trim whitespace for place name lookup 2014-11-20 09:24:43 -08:00
Atlante45
b5abf44aa3 Comment packt type number every 5 2014-11-19 14:31:49 -08:00
Stephen Birarda
998457665f add back c++11 support to all, fix includes in networking 2014-11-18 17:26:42 -08:00
Andrzej Kapolka
632f3bfa7f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-18 17:12:40 -08:00
Stephen Birarda
2274b35d08 connect to sandbox domain by default 2014-11-18 15:35:11 -08:00
Stephen Birarda
a8cc565baf set the default hostname for GVRInterface client 2014-11-18 13:43:49 -08:00
Stephen Birarda
9f4e1c8a27 cleanup indentation in AndroidManifest file 2014-11-18 13:38:37 -08:00
Andrzej Kapolka
4308a45028 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 16:46:51 -08:00
Stephen Birarda
fce239fb70 replace auto_ptr with unique_ptr 2014-11-17 14:17:50 -08:00
Atlante45
46eebe9d40 Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
Andrzej Kapolka
aae168dd46 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 12:43:52 -08:00
Stephen Birarda
f23b08971c merge with cuckoo branch, fix makefile OS X support 2014-11-14 10:52:12 -08:00
Stephen Birarda
9dfdbc4352 remove unused includes in NetworkPacket 2014-11-14 10:14:47 -08:00
Stephen Birarda
5b379ae2ff use portable solution for setSockOpt 2014-11-14 10:12:34 -08:00
Stephen Birarda
df23366b8c remove setsockopt calls for DTLS to pass android build 2014-11-14 10:01:01 -08:00
Brad Hefta-Gaub
3441167838 Merge pull request #3790 from Atlante45/entities_userdata 
Entities userdata
 2014-11-13 20:43:57 -08:00
Atlante45
f47620231e Entities have user data 2014-11-13 16:16:20 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
Andrzej Kapolka
8a0ff4acf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
 2014-11-13 12:17:37 -08:00
ZappoMan
8ad3ce7daf bump packet version 2014-11-13 09:32:59 -08:00
Andrzej Kapolka
08475cc90b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-11 14:40:34 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice 
Reverb for own voice
 2014-11-11 10:52:26 -08:00
Andrzej Kapolka
0664ff3181 Moved spanners into separate file, working on heightfields as spanners. 2014-11-10 15:51:41 -08:00
Stephen Birarda
beb7c339f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-11-07 11:18:04 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
Stephen Birarda
996c76c723 repairs for node teardown on domain dissappear or node disconnect 2014-11-06 16:05:01 -08:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
Stephen Birarda
0e9e8a0036 remove libcuckoo and readme 2014-11-06 13:56:19 -08:00
Stephen Birarda
51bc5d10b5 fix network includes in LimitedNodeList 2014-11-06 13:46:26 -08:00
Stephen Birarda
e92376cf64 distinguish between eachNode and eachNodeBreakable 2014-11-06 13:41:55 -08:00