Commit graph

50738 commits

Author SHA1 Message Date
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
Zach Pomerantz
061668cba4 use lock-free pipe for local audio in device callback 2017-01-22 00:25:08 -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
Dante Ruiz
5c55b86be6 fix bug 2017-01-21 01:56:06 +00: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
Seth Alves
d71b79ebed Merge pull request #9465 from druiz17/textureSwap
home button flushed && texture swapping && close tablet when at home screen
2017-01-20 16:40:00 -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
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
Zach Pomerantz
685483b924 do not omit local audio when echoing server audio 2017-01-20 17:52:03 -05:00
Seth Alves
ff17aa7745 Merge pull request #9464 from sethalves/tablet-ui
Tablet ui
2017-01-20 14:51:16 -08:00
Seth Alves
e96a3d4bcb try another click sound 2017-01-20 14:50:24 -08:00
Seth Alves
87ea9161e4 avoid bad interaction between far-grab and equip 2017-01-20 14:49:49 -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
Seth Alves
dfa949f2d8 switch to new click sound 2017-01-20 13:35:41 -08:00
Seth Alves
2f08972578 Merge pull request #9460 from druiz17/touchUp
Tablet button clickable in desktop mode && correct icons for switch
2017-01-20 12:58:41 -08:00
Seth Alves
503723a269 Merge pull request #9459 from hyperlogic/tablet-ui
Updated tablet dimensions to better reflect mockup and 3d model
2017-01-20 12:40:47 -08:00
Anthony J. Thibault
3ebf2ebc9b Updated tablet dimensions to better reflect mockup and 3d model 2017-01-20 12:27:44 -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
Zach Pomerantz
bb247fe8a3 rename AudioMixRingBuffer 2017-01-20 14:48:54 -05: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
Zach Pomerantz
280ed04f74 fix unused warning for channel up/downmix 2017-01-20 14:43:41 -05:00
Dante Ruiz
58e04f8e35 home button works in desktop mode 2017-01-20 19:43:13 +00: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 Pomerantz
75281099bd add conformant explicit instantiation for AudioRingBuffers 2017-01-20 14:33:54 -05:00