Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 15:30:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
48710 commits 76 branches 59 tags 1.2 GiB
Commit graph

2950 commits

Author SHA1 Message Date
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
howard-stearns
b37feb20de signal from ignoreNodesInRadius 2016-11-23 11:23:06 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
howard-stearns
9f2b6dc40b location cleanup 2016-11-16 12:53:57 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044 Merge pull request #9056 from Atlante45/networking 
Protect against empty packet lists
 2016-11-11 15:28:46 -08:00
Atlante45
a38846aeed Protect against empty packet lists 2016-11-11 14:32:52 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable 
Update master with Stable hotfix
 2016-11-07 18:48:54 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
humbletim
2139e979da map specific HTTP errors to corresponding ResourceRequest enums 2016-11-06 10:31:02 -05:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket 
group udt::Socket errors as debug logs
 2016-10-31 10:31:10 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep 
Add tutorial tracking for going through the welcome portal
 2016-10-28 16:26:40 -07:00
Ryan Huffman
9a99cd0ec6 Add tutorialID and tutorialVersion to tutorial progress event 2016-10-28 12:53:16 -07:00
Stephen Birarda
7ddfddc567 make the socket readyRead check fire after 2s of no packets 2016-10-28 10:30:20 -07:00
Stephen Birarda
20f042a15a add slightly more information to last packet debug in Socket 2016-10-27 22:10:32 -07:00
Stephen Birarda
db7f5724f7 output last seq number and last socket before readyRead sticks 2016-10-27 21:50:29 -07:00
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -07:00
Stephen Birarda
4abc4adde9 add a timer to check for readyRead backup 2016-10-26 16:18:12 -07:00
Chris Collins
de419c2818 Merge pull request #8912 from Atlante45/nodelist-race 
Fix potential race in NodeList
 2016-10-26 13:00:05 -07:00
Brad Hefta-Gaub
2fa4f53c4c Merge pull request #8915 from highfidelity/stable 
Stable to master
 2016-10-25 18:52:29 -07:00
Stephen Birarda
b16f5a4752 include BuildInfo for USE_STABLE_GLOBAL_SERVICES 2016-10-25 17:42:12 -07:00
Atlante45
384f3d9321 Fix potential race in NodeList 2016-10-25 16:58:21 -07:00
Brad Hefta-Gaub
4aa96c9acc add location and build info to user activity stats 2016-10-25 15:48:03 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Stephen Birarda
b753871fc1 don't change DF or buffer sizes for ice-server 2016-10-25 11:20:10 -07:00
David Kelly
bdcb58bf8b Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1 
fix some data-races in logging system
 2016-10-21 15:33:40 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master 
always go to dev welcome when not using stable services
 2016-10-21 06:16:26 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race 
Fix sequence number race condition
 2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
00d613a60e Merge pull request #8848 from sethalves/quiet-compiler 
quiet warnings in Linux build
 2016-10-19 17:41:19 -07:00
Atlante45
bc8554fd90 Fix sequence number race condition 2016-10-19 13:31:00 -07:00
Stephen Birarda
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Seth Alves
b936252609 quiet compiler 2016-10-18 17:56:57 -07:00