Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 13:56:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51434 commits 74 branches 59 tags 1.2 GiB
Commit graph

21167 commits

Author SHA1 Message Date
Andrew Meadows
b7cd8827f9 collision events for owned objects only 
also: fewer entityID lookups for scripted collision sounds and events
 2017-01-30 13:21:23 -08:00
Andrew Meadows
ed17c4fa16 fix an old typo about when to send collision event 2017-01-30 13:19:38 -08:00
Andrew Meadows
54b4612ee3 fix for missed START collision events 2017-01-30 13:18:26 -08:00
Anthony J. Thibault
0542945110 Moved SoundEffect into a separate compilation unit. 
Also, fixed license header in TabletScriptingInterface, to include proper author and date.
 2017-01-30 12:46:22 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Seth Alves
ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-30 08:15:29 -08:00
Seth Alves
1a511272b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-27 13:06:22 -08:00
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
Zach Pomerantz
38af24ad4a Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local 2017-01-27 14:57:27 -05:00
Zach Pomerantz
24ca765a39 add hrtf gain getter 2017-01-27 14:36:59 -05:00
Dante Ruiz
006c3a99dc fix tablet menu crashing 2017-01-27 19:04:53 +00:00
Bradley Austin Davis
8d45f43ba8 Disable sparse textures 2017-01-27 10:06:31 -08:00
Andrew Meadows
489fbc6299 compute Model's local bounds outside render lambda 2017-01-27 09:35:36 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
Chris Collins
5ed376afc9 Merge pull request #9257 from ZappoMan/tuneAvatarInfo 
avatar mixer bandwidth optimization
 2017-01-26 17:33:57 -08:00
David Kelly
77ca4cf515 Avoid holding 2 locks at same time 
If they are always called in same order, you are fine.  But just in
case, lets instead grab one lock, update the data, release it and then
grab the other.  No possible deadlock in that, even if the order is
changed in one place or another.
 2017-01-26 17:38:32 -07:00
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding 
- spelling fix
 2017-01-27 01:19:11 +01:00
Zach Pomerantz
1c5228cb6d fix AudioRingBuffer::appendData 2017-01-26 19:16:02 -05:00
Howard Stearns
866f9debcd Merge pull request #9526 from highfidelity/edit-entity-filter 
Edit entity filter (from branch)
 2017-01-26 16:00:48 -08:00
Zach Pomerantz
3d526a1024 Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local 2017-01-26 18:56:58 -05:00
ZappoMan
af426063ac fix bad merge 2017-01-26 15:19:25 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
samcake
19858bda78 Merge pull request #9493 from AndrewMeadows/otherAvatars 
optimize, prioritize, and timebox processing of avatar updates
 2017-01-26 13:30:51 -08:00
samcake
52cbac0018 Merge pull request #9510 from jherico/sparse_size_estimation 
Attempt to account for sparse texture memory overhead
 2017-01-26 12:59:15 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
0c9e42e2d9 Merge pull request #9486 from huffman/fix/overlay-parent-reg-point 
Fix Overlay-as-child of model entity with reg point
 2017-01-26 10:59:01 -08:00
Andrew Meadows
b8afc87ad9 remove cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3 remove cruft: Avatar::setShouldDie() 2017-01-26 08:35:26 -08:00
Andrew Meadows
09707217ec remove Model::simulateInternal() 2017-01-26 08:35:25 -08:00
Andrew Meadows
d8a10320d1 fix warning about implicit cast 2017-01-26 08:35:25 -08:00
Andrew Meadows
88bf126168 remove old avatar culling and LOD logic 2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f add and remove some profile data points 2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Howard Stearns
f36b968860 Merge branch 'edit-entity-filter' into entity-filter-resource 2017-01-25 19:39:12 -08:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
howard-stearns
4437063a3a remove logging, now that we have error logging 2017-01-25 17:04:09 -08:00
howard-stearns
9cbc4fd1b9 Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource 2017-01-25 16:23:52 -08:00
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Clément Brisset
3f34a9e832 Merge pull request #40 from birarda/entity-script-server 
hack to accept possibly newer server scripts
 2017-01-25 13:21:45 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Stephen Birarda
304618f51d cleanup comment and scoping for server script URL changes 2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9 a simple hack to accept newer server scripts 2017-01-25 12:39:41 -08:00
Bradley Austin Davis
70664b64eb Attempt to account for sparse texture memory overhead 2017-01-25 10:59:49 -08:00
Ryan Huffman
9e4f47d57f Update AvatarData to use the default parent joint index 2017-01-25 09:08:54 -08:00
Ryan Huffman
d607e74d3c Merge pull request #9501 from Atlante45/fix/steam-api 
Fix Steam scripting interface calls
 2017-01-25 08:21:02 -08:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -08:00
Stephen Birarda
586c3512a7 remove useless additional includeThisEntity sets 2017-01-24 17:35:45 -08:00
Atlante45
b4400af026 Rename Steam.isRunning to Steam.running 2017-01-24 17:06:50 -08:00
Stephen Birarda
69b47dcf50 use currentParameters instead of getJSONParameters() 2017-01-24 16:49:17 -08:00
Stephen Birarda
67a3d97f81 cleanup includeThisEntity check 2017-01-24 16:41:20 -08:00
Stephen Birarda
543d0ce77e add a comment about usesFrustum check in EntityTreeElement 2017-01-24 16:36:44 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Atlante45
808d336fe6 Protect again empty plugin 2017-01-24 16:17:49 -08:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get 
the filter program from file
 2017-01-24 16:14:41 -08:00
Atlante45
b4d3a2b79f Fix member not being set 2017-01-24 16:13:28 -08:00
Stephen Birarda
5a3f99a504 Merge pull request #9479 from birarda/bug/whitelist-starts-with 
use host check for entity script whitelist instead of startsWith
 2017-01-24 15:21:25 -08:00
Anthony J. Thibault
bff0eeef75 Added username to tablet header 2017-01-24 14:31:57 -08:00
ZappoMan
1309af6d7a CR feedback 2017-01-24 12:47:47 -08:00
ZappoMan
b3eb87e8db Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-24 12:22:20 -08:00
ZappoMan
44b8a57ed3 more CR feedback 2017-01-24 12:18:33 -08:00
howard-stearns
c25072c1db Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-24 12:15:39 -08:00
ZappoMan
cb812ca506 CR feedback 2017-01-24 12:06:31 -08:00
ZappoMan
8b662647bd CR feedback 2017-01-24 12:01:57 -08:00
howard-stearns
da914f0a4f bypass entity-server edit filter if you have lock/unlock rights 2017-01-24 11:59:31 -08:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Stephen Birarda
479aa93ab2 Merge pull request #9480 from birarda/bug/web-entity-safe-url 
cleanup debug for safe web entity URLs
 2017-01-23 16:53:07 -08:00
Seth Alves
3496e4cc7a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 16:50:41 -08:00
Stephen Birarda
9229a07f6a avoid failing scheme check 2017-01-23 16:46:59 -08:00
ZappoMan
0655b47dd7 fix warnings 2017-01-23 16:44:55 -08:00
Stephen Birarda
7362bf16c1 use isParentOf to check script whitelist, clarify description in settings 2017-01-23 16:44:28 -08:00
ZappoMan
efdc82f194 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 16:39:42 -08:00
Ryan Huffman
f0f5f8871c Fix Overlay-as-child of model entity with reg point 
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.

Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
 2017-01-23 16:08:01 -08:00
ZappoMan
6801099cd9 more cleanup 2017-01-23 16:03:07 -08:00
howard-stearns
ada685a376 cr changes 2017-01-23 15:31:55 -08:00
Zach Pomerantz
445a97e07c Merge pull request #9476 from zzmp/js/audio-injector-finished 
Connect audio injector signal to scripting
 2017-01-23 18:13:54 -05:00
ZappoMan
81b5a3c585 more cleanup 2017-01-23 15:12:54 -08:00
ZappoMan
5f9f051c3c more tweaks 2017-01-23 15:01:50 -08:00
Stephen Birarda
a8118e83ff cleanup debug for safe web entity URLs 2017-01-23 13:54:43 -08:00
howard-stearns
24a9cf1f23 Merge branch 'edit-entity-filter' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-23 13:52:39 -08:00
Seth Alves
c958314918 merge from upstream 2017-01-23 13:52:01 -08:00
Stephen Birarda
db398b7850 check URL host for script whitelist, not startsWith 2017-01-23 13:36:02 -08:00
ZappoMan
e0bad95257 some cleanup 2017-01-23 13:18:55 -08:00
Clément Brisset
19622f86bf Merge pull request #9475 from Atlante45/fix/injector-options 
Fix invalid volume values in injector options silencing all injectors
 2017-01-23 13:17:55 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
howard-stearns
0a4634446d typo 2017-01-23 13:09:28 -08:00
ZappoMan
292d472a59 checkpoint - got first cut at distance based rotation tolerance working 2017-01-23 13:06:29 -08:00
howard-stearns
3358d58d01 Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-23 12:21:32 -08:00
Zach Pomerantz
cba0b295e8 connect audio injector signal to scripting 2017-01-23 15:09:08 -05:00
Stephen Birarda
f02832ca71 output the actual value set in WebEntityItem 2017-01-23 11:50:05 -08:00
Atlante45
3f8b2f9cbb Fix invalid volume values in injector options 2017-01-23 11:49:07 -08:00
Stephen Birarda
d7651e9838 move value sanitizing to WebEntityItem 2017-01-23 11:45:21 -08:00
Stephen Birarda
99e0c8c0e7 use fromUserInput in web entity URL set to avoid crashable URLs 2017-01-23 11:37:54 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Ryan Huffman
9b1cd52fb4 Add the ability to get the context that a script is running in 2017-01-23 08:58:01 -08:00
Zach Pomerantz
061668cba4 use lock-free pipe for local audio in device callback 2017-01-22 00:25:08 -05:00
Clément Brisset
6da188b6ae Merge pull request #33 from huffman/feat/entity-server-script-property 
Fix compilation error and move MessageID to CilentServerUtils
 2017-01-20 17:37:01 -08:00
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