Commit graph

21167 commits

Author SHA1 Message Date
howard-stearns
7b986dcac6 works, but removes an optimization we'd like to keep 2017-01-20 17:03:52 -08:00
Ryan Huffman
be9b19e534 Fix default param ref failing on non-MSVC builds 2017-01-20 16:43:35 -08:00
Ryan Huffman
e9c6e9dd5c Move MessageID to ClientServerUtils 2017-01-20 16:43:11 -08:00
Dante Ruiz
41bf65ed5e home button improvments 2017-01-20 16:35:41 -08:00
Clément Brisset
95f07f3917 Merge pull request #32 from huffman/feat/entity-server-script-property
PR FIxes
2017-01-20 15:39:22 -08:00
Zach Pomerantz
72f8fa49f9 inline audio convertToFloat 2017-01-20 18:38:21 -05:00
Zach Pomerantz
df051ff8df maintain network audio in int16_t 2017-01-20 18:37:46 -05:00
Ryan Huffman
888d7ab03d Add exception information to script status 2017-01-20 15:33:48 -08:00
Atlante45
29b5daba3a Revert input events script callbacks 2017-01-20 15:30:25 -08:00
Zach Pomerantz
685483b924 do not omit local audio when echoing server audio 2017-01-20 17:52:03 -05:00
samcake
afd3c3b504 Merge pull request #9436 from AndrewMeadows/cauterization-cleanup
Cleanup of code that decides not to render head when in first-person
2017-01-20 14:49:08 -08:00
Ryan Huffman
4e358f76fe Remove trailing whitespace from EntityItemProperties.cpp 2017-01-20 14:36:45 -08:00
Ryan Huffman
ee8898568d Remove const from getScript & getServerScripts 2017-01-20 14:36:01 -08:00
Stephen Birarda
ab8a0a7d39 Merge pull request #30 from Atlante45/ess-pr
Remove unnecessary const from `const bool`
2017-01-20 14:22:11 -08:00
Stephen Birarda
5ef0bd7573 remove weird extra whitespace 2017-01-20 14:10:42 -08:00
Stephen Birarda
7e9dffc028 fix version number for EntityQuery JSON filter 2017-01-20 14:08:28 -08:00
Stephen Birarda
1e25b5012f use a static_cast to get EntityNodeData 2017-01-20 14:05:55 -08:00
Stephen Birarda
67951517b4 don't grab the JSON filters for each entity checked 2017-01-20 13:59:48 -08:00
Atlante45
8740481579 Remove unnecessary const from const bool 2017-01-20 13:54:49 -08:00
Stephen Birarda
6376068021 fix usesFrustum check in OctreeQueryNode 2017-01-20 13:54:46 -08:00
Zach Pomerantz
bb247fe8a3 rename AudioMixRingBuffer 2017-01-20 14:48:54 -05:00
Zach Pomerantz
280ed04f74 fix unused warning for channel up/downmix 2017-01-20 14:43:41 -05:00
Zach Pomerantz
75281099bd add conformant explicit instantiation for AudioRingBuffers 2017-01-20 14:33:54 -05:00
Stephen Birarda
5c5c69fff3 setup the repeated message flusher on LogHandler thread 2017-01-20 11:20:48 -08:00
Stephen Birarda
1b778a3ee0 fail quietly if local injection cannot happen 2017-01-20 10:42:07 -08:00
Stephen Birarda
eb033c797a fallback if local URL empty when loading default scripts 2017-01-20 10:36:57 -08:00
Seth Alves
6641f9bafd Merge pull request #9444 from druiz17/homeButtonFix
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Stephen Birarda
25bd6fa2c1 move recording interface to Agent/Application only 2017-01-20 10:27:08 -08:00
Seth Alves
c492319be2 merge from upstream 2017-01-20 10:14:11 -08:00
Zach Pomerantz
5927c089ac use AudioRingMixBuffer as LocalInjectorsStream 2017-01-20 12:29:44 -05:00
Zach Pomerantz
02e62938a4 add AudioRingMixBuffer 2017-01-20 12:29:44 -05:00
Zach Pomerantz
95a7b38ea4 templatize AudioRingBuffer 2017-01-20 12:29:44 -05:00
Zach Pomerantz
4f7f3c2a60 mv localInjectorsBuffer to float-based localInjectorsStream
The localInjectorsBuffer is based on
AudioRingBuffer, which only accounts for int16_t.
Local injectors are mixed, and so they can exceed
std::numeric_limits<int16_t> before limiting.
This will allow them to remain as float until
limiting (in the device callback) - once the new
stream is implemented.
2017-01-20 12:29:44 -05:00
Zach Pomerantz
c5415f9624 clean audio client logs 2017-01-20 12:29:44 -05:00
Zach Pomerantz
7261b5285e omit all injector samples on server echo 2017-01-20 12:29:44 -05:00
Zach Pomerantz
492795f7e5 audio client cosmetics 2017-01-20 12:29:44 -05:00
Zach Pomerantz
4c7c7ee3cc mv audio injector preparation to own thread 2017-01-20 12:29:44 -05:00
Zach Pomerantz
d7085ec685 add audio helpers convertToMix/Scratch 2017-01-20 12:29:44 -05:00
Zach Pomerantz
d1673e554f simplify audio bytesWritten computation 2017-01-20 12:29:44 -05:00
Zach Pomerantz
0f08abfa14 fix bug in audio samples popped check 2017-01-20 12:29:44 -05:00
Zach Pomerantz
61f7f72c5e simplify resampling 2017-01-20 12:29:44 -05:00
Zach Pomerantz
42f5af7c39 improve audiostream debug logs 2017-01-20 12:29:44 -05:00
Zach Pomerantz
969d776e1f queue injector audio after device callbacks
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
2017-01-20 12:29:44 -05:00
Zach Pomerantz
dee5f63037 rename audio mix/scratch buffers
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2017-01-20 12:29:44 -05:00
Zach Pomerantz
0f1ec63b17 enable injectors in audio device callback 2017-01-20 12:29:44 -05:00
Zach Pomerantz
3a0d874bb5 add injector ring buffer to audio client 2017-01-20 12:29:44 -05:00
Zach Pomerantz
a7ecf41a42 add audio limiting to device callback 2017-01-20 12:29:44 -05:00
Zach Pomerantz
24d53ea13c rm audio output limiting 2017-01-20 12:29:44 -05:00
Zach Pomerantz
ebe96f9b25 rm injectors from mixed audio processing 2017-01-20 12:29:44 -05:00
Ryan Downe Karpf
03851d4188 Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
Stephen Birarda
c5140ac695 use ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS in EntityItemProperties 2017-01-19 16:42:14 -08:00
Stephen Birarda
0cb14ab25c whitespace fix in EntityTreeElement 2017-01-19 16:42:14 -08:00
Stephen Birarda
a40c25ddbf fix repeated send of matching entities 2017-01-19 16:42:14 -08:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Atlante45
3203e8c7c2 Use Huffman's version of getEntityScriptDetails 2017-01-19 15:49:40 -08:00
Atlante45
20a82df9a0 Fix scripts not reloading in certain edge cases 2017-01-19 15:48:44 -08:00
Ryan Huffman
091c353a85 Add comment to endif in EntityScriptUtils 2017-01-19 15:47:52 -08:00
Ryan Huffman
36a46c1bd6 Add EntityScriptUtils 2017-01-19 15:44:15 -08:00
Ryan Huffman
ff65d0c8cb Fix property assignment in GetScriptStatusRequest 2017-01-19 15:33:17 -08:00
Ryan Huffman
465f5c6789 Add getters to ScriptStatusRequest 2017-01-19 15:09:16 -08:00
Ryan Huffman
c252d80782 Fix EntityScriptDetails having incorrect scriptText 2017-01-19 14:41:56 -08:00
Andrew Meadows
10cdea9cd8 cleanup model fade logic 2017-01-19 14:17:50 -08:00
Andrew Meadows
b7c1bfaf58 another attempt to fix model transform 2017-01-19 14:01:40 -08:00
Zach Fox
64ef3d5665 Merge pull request #9426 from zfox23/PAL_AdminLabel
PAL: Admin Labels, Updated Letterboxes
2017-01-19 13:48:05 -08:00
Ryan Huffman
d45f5ade97 Update Entities.getServerScriptStatus to return more information 2017-01-19 13:27:44 -08:00
Ryan Huffman
fa28933464 Update EntityScriptClient to receive more status information 2017-01-19 13:27:44 -08:00
Ryan Huffman
cbb55a06a0 Update ScriptEngine to store full running status off entity scripts 2017-01-19 13:27:44 -08:00
Andrew Meadows
d3af420516 fix broken model transforms 2017-01-19 13:07:50 -08:00
Andrew Meadows
1d6f47e3d8 repack to reduce MeshPartPayload footprint 8 bytes 2017-01-19 12:56:08 -08:00
Andrew Meadows
bfbef91f53 re-enable cauterization of meshes for MyAvatar 2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b move cauterization out of Model class 2017-01-19 12:56:07 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Clément Brisset
89d1242925 Merge pull request #10 from huffman/feat/entity-server-script-property
Entity script status + reload
2017-01-19 11:19:40 -08:00
howard-stearns
c9c9b30c50 Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-19 10:30:18 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
Brad Davis
70de00c6bf Merge pull request #9421 from jherico/more_trace_details
Additional trace details for GPU timing, frame data updates
2017-01-19 09:12:34 -08:00
Dante Ruiz
30b57b62da toggle help 2017-01-19 08:12:49 -08:00
samcake
149e727cf3 Merge pull request #9429 from gcalero/android_forward_shaders
Create render forward version of pixel shaders
2017-01-19 00:48:25 -08:00
Stephen Birarda
33cde412b1 make getJSONParameters thread-safe 2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66 pass usesFrustum down to EntityTreeElement 2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95 fix for unpack of OctreeQuery 2017-01-18 17:49:54 -08:00
samcake
05304c72e0 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-18 17:00:20 -08:00
samcake
027bd30cbc Removing macOS warning 2017-01-18 16:59:50 -08:00
Atlante45
cbc69fbf9e Fix script preload functions 2017-01-18 16:42:25 -08:00
Brad Davis
1ef4ac9a6c Additional trace details for GPU timing, frame data updates 2017-01-18 16:19:32 -08:00
Atlante45
e94cccf08d Fix server script preload funcitons 2017-01-18 16:12:41 -08:00
samcake
e3da6aa9f1 Removing the comment 2017-01-18 15:03:31 -08:00
Stephen Birarda
112b119f17 send entities that just stopped matching filter 2017-01-18 14:58:36 -08:00
Stephen Birarda
5d1b53c600 move map population with properties back 2017-01-18 14:58:36 -08:00
Stephen Birarda
b08bfe93f4 change lastViewFrustumSent to lastQuerySent 2017-01-18 14:58:36 -08:00
Stephen Birarda
a1ad496772 handle match on non-default serverScripts property during entity send 2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034 leverage JSON filter changes to OctreeQuery in EntityServer 2017-01-18 14:58:36 -08:00
Stephen Birarda
f9f958aef1 provide direct access to OctreeQuery from OHV 2017-01-18 14:58:36 -08:00
Stephen Birarda
6e6f2c50b8 leverage OctreeQuery enhancements in EntityScriptServer/OHV 2017-01-18 14:58:36 -08:00
Stephen Birarda
ed68d5a7a2 add JSON filter to OctreeQuery 2017-01-18 14:58:36 -08:00
Zach Fox
0ec01c0dc5 CR feedback 2017-01-18 14:55:53 -08:00
howard-stearns
90c9c5b137 logging change 2017-01-18 14:32:05 -08:00
Gabriel Calero
5602479988 Create render forward version of pixel shaders 2017-01-18 19:18:59 -03:00
howard-stearns
957b1d9ae4 pass just what is given to filter, more or less 2017-01-18 13:22:54 -08:00
howard-stearns
00e53c8ea6 more tractable copy semantics 2017-01-18 13:21:28 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Seth Alves
b6188bb73a fix warnings 2017-01-18 12:49:25 -08:00
Ryan Huffman
3b5b88e719 Move MessageID to AssetUtils 2017-01-18 11:17:13 -08:00
Ryan Huffman
d85f27e992 Add Entities.getServerScriptStatus 2017-01-18 11:15:59 -08:00
Ryan Huffman
8137c59ef7 Add support for sending requests to entity script server 2017-01-18 11:15:29 -08:00
howard-stearns
60eb6dca9d remove debug dump that was printing to screeen during << operator 2017-01-18 10:29:11 -08:00
howard-stearns
2e9b26057e refactor bumpTimestamp, and fix implementation of wasChanged 2017-01-18 10:27:32 -08:00
howard-stearns
d9182cd38d Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-18 10:02:27 -08:00
Dante Ruiz
1c13f538f7 removed debug output 2017-01-18 17:08:13 +00:00
Dante Ruiz
fa3bea52cd fixed bug with menu 2017-01-18 16:45:27 +00:00
Dante Ruiz
baff07b0f9 controller with menus finally work 2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b tabletFocus update 2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9 some what working d-pad 2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8 saving work 2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Seth Alves
0abb41ca2d Merge pull request #9413 from hyperlogic/tablet-ui
clara.io marketplace works on tablet
2017-01-18 06:37:55 -08:00
Brad Davis
a593a2116a Removing magic numbers 2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab Consume fewer resources in AssetServer when interface is running locally 2017-01-17 18:15:39 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
Zach Fox
7a568ed8a7 Merge pull request #9401 from zfox23/PAL_DisplayName
PAL: Editable Display Names & Immediate Update
2017-01-17 16:00:41 -08:00
Atlante45
ff3f175fb7 Fix typos 2017-01-17 15:39:54 -08:00
Anthony J. Thibault
56fc42a2bd clara.io marketplace works on tablet 2017-01-17 15:38:44 -08:00
Ryan Huffman
340eeb94fa Add return type to lambdas in EntityTreeRenderer 2017-01-17 15:24:14 -08:00
Ryan Huffman
812aaee48c Add Entities.reloadServerScripts 2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
David Kelly
341ac685e9 Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists
remove ignored avatars from PAL when they disconnect
2017-01-17 14:21:36 -08:00
Atlante45
8d199ded15 Check collision against the right owner 2017-01-17 13:47:45 -08:00
Atlante45
5db37fff95 More entity script server work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
David Kelly
9b1aaf3bfe CR feedback 2017-01-17 12:09:47 -08:00
Zach Fox
246f5fb7f5 Add log; fix whitespace 2017-01-17 11:51:09 -08:00
samcake
69f9053e61 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-17 10:55:10 -08:00
samcake
305e308575 avoiding the exclusive filtering behavior 2017-01-17 10:54:45 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
samcake
960f4f0ead Move the drawBOunds job to DrawTasks 2017-01-16 18:33:42 -08:00
ZappoMan
6e5e9d3492 more work 2017-01-16 18:28:01 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
Seth Alves
f900629cdb Merge pull request #9390 from sethalves/load-models-in-keyhole
fix physics not starting up when a model is close behind
2017-01-16 18:06:23 -08:00
samcake
0b9b5d595c Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08:00
Zach Fox
1e8effdcc4 Packet verison bump 2017-01-16 15:28:53 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
Zach Fox
e98a40c30e Does this work? 2017-01-16 14:43:30 -08:00
Zach Fox
3b56f46206 Style changes 2017-01-16 13:18:24 -08:00
howard-stearns
09a57efaf3 checkpoint 2017-01-16 12:47:26 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Zach Fox
2f176f50fa Another checkpoint 2017-01-16 10:44:54 -08:00
Zach Fox
d2c7342a62 Merge pull request #9352 from zfox23/PerAvatarVolume
PAL: Per-Avatar Volume Slider; visual tweaks
2017-01-16 10:34:31 -08:00
Brad Davis
67ce5040ec Fix bug in FBX parse changes 2017-01-16 10:09:47 -08:00
howard-stearns
831d01c23a Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-16 10:07:06 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
Seth Alves
f0248275ec Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui 2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2 load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled. 2017-01-15 17:04:51 -08:00
ZappoMan
c9c311e275 checkpoint for distance joints 2017-01-15 11:47:48 -08:00
Seth Alves
3b4f5e3023 don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint 2017-01-15 11:27:29 -08:00
ZappoMan
c884b276e2 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-14 22:15:22 -08:00
Seth Alves
0744a148b1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-14 18:00:09 -08:00
Ken Cooke
42e13d1e97 Fix audio failures on systems that return incorrect/unsupported mixFormat 2017-01-14 10:26:13 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8 Fixme 2017-01-13 12:59:24 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
5a81dface9 avoid filling log with bogus warning 2017-01-13 12:00:51 -08:00
ZappoMan
3a9a6e8283 local position tweaks 2017-01-13 09:09:29 -08:00
ZappoMan
ee4df20df3 duh 2017-01-12 19:27:28 -08:00
ZappoMan
2e48444422 hack 2017-01-12 19:03:58 -08:00
Seth Alves
88f3ff7977 Merge pull request #9376 from hyperlogic/tablet-ui3
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 18:17:53 -08:00
Anthony J. Thibault
1b4146af6d Prevent crash when closing the tablet while a sound is playing. 2017-01-12 17:23:06 -08:00
ZappoMan
aed1b69ee0 make the avatar bounding box be avatar local and only change when it actually changes 2017-01-12 17:19:06 -08:00
Seth Alves
e9422cbf1e fix model scales 2017-01-12 16:38:27 -08:00
Brad Davis
29b160d685 Reduce temp qvariant creation and qvariant conversion 2017-01-12 16:17:03 -08:00
Brad Davis
2383592678 Improve FBX parsing performance by bulk loading of arrays 2017-01-12 16:17:02 -08:00
Seth Alves
5fa379fea2 fix model scales 2017-01-12 16:12:43 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
samcake
ca53235d54 Merge pull request #9358 from AndrewMeadows/model-cleanup
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00
Anthony J. Thibault
37804d1875 Fix for linux warning 2017-01-12 13:32:01 -08:00
Anthony J. Thibault
cf138eb1fd Fixes for qt asserts in debug
* The TabletScriptingInterface destructor is invoked on app shutdown after the logging system has been destroyed.
  To avoid this I removed the destructor.  The log was only for debug purposes anyway.
* Removed calls to setProperty() these calls are not thread safe and were causing asserts during debug.
  Instead of getting and setting the property we maintain the TabletProxy state using an enum.
2017-01-12 10:49:41 -08:00
Seth Alves
0746d38cae Merge pull request #9367 from sethalves/tablet-ui-avoid-hold-action-bootstrap
Tablet ui avoid hold action bootstrap
2017-01-12 10:14:01 -08:00
Seth Alves
a47aaea37a don't bootstrap self with an avatar hold action 2017-01-12 10:12:45 -08:00
ZappoMan
dd85cd9558 one more shot at kens way 2017-01-12 08:48:33 -08:00
ZappoMan
0e600fc8fd more audio loudness tweaks 2017-01-12 07:56:09 -08:00
ZappoMan
fe06dfdca7 tweak audioLoudness packing 2017-01-11 18:58:43 -08:00
Anthony J. Thibault
26a5b5ed91 Fix for rendering of tablet ModelEntity in desktop mode.
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable.  This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
ZappoMan
0661531e3a try another version of an 8bit audio loudness 2017-01-11 17:51:12 -08:00
Andrew Meadows
c060fd6a68 restore updateClusterMatrices() in render() 2017-01-11 17:33:30 -08:00
Andrew Meadows
e2130d33d9 speedup cauterizedClusterMatrices math 2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d remove cruft: unused function arguments 2017-01-11 15:02:18 -08:00
Brad Davis
27293c342c Change present rate to be an average over 1/10th of a second 2017-01-11 14:27:46 -08:00
Brad Davis
e256f7cccc Remove sendqueue spam in traces 2017-01-11 14:27:27 -08:00
Brad Davis
f235a52a6d Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet 2017-01-11 14:21:29 -08:00
Andrew Meadows
87bdaae05a remove scale from ModelMeshPartPayload's transform 2017-01-11 12:38:47 -08:00
ZappoMan
407ad633e0 more cleanup use kens 1 byte audio gain 2017-01-11 11:01:49 -08:00
ZappoMan
5b76eaaf52 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-11 10:22:14 -08:00
Ken Cooke
083c7bc523 Add a local HRTF gain adjustment. Gain adjustments are persistent and properly interpolated. 2017-01-11 10:05:39 -08:00
Seth Alves
9be2f26407 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-11 09:55:58 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Andrew Meadows
bd16824d55 remove cruft: Model::_pupilDilation 2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98 add assert and TODO comment 2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0 cleanup class method declarations 2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6 remove cruft 2017-01-11 06:55:13 -08:00
sam
7a01b856f7 Factorization of the modelTransform out of the cluster matrices 2017-01-11 02:33:56 -08:00
Andrew Meadows
44699fc661 modelToWorld rotation not in cluster matrices 2017-01-10 16:21:13 -08:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c Merge pull request #9343 from druiz17/menuApp
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera.
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
ZappoMan
182edf0e9a change avatarOrientation to use SixByteQuat packing 2017-01-10 09:41:11 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
Dante Ruiz
6705846518 clean up round 1 2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Dante Ruiz
3fab901b49 commit chabges 2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1 first commit 2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
ZappoMan
8bbfb51419 some cleanup 2017-01-10 08:37:01 -08:00
Seth Alves
4a29cce584 adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled 2017-01-10 06:17:40 -08:00
samcake
8c7ec8b0c5 Add profiling in COntext batch execution and shortcuts for trace names 2017-01-09 18:05:02 -08:00
ZappoMan
eadb1758f9 adding some rate debugging 2017-01-09 17:07:47 -08:00
Seth Alves
35577f49d0 change the test for when MY_AVATAR collisions are short-circuited 2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba set DIRTY_COLLISION_GROUP flag when parentID changes 2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f if something is a child of the local avatar, never let it collide with MY_AVATAR 2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6 re-evaluate an entities in-bullet status when parentID changes 2017-01-09 15:28:05 -08:00
ZappoMan
13198fd949 add datarate 2017-01-09 13:57:59 -08:00
ZappoMan
636ade9eb7 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 11:29:54 -08:00
Ryan Huffman
39070fe0d1 Merge pull request #9065 from huffman/fix/script-engine-abuse
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Anthony J. Thibault
6794ed7cc4 Merge remote-tracking branch 'upstream/master' into tablet-ui 2017-01-09 10:37:46 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene
More low level optimizations
2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub
785582057e more comments 2017-01-08 20:35:52 -08:00
Seth Alves
a9194e1bdb Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-08 11:41:32 -08:00
Howard Stearns
b432ffa78d Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Zach Fox
b7d64804c1 Remove errant //FIXME 2017-01-05 21:55:09 -08:00
Brad Hefta-Gaub
251495978c more work on delta sending 2017-01-05 19:46:19 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
Anthony J. Thibault
70078b0e78 Fix for linux build 2017-01-05 15:04:16 -08:00
Brad Hefta-Gaub
86c0d76955 Merge pull request #9314 from jherico/present_priority
Use a higher thread priority for Oculus present
2017-01-05 14:02:50 -08:00
Stephen Birarda
46086cdcce set the OCULUS_STORE property with oculus store arg 2017-01-05 14:02:35 -08:00
Anthony J. Thibault
85de0d3bbf Added local only spatialized button click sounds to tablet 2017-01-05 13:54:06 -08:00
Zach Fox
2f503d0bcc Allow for compatibility with old mod.js script 2017-01-05 13:25:27 -08:00
Brad Davis
9bf4804d3d Use a higher thread priority for Oculus present 2017-01-05 11:04:50 -08:00
Brad Hefta-Gaub
5242375215 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-05 08:57:10 -08:00
Brad Hefta-Gaub
825fc1cfa1 Merge pull request #9309 from kencooke/audio-hdr-volume
High Dynamic Range Audio injectors
2017-01-05 08:10:54 -08:00
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -08:00
Brad Hefta-Gaub
5acae04420 fix some warnings 2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Clément Brisset
e34ecac843 Merge pull request #9299 from Atlante45/settings
Fix settings hitch
2017-01-04 17:19:44 -08:00
Ken Cooke
9a81a076e8 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-hdr-volume 2017-01-04 15:40:12 -08:00
Ken Cooke
afacb59999 Use logarithmic quantization of injector "volume" over the wire.
Allow gains > 1.0 (up to +30dB)
Better quantization at low levels (uniform steps in dB)
2017-01-04 15:38:26 -08:00
Zach Fox
e80ae92327 Also clear personalmutedlist upon reset() 2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Pomerantz
1b948c7a05 add skinned forward model shaders 2017-01-04 15:49:29 -05:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Zach Pomerantz
6b984d38d3 add opaque forward model shaders 2017-01-04 15:37:17 -05:00
Brad Hefta-Gaub
2d1dd13d2a Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-04 12:33:02 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Dante Ruiz
8327df55e4 removed commented out code 2017-01-04 19:21:03 +00:00
Dante Ruiz
3f34cb863e removed whitespace 2017-01-04 11:09:26 -08:00
Dante Ruiz
a30ad2709b Home button fix 2017-01-04 11:09:26 -08:00
Ryan Huffman
601aa51392 Merge branch 'master' into fix/script-engine-abuse 2017-01-04 08:09:06 -08:00
Zach Pomerantz
f7cb2ec85b add plain forward model shaders 2017-01-03 20:41:57 -05:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4 Merge pull request #9294 from fayeli/tablet-mic-level
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Zach Pomerantz
a414ba4cb5 take addPipeline lambda out of initDeferredPipelines 2017-01-03 18:55:13 -05:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Anthony J. Thibault
3c2f9acd39 Hooked up EventBridge to TabletScriptingInterface. 2017-01-03 15:43:21 -08:00
Zach Pomerantz
62eeb0c807 clean RenderPipelines with forward decls 2017-01-03 18:33:14 -05:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Brad Hefta-Gaub
94fcecb0ec Merge branch 'master' of https://github.com/highfidelity/hifi into improveScriptRPC 2017-01-03 14:42:37 -08:00
Faye Li
752051834d function style casting 2017-01-03 13:30:19 -08:00
Faye Li
d8227a686c fill in updateAudioBar function, invokes qml function 2017-01-03 12:51:26 -08:00
Faye Li
68aacfe544 added "updateAudioBar" function signature in header file 2017-01-03 12:38:23 -08:00
Zach Pomerantz
89917b41fd add Forward Draw for opaques (no pipelines) 2017-01-03 15:18:22 -05:00
Zach Pomerantz
f8e8065e93 mv DrawBounds to end of ForwardTask 2017-01-03 14:56:47 -05:00
Zach Pomerantz
2e274b026d fix line lengths 2017-01-03 14:55:47 -05:00
Zach Pomerantz
e406e3d47e Make Forward DrawBounds enableable 2017-01-03 14:46:51 -05:00
Anthony J. Thibault
850db0b6b3 jsdoc fix for TabletProxy 2017-01-03 11:20:42 -08:00
Brad Hefta-Gaub
4c1aaa376d remove cruft 2017-01-03 11:13:03 -08:00
Brad Hefta-Gaub
d440532cff make sure RPC is timely 2017-01-03 11:10:07 -08:00
Zach Pomerantz
26cfc83e20 Merge branch 'master' into graphics/fetch-cull-sort 2017-01-03 14:04:39 -05:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Brad Davis
4b4523579a Fix mirrored animations 2017-01-02 14:41:35 -08:00
Brad Davis
171440f70b PR feedback 2016-12-30 17:47:21 -08:00
Brad Hefta-Gaub
45c71fd24d Merge pull request #9288 from kencooke/audio-hrtf-avx2
Faster HRTF
2016-12-30 17:25:32 -08:00
Chris Collins
f077ac7672 Merge pull request #9282 from zzmp/graphics/forward-bg
Add background to forward rendering path
2016-12-30 16:55:09 -08:00
Ken Cooke
a42ac89a6d Faster HRTF
New AVX2 implementation of FIR_1x4() achieves 24 FLOPS per clock on HSW/BDW/SKL
Removed old AVX implementation
32-byte alignment of SIMD buffers and tables
Fixed the poorly optimized code produced by GCC -O2
2016-12-30 13:47:31 -08:00
Zach Pomerantz
15656a0592 include spatialSelection in RenderFetchCullSortTask::Output 2016-12-30 15:08:16 -05:00
Brad Hefta-Gaub
82ab8635d7 debugging 2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00 first cut at using wait signals to improve RPC timing 2016-12-30 09:13:21 -08:00
Brad Hefta-Gaub
4b9345d7c6 cleanup accidental change 2016-12-29 16:45:16 -08:00
Brad Hefta-Gaub
84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
Conflicts:
	tests/networking/src/ResourceTests.cpp
2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
0c22fcb5c4 better handling of timers 2016-12-29 16:41:14 -08:00
Zach Pomerantz
0e9da87549 FetchSortCull->FetchCullSort 2016-12-29 19:27:37 -05:00
Andrew Meadows
ff19bdceaa Merge pull request #9281 from AndrewMeadows/unit-test-cleanup
fix bitrot in unit tests
2016-12-29 16:21:35 -08:00
Zach Pomerantz
c75dd236f2 rm unused forward pipelines 2016-12-29 19:11:06 -05:00
Zach Pomerantz
d00ae05e26 add background to forward renderer 2016-12-29 19:09:06 -05:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115 I'm about to refactor this. 2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424 Getting very close. 2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Brad Hefta-Gaub
99f180f945 more hacking 2016-12-29 08:16:19 -08:00
Andrew Meadows
be0ca41eb3 make implicit cast explicit 2016-12-28 18:27:34 -08:00
Zach Fox
af1c67a252 Progress! 2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283 First steps, holding off til Howard finishes 2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20 Remove HRS logging 2016-12-28 14:37:19 -08:00
Atlante45
f79c6e08f5 Track dropped frames as reported by the Oculus SDK 2016-12-28 14:18:23 -08:00
Brad Davis
7b90d71205 Fix build 2016-12-28 13:23:05 -08:00
Brad Davis
694c8b5690 Further reduce cost of Duration class when tracing is inactive 2016-12-28 12:37:47 -08:00
Brad Davis
99af7f2819 Reduce unecessary copying in MeshPartPayload::bindMaterial 2016-12-28 12:11:27 -08:00
Brad Davis
d2179b1acf Reduce tracing impact if tracing isn't active 2016-12-28 12:11:26 -08:00
Brad Davis
3431db548f Optimize AnimPose(glm::mat) ctor 2016-12-28 12:11:25 -08:00
Brad Davis
dc75894293 Cache more values in AnimSkeleton 2016-12-28 12:11:25 -08:00
Brad Davis
e5e9ab42ea Encapsulate AnimPose members for easier optimizations 2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub
c7a5e873df debug by sending all 2016-12-27 18:34:47 -08:00
Brad Hefta-Gaub
73bfc069da more work on only sending changes 2016-12-27 17:19:55 -08:00
Andrew Meadows
b56a15b60a Merge pull request #9273 from kencooke/audio-ambisonic-src2
Improved audio resampler
2016-12-27 17:07:56 -08:00
Brad Davis
901c020aae Optimizations, SIMD and const correctness 2016-12-27 15:39:38 -08:00
Andrew Meadows
e674be9c8c fix animated entities 2016-12-27 15:15:11 -08:00
David Kelly
38a3ee4104 Some code review feedback
more to come
2016-12-27 10:17:39 -08:00
howard-stearns
a9e781f565 naming consistentcy. No functional changes. 2016-12-27 10:17:39 -08:00
howard-stearns
8b9c1446cd protocol versions 2016-12-27 10:17:39 -08:00
howard-stearns
768b747b3a Make avatar go away when ignored, even when pal is up. (But currently, it
comes back!)
2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc fixes 2016-12-27 10:14:28 -08:00
Howard Stearns
344272f24a unignore checkpoint (untested) 2016-12-27 10:14:24 -08:00
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Andrew Meadows
82eb5ea82a Merge pull request #9272 from kencooke/audio-ambisonic-limiter
Ambisonic limiter
2016-12-27 10:11:59 -08:00
Brad Hefta-Gaub
be61052368 check point 2016-12-26 12:12:23 -08:00
Anthony Thibault
9128d4b140 Merge pull request #9255 from AndrewMeadows/benji-002
optimization of incoming avatar joint data in interface client
2016-12-26 11:34:15 -08:00
Ken Cooke
a2ea6bf36e Improved audio resampler
Added LQ mode (2x faster).
Added HQ mode (2x slower), intended for offline resampling.
Default (MQ) quality is slightly improved (512 filter phases in irrational mode).
2016-12-24 11:10:35 -08:00
Ken Cooke
fc2c2a1906 fix compiler warnings 2016-12-24 10:06:30 -08:00
Ken Cooke
f5d52c3d3b 64-bit code optimizations
Use size_t for inner-loop array indexing, to avoid extraneous MOVSXD instructions when compiled with MSVC x64.
2016-12-24 09:00:23 -08:00
Ken Cooke
b878051cd9 Ambisonic limiter, with gain linking between all channels to preserve imaging 2016-12-24 08:42:56 -08:00
Seth Alves
1cb330057e fix a crash and a memory leak in vhacd-util 2016-12-23 13:05:57 -08: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
474cb604f1 fix unix error, don't send all all the time 2016-12-23 10:43:34 -08:00
Brad Hefta-Gaub
01d48a5e27 grrr 2016-12-23 10:18:48 -08:00
Brad Hefta-Gaub
62b4a132a0 more hacking 2016-12-23 09:02:13 -08:00
Andrew Meadows
648de9da8d Merge pull request #9264 from ChristophHaag/master
fix GL 4.5 when glTextureSubImage2DEXT unavailable
2016-12-23 08:36:11 -08:00
Christoph Haag
966cbb768d fix GL 4.5 when glTextureSubImage2DEXT unavailable
For example mesa
2016-12-23 01:26:54 +01:00
Brad Hefta-Gaub
02a6060b5e hacking on new format 2016-12-22 16:16:44 -08:00
samcake
b5e964f6ec Merge pull request #9260 from jherico/chrome_tracing
Working on test/trace script interface
2016-12-22 15:23:26 -08:00
Brad Davis
e58623bcc0 Working on test/trace script interface 2016-12-22 11:46:40 -08:00
Andrew Meadows
4161775673 restore context around lock 2016-12-22 10:54:58 -08:00
Brad Hefta-Gaub
977cda3d2e adjust audio loudness radix so we can support the entire range 2016-12-21 19:10:19 -08:00
Brad Hefta-Gaub
82dd9412ab tweaks, using packed scalar for audio loudness 2016-12-21 17:21:28 -08:00
Andrew Meadows
890e35e96e cleanup unnecessary scope and swap if-check order 2016-12-21 15:37:23 -08:00
Brad Hefta-Gaub
8e7b062aa2 cleanup avatar data to include better documentation 2016-12-21 11:52:24 -08:00
Andrew Meadows
0b0c3f0be4 cleanup some if-logic 2016-12-21 10:55:59 -08:00
Andrew Meadows
3830649990 remove debugging and profiling 2016-12-21 10:55:59 -08:00
Andrew Meadows
b937eff582 more faster math copying JointData 2016-12-21 10:55:59 -08:00
Andrew Meadows
3f687887b9 faster math when unpacking JointData rotations 2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233 optimizations for processing avatar joint data 2016-12-21 10:55:59 -08: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
Anthony J. Thibault
01a96347a5 Updated Web3dOverlay.cpp to work with TabletRoot.qml 2016-12-20 14:40:29 -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
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -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
samcake
28ed61cc97 Introducing a fix for the overlayered model drawn in front 2016-12-20 07:45:35 -08:00
Zach Fox
a18f9dbe90 PR comments; need particular fix on Master for full QA 2016-12-20 07:45:35 -08:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
42127e4e0f Another checkpoint, getting closer 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
Brad Davis
bfc4a6e038 Fix stat tracker missing in agents 2016-12-20 07:45:35 -08:00
David Kelly
122a70cbb2 CR feedback 2016-12-20 07:45:35 -08:00
Ryan Huffman
d1f14e46fb Add FIXME comment to texture setting in Model.cpp 2016-12-20 07:45:35 -08:00
Ryan Huffman
baa70dd1c0 Fix models not settings textures if not loaded 2016-12-20 07:45:35 -08:00
Ryan Huffman
6527997057 Fix syntax error in UserActivityLogger 2016-12-20 07:45:35 -08:00
Ryan Huffman
26067acaca Add controller name and update version in tutorial user stats 2016-12-20 07:45:35 -08:00
Ryan Huffman
b6759fb1d1 Extend HMD scripting interface to check subdevices 2016-12-20 07:45:35 -08:00
Brad Davis
d0d6b1f87e tracing polish 2016-12-20 07:45:35 -08:00
Andrew Meadows
e03e57a480 adding profile stats relating to avatar CPU costs 2016-12-20 07:45:35 -08:00
Brad Davis
441358edaf Cleanup dead code 2016-12-20 07:45:35 -08:00
David Kelly
139437e04a 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-20 07:45:35 -08:00
Ryan Huffman
21bab49f79 Add chrome tracing support 2016-12-20 07:45:35 -08:00
Zach Pomerantz
1ba317226d rm unused scene 2016-12-20 07:45:35 -08:00
Zach Pomerantz
62b9d87c6e forward render opaque bounds 2016-12-20 07:45:35 -08:00
Zach Pomerantz
bbf1e1443b rm extra buffer clears in forward render 2016-12-20 07:45:35 -08:00
David Kelly
1e66bcae1b 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-20 07:45:35 -08:00
David Kelly
7ebdc6d387 inital cut, passing fingerprint in
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
2016-12-20 07:45:35 -08:00
Ken Cooke
d2468b63fe Ambisonic resampler, optimized using AVX2.
int16_t and float versions.
Removed unused SSE2 version.
Removed unused getExactInput().
Refactored to remove nested #ifdefs.
2016-12-20 07:45:35 -08:00
David Rowe
e9dbb32277 Handle unzip failure 2016-12-20 07:45:35 -08:00
David Kelly
7402592232 Typo, plus some CR feedback 2016-12-20 07:43:48 -08:00
David Kelly
0dd7366198 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-20 07:43:48 -08:00
David Rowe
9136937954 Add canWriteAssets method and signal to Entities API 2016-12-20 07:43:48 -08:00
David Rowe
5b8a9c0bcd Add extra logging for Clara.io asset resizing 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
David Kelly
00c51ce00f No longer applying volume when reading audio injector buffer
Since we also apply the gain in HRTF (on both server and client), the
mono sources sort of had volume^2 applied to them.
2016-12-20 07:43:48 -08:00
David Rowe
4ff3599351 Tidying 2016-12-20 07:43:48 -08:00
David Rowe
2216ab6def Delete redundant code 2016-12-20 07:40:28 -08:00
David Rowe
5843185683 Tidying 2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
e85bc50333 Tidying 2016-12-20 07:38:25 -08:00
David Rowe
e0922cdf4d Add missing entity hover signal 2016-12-20 07:38:25 -08:00
David Rowe
57ca34f866 Fix up script injection methods 2016-12-20 07:33:55 -08:00
David Rowe
ef488ec036 Get script injection working in new marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
550f796440 Make script event bridge available to OverlayWindow 2016-12-20 07:33:55 -08:00
David Rowe
0ccff32365 Delete temporary directory after content has been used 2016-12-20 07:33:55 -08:00
David Rowe
467741f348 Add parameter that enables automatically adding download model to world 2016-12-20 07:33:55 -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
Anthony J. Thibault
a791ddcc22 Tablet can switch to a web url.
Help button has been updated to switch to the help.html.  It doesn't look good because
the content was authored expecting landscape window, not portrait.

The API is by no means final.  But it exposes two methods to JS.

* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
  hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.

tabletTest.js and help.js have been updated to use this functionality.
2016-12-19 17:52:19 -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
Anthony J. Thibault
856791c11d Made TabletRoot.qml the main tablet qml file.
This file uses a Loader node to load, Tablet.qml.
2016-12-19 15:15:16 -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