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

49397 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
1788d19260 remove some debug code 2016-12-20 14:00:25 -08:00
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Philip Rosedale
632af18c1d PR feedback - flag for setting color 2016-12-20 12:09:42 -08:00
Philip Rosedale
e2dfbf1b02 Addressed PR feedback - now dynamically reads userdata 2016-12-20 12:02:13 -08:00
Andrew Meadows
03114fa610 add AvatarsPerSec trace stats 2016-12-20 11:45:21 -08:00
Brad Hefta-Gaub
f8bae60361 make debug log autoscroll when you add new content to it 2016-12-20 11:27:18 -08:00
Chris Collins
5cc1cd758f Merge pull request #9236 from jherico/chrome_tracing 
Updates to tracing, removing log spam
 2016-12-20 11:17:17 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4 Merge pull request #9235 from davidkelly/dk/fingerprintInPAL 
Expose Machine Fingerprint in PAL
 2016-12-20 10:06:36 -08:00
Brad Hefta-Gaub
6a7fa63327 classify ScriptEngine errors better, and send them as signal to JS 2016-12-20 09:00:01 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Hefta-Gaub
1e5e6a12db add support for an HMD script debug log window 2016-12-19 19:34:24 -08:00
Brad Hefta-Gaub
0c9ff87feb add support for an HMD script debug log window 2016-12-19 19:34:14 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
David Kelly
4feec85337 CR feedback 
Though this seems like a hard place to remember, when we make further
changes.
 2016-12-19 17:23:24 -08:00
Brad Hefta-Gaub
df954cab10 remove some log spam, recatargorize script logs to allow fine grain filtering 2016-12-19 16:15:10 -08:00
David Kelly
5b9c19b39e Versioning 2016-12-19 16:06:12 -08:00
Howard Stearns
891aba31a1 Merge pull request #9233 from samcake/ambient 
Introducing a fix for the overlayered model drawn in front
 2016-12-19 15:56:32 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
howard-stearns
a45e4da75f Initialize AvatarMixerClientData with the proper node id (should not be 
zeros for everyone). Then, in interface, check identity packets for self
and make sure they're handled.
 2016-12-19 15:22:42 -08:00
Brad Davis
9b0d0b3e7a Updates to tracing, removing log spam 2016-12-19 15:12:48 -08:00
Brad Hefta-Gaub
a4d36008c3 remove offscreen surface log spam 2016-12-19 14:50:28 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
samcake
c435afb728 Introducing a fix for the overlayered model drawn in front 2016-12-19 13:17:56 -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
aeb40a6e0c Merge pull request #9226 from zfox23/Get_Username_From_UUID 
Show Usernames to Admins in PAL
 2016-12-19 11:48:31 -08:00
Zach Fox
4bfc04a6ec Small CR changes 2016-12-19 10:41:18 -08:00
Philip Rosedale
70942925bc Entity script for ambisonic sound emitter 2016-12-19 10:32:17 -08:00
Zach Fox
ee2f600d2e Fix username display bug 2016-12-19 10:20:08 -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
aa837d8858 It's working! Untested on human avatars. 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
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -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
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
Stephen Birarda
59f6c8857d Merge pull request #9180 from huffman/feat/tutorial-touch 
Add touch support to tutorial
 2016-12-16 17:12:22 -08:00
Ryan Huffman
0962494522 Revert "Temporarily replace content set URL" 
This reverts commit 37c0f7658d.
 2016-12-16 16:40:21 -08:00
Ryan Huffman
1d9a32c528 Add FIXME comment to texture setting in Model.cpp 2016-12-16 16:32:53 -08:00
Ryan Huffman
9730d07f59 Cleanup tutorial scripts 2016-12-16 16:01:44 -08:00
Ryan Huffman
46d8130782 Cleanup variable naming in touch controller config 2016-12-16 16:01:26 -08:00
Ryan Huffman
217d46704d Update req tutorial version for Oculus Touch 2016-12-16 15:41:04 -08:00
Ryan Huffman
37c0f7658d Temporarily replace content set URL 2016-12-16 15:40:20 -08:00
David Kelly
b68a07e930 Merge pull request #9197 from davidkelly/dk/injectorVolume 
No longer applying volume when reading audio injector buffer
 2016-12-16 15:11:33 -08:00