Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 18:57:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49340 commits 75 branches 59 tags 1.2 GiB
Commit graph

20383 commits

Author SHA1 Message Date
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -08:00
howard-stearns
a6e353d75f read lock, not write 2016-12-20 16:25:23 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
howard-stearns
3f4faec15f Fix idententity packet in AC 2016-12-20 16:14:59 -08:00
Brad Hefta-Gaub
c2320d317c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 2016-12-20 14:34:57 -08:00
David Kelly
4a25b727d8 Add comment back, with interest 2016-12-20 14:26:45 -08:00
Brad Hefta-Gaub
0448023a0f better handle null senders, trim lines after 2000 2016-12-20 14:14:28 -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
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
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
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
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
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
1d9a32c528 Add FIXME comment to texture setting in Model.cpp 2016-12-16 16:32:53 -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
Ryan Huffman
18a166bee8 Fix models not settings textures if not loaded 2016-12-16 15:05:17 -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
Ryan Huffman
90e121ba47 Extend HMD scripting interface to check subdevices 2016-12-16 15:05:17 -08:00
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
samcake
5ce854612a Merge pull request #9213 from jherico/chrome_tracing 
Add support for chrome tracing output
 2016-12-16 09:37:55 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Chris Collins
940ead46d0 Merge pull request #9214 from kencooke/audio-ambisonic-src 
Ambisonic resampler, optimized using AVX2
 2016-12-16 09:19:34 -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
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub
6d7d3551d9 added some stats to the mixer fixed debug logging, improved timer precision 2016-12-15 18:32:11 -08:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Brad Hefta-Gaub
ed19b4b592 remove compression at the per avatar data buffer for now, since it gave no benefit 2016-12-15 14:13:38 -08:00
Zach Pomerantz
013713f92c rm unused scene 2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba forward render opaque bounds 2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae rm extra buffer clears in forward render 2016-12-15 14:57:22 -05:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -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
Brad Hefta-Gaub
439434b300 fixes 2016-12-14 20:24:52 -08:00
Brad Hefta-Gaub
c8fb467579 send minimum data for out of view avatars 2016-12-14 18:17:11 -08:00
Stephen Birarda
6c344b0c75 Merge pull request #9211 from Atlante45/disable_steamworks 
Make Steam client calls into a plugin
 2016-12-14 17:35:51 -08:00
Brad Hefta-Gaub
2443b2d6d9 duh 2016-12-14 17:35:02 -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
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Ken Cooke
b4994a3d89 Ambisonic resampler, optimized using AVX2. 
int16_t and float versions.
Removed unused SSE2 version.
Removed unused getExactInput().
Refactored to remove nested #ifdefs.
 2016-12-14 15:18:41 -08:00
David Rowe
dbd00e39a8 Handle unzip failure 2016-12-15 11:52:34 +13:00
Brad Hefta-Gaub
daccb70819 disable compression by default 2016-12-14 13:18:09 -08:00
Andrew Meadows
c1e283fa6d Merge pull request #9201 from samcake/red 
Fix local light shading tiling issue
 2016-12-14 12:25:02 -08:00
Brad Hefta-Gaub
e57774f630 fix unix/mac build 2016-12-14 12:19:50 -08:00
Brad Hefta-Gaub
2290179281 add compression and minimal data flags to AvatarData 2016-12-14 11:47:45 -08:00
Brad Hefta-Gaub
7189f766a2 more hacking 2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
David Kelly
a8157ae2cd Typo, plus some CR feedback 2016-12-13 17:48:30 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
David Kelly
d6b99ce57e Removed volume from AudioInjectorLocalBuffer 
Since it doesn't use it.  Now clamping at 0-1 in the
AudioInjector::getVolume() call.  This is better -- one spot so it now
always gets clamped.
 2016-12-13 17:34:56 -08:00
David Rowe
be00730073 Add canWriteAssets method and signal to Entities API 2016-12-14 14:27:55 +13:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -08:00
samcake
d9cb07bf9a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 15:28:33 -08:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
samcake
f8f4ddb16a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 11:47:41 -08:00
Zach Pomerantz
9a37ccbf3c chmod -x to render-utils src 2016-12-13 14:36:41 -05:00
David Rowe
aefa116207 Add extra logging for Clara.io asset resizing 2016-12-13 17:55:22 +13:00
samcake
d4f4bd4519 Debugginfg the bad tiles lighting 2016-12-12 18:02:14 -08:00
Clément Brisset
050c0fe14a Merge pull request #9188 from kencooke/audio-wav-parser 
Fix and improve the WAV file loader
 2016-12-12 17:51:20 -08:00
Brad Hefta-Gaub
37a4253d20 Merge pull request #9192 from sethalves/es-leak 
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
 2016-12-12 17:16:00 -08:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
Stephen Birarda
b4f43e01b1 Merge pull request #9189 from huffman/feat/help-touch 
Add support for oculus touch in help menu
 2016-12-12 16:48:00 -08:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00