Commit graph

67161 commits

Author SHA1 Message Date
David Rowe
8e22941ad7 Interim JSDoc for Reticle 2018-04-23 09:22:45 +12:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
milad nazeri
dc3d162c5b working through the list 2018-04-22 08:19:22 -07:00
David Rowe
2c39f2dbad Interim JSDoc for Scene 2018-04-22 17:37:06 +12:00
David Rowe
62930eb576 Interim JSDoc for Script 2018-04-22 15:26:39 +12:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure
Fixed null pointer exception if importing an entity from JSON fails
2018-04-21 18:12:48 -07:00
David Rowe
01870af624 Interim JSDoc for ScriptDiscoveryService 2018-04-22 11:32:46 +12:00
vladest
60115752ad Fixed saving after editing 2018-04-21 20:18:24 +02:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815
Controller API JSDoc
2018-04-21 10:44:05 -07:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
Olivier Prat
fbd06f7d5e Fixed compilation error on Android 2018-04-21 11:07:26 +02:00
David Rowe
34d0a892a0 Point to example using Hardware.Application item 2018-04-21 15:01:46 +12:00
David Rowe
3792b28a3e Add input recorder examples 2018-04-21 14:53:40 +12:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
SamGondelman
ac7e8623bf quiet shader warnings 2018-04-20 18:25:30 -07:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851
Vec3 API JSDoc
2018-04-20 18:10:18 -07:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
David Kelly
d84ea6bf0f Don't populate user list in pal until you connect the events up 2018-04-20 16:09:20 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id
Use 16-bit local IDs for Nodes in NL packets
2018-04-20 15:28:18 -07:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes
Fix threaded force crashes
2018-04-20 13:20:40 -07:00
humbletim
b86f553550 poke per-avatar gain into per-stream HRTF 2018-04-20 15:36:31 -04:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
Simon Walton
3f894fe5fa Merge fix 2018-04-20 11:15:59 -07:00
Simon Walton
ed0fd8c4d2 Merge fix 2018-04-20 11:13:15 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Stephen Birarda
7d68d5fd17
Merge pull request #12779 from birarda/cve/brace-expansion
update to latest electron version for server console
2018-04-20 10:53:07 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66 try to fix audio crash on startup 2018-04-20 10:23:47 -07:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
John Conklin II
a529c7cfc5
Merge pull request #12948 from samcake/rc66.1-metaSubItems
RC66.1: Re apply extra sanity check that hasn't been applied correctly in rc66
2018-04-20 09:55:09 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth
Change packet authentication to use HMAC
2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -07:00
vladest
b8577bd791 Merge branch 'master' into fix_spinbox 2018-04-20 18:09:16 +02:00
Ryan Huffman
9cf133cff2 Increase packet version for Ping 2018-04-20 08:25:57 -07:00
Ryan Huffman
5bd89159dd Update variable naming in NodeList from Id to ID 2018-04-20 08:25:52 -07:00
Ryan Huffman
a930e39bd4 Fix nodelist connections not resetting on both ends
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
2018-04-20 08:25:45 -07:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix
Minor changes to meet coding standard
2018-04-20 08:20:32 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
Olivier Prat
c6d598cc88 Jitter is now set through a batch command 2018-04-20 10:52:50 +02:00
Olivier Prat
57ff1c54e1 Created shared c++/glsl header for transformcamera 2018-04-20 09:01:19 +02:00
Olivier Prat
440e2b8452 Merged with master 2018-04-20 08:13:25 +02:00
David Rowe
8173ac87a8 Minor improvement to Quat.IDENTITY JSDoc 2018-04-20 16:41:10 +12:00
David Rowe
b1e214de5a Vec3 API JSDoc 2018-04-20 16:40:15 +12:00
humbletim
238f59f229 make positional streams honor user-specified gain overrides 2018-04-20 00:08:25 -04:00
Stephen Birarda
0da51672bb don't stop image slideshow when install concludes 2018-04-19 18:52:45 -07:00
Stephen Birarda
752d8368cc add slideshow plugin to list of requirements in install doc 2018-04-19 18:16:44 -07:00
Stephen Birarda
7ecc279e00 show default or campaigned slideshow during install 2018-04-19 17:58:21 -07:00