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
howard-stearns
f34f90841d
example
2017-01-23 13:08:33 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -08:00
Stephen Birarda
c8d505c482
Merge pull request #9474 from birarda/bug/web-entity-safe-url
...
use fromUserInput to avoid web entity crashes with bad URLs
2017-01-23 12:52:39 -08:00
Zach Pomerantz
3c9c78ae14
add threadcount to audio-mixer stats
2017-01-23 15:50:54 -05: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
Zach Pomerantz
9605379265
Merge pull request #9472 from zzmp/cmake/revert-libquazipd
...
Revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 14:31:09 -05:00
Stephen Birarda
8c5c1f32a0
Merge pull request #9471 from birarda/bug/places-paths-anchor
...
fix Places / Paths anchor in domain settings
2017-01-23 10:31:37 -08:00
Zach Pomerantz
daf507fc81
revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 13:02:15 -05:00
Stephen Birarda
ab7ce19211
use html_id for settings anchor if no name
2017-01-23 09:49:46 -08:00
Ryan Huffman
95024d2b80
Add ENTITY_SERVER_SCRIPT context to ac server
2017-01-23 09:30:30 -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
humbletim
d20ac20ff2
move isInEditMode guard to setState
2017-01-23 01:31:11 -05:00
humbletim
15394056eb
* add isInEditMode to utils.js
...
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
2017-01-20 22:29:40 -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
Ken Cooke
e1b313d9aa
Remove support for floating-point audio (not needed)
2017-01-20 16:43:46 -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
Ken Cooke
4d6eea9a63
Updated WASAPI plugins to force dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT
2017-01-20 16:40:32 -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
Ryan Huffman
ad70431c26
Fix edit.js server script status getting reset when changing properties
2017-01-20 15:34:38 -08:00
Stephen Birarda
a1ea57cf0b
Merge pull request #31 from Atlante45/ess-pr
...
Revert input events script callbacks
2017-01-20 15:34:25 -08: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
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
Clément Brisset
b60ba0ff5c
Merge pull request #29 from birarda/entity-script-server
...
some fixes from code review
2017-01-20 14:15: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
Zach Fox
d535d816f4
Merge pull request #9463 from zfox23/PAL_FixScrollingVisibility
...
PAL: Fix card visibility when selecting out-of-table users
2017-01-20 14:01:04 -08:00
Stephen Birarda
67951517b4
don't grab the JSON filters for each entity checked
2017-01-20 13:59:48 -08:00
Clément Brisset
2571be6edb
Merge pull request #28 from birarda/entity-script-server
...
fix usesFrustum check in OctreeQueryNode
2017-01-20 13:55:50 -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 Fox
11a57efafb
Fix it!
2017-01-20 13:44:29 -08:00
Ken Cooke
176531e395
Merge pull request #9450 from zzmp/fix/audio-pool-comp
...
fix warnings for signed comp in AudioMixerSlavePool
2017-01-20 12:17:40 -08:00
Stephen Birarda
73248c3562
Merge pull request #25 from huffman/feat/entity-server-script-property
...
Fixes
2017-01-20 11:45:07 -08:00
Ryan Huffman
8a691e8340
Remove AvatarHashMap from EntityServer
2017-01-20 11:44:32 -08:00
Clément Brisset
8b311acf44
Merge pull request #27 from birarda/entity-script-server
...
update AC monitor to launch 7 ACs
2017-01-20 11:34:32 -08:00
Zach Fox
9fa80567a6
Merge pull request #9455 from zfox23/PAL_LastEditorBug
...
PAL: Fix "Last Editor" popup bug; Fix log spam
2017-01-20 11:28:41 -08:00
