Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 17:56:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49046 commits 75 branches 59 tags 1.2 GiB
Commit graph

2983 commits

Author SHA1 Message Date
David Kelly
5b9c19b39e Versioning 2016-12-19 16:06:12 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS 
Adding Machine Fingerprint to Domain Server permissions
 2016-12-19 11:49:33 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
Ryan Huffman
8f536fcf5e Fix syntax error in UserActivityLogger 2016-12-16 15:05:17 -08:00
Ryan Huffman
f3f6317c91 Add controller name and update version in tutorial user stats 2016-12-16 15:05:17 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
David Kelly
7a346b99b9 Add CoreFoundation to libraries we link to on MacOS 
Turns out vhacd-util and ice-server don't link to it, and we need
it for machine fingerprint.  So the build system doesn't make mac
vhacd-util or ice-server builds I guess, or this would have shown
up awhile ago.
 2016-12-16 08:58:20 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
David Kelly
2566778654 Handle no setting manager case 
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file.  Found this when
I noticed needed to initialize com for all the assignment clients
 2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading 
Threaded Audio
 2016-12-09 10:46:54 -08:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
David Kelly
7880b5bfe0 Simple fallback now 
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
 2016-12-05 17:05:39 -08:00
David Kelly
54716f70e5 Now works on mac, small build change for that 
Plus does nothing for linux, but there's a comment.
 2016-12-05 11:11:30 -08:00
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
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
Atlante45
1d8c97b337 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-30 10:22:16 -08:00
Zach Pomerantz
e6dfc5204d expose mutex in LimitedNodeList 2016-11-28 17:13:21 -05: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
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -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