Zach Pomerantz
15656a0592
include spatialSelection in RenderFetchCullSortTask::Output
2016-12-30 15:08:16 -05:00
Zach Pomerantz
0e9da87549
FetchSortCull->FetchCullSort
2016-12-29 19:27:37 -05:00
Zach Pomerantz
ca1a14e5b0
add RenderFetchSortCull task
2016-12-23 15:54:22 -05:00
Zach Pomerantz
0fa3439949
add setOutput for graphics engine tasks
2016-12-23 15:35:28 -05:00
Zach Pomerantz
8d63067fa5
templatize graphics engine tasks' run method
2016-12-23 14:58:40 -05:00
Zach Pomerantz
dbf4f2d23b
mv shadow task setup to jobs
2016-12-23 14:58:40 -05:00
Brad Hefta-Gaub
be62df2001
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-21 08:59:29 -08:00
Brad Hefta-Gaub
5e65e3991c
CR feedback
2016-12-20 21:03:10 -08:00
David Kelly
08b6770315
Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn
2016-12-20 17:07:51 -08:00
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
