Commit graph

47197 commits

Author SHA1 Message Date
Ryan Huffman
bba5a7563f Remove extraneous logging 2016-10-05 19:25:03 -07:00
David Rowe
742e603fd6 Show cursor if user clicks in address bar 2016-10-06 15:21:08 +13:00
David Rowe
7d23cd7c7c Don't show cursor until after have started entering an address 2016-10-06 15:19:58 +13:00
David Rowe
b70eac353b Enable address entry by typing without clicking in address bar 2016-10-06 15:18:07 +13:00
Ryan Huffman
42b0d8230c Move extract/encode enitty functions in ScriptEngine 2016-10-05 19:14:42 -07:00
Brad Davis
48092978e9 Fix page size usage in gpu buffers 2016-10-05 17:05:01 -07:00
Seth Alves
f338e38bcf oops 2016-10-05 16:25:00 -07:00
Clément Brisset
808419d988 Merge pull request #8740 from AndrewMeadows/fix-physics-unit-tests
fix CMAKE warning about un-unit-testable CPP file in physics unit tests
2016-10-05 16:22:26 -07:00
Seth Alves
0510411ac1 fix timer use 2016-10-05 16:19:39 -07:00
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap
fix intermittent channel swapping
2016-10-05 15:54:25 -07:00
Ryan Huffman
0e3e2b8a9a Update date in help.html 2016-10-05 15:50:49 -07:00
Ryan Huffman
df09254437 Fix EntityItemID not being converted to string in ScriptEngine 2016-10-05 15:45:54 -07:00
Seth Alves
785d67b87a remove redundant addHelpOption 2016-10-05 15:25:45 -07:00
Andrew Meadows
e46c15401a take care for division by zero when normalizing 2016-10-05 15:00:22 -07:00
Seth Alves
86a3190385 on failure, print names of servers that didn't connect 2016-10-05 14:45:32 -07:00
Brad Davis
6afe5360fe Fixing header 2016-10-05 14:36:26 -07:00
Brad Davis
caf7d87841 Restore GL context information to the QML context 2016-10-05 14:01:20 -07:00
Seth Alves
1dc52d3bf5 cleanups, fail if packet-version mismatch 2016-10-05 13:54:09 -07:00
Seth Alves
35755ddcb1 cleanups 2016-10-05 13:48:54 -07:00
Brad Davis
afbbd398dc Remove QML threaded rendering 2016-10-05 13:48:16 -07:00
Seth Alves
e9196e8f62 testing client to check if domain-server and ACs are running 2016-10-05 13:41:15 -07:00
Clément Brisset
476ccadb38 Merge pull request #8732 from huffman/feat/category-in-logs
Add category to log lines
2016-10-05 13:29:41 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
Andrew Meadows
7642e9fd1e remove cmake warning about untestable CPP file
also: fix some broken unit tests
2016-10-05 13:06:36 -07:00
howard-stearns
dc7a9f253c kill agents in avatar mixer when they stop being avatars 2016-10-05 13:06:11 -07:00
Zach Pomerantz
afce8c4a45 STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
Zach Pomerantz
5af95c6062 store channels on audio stream 2016-10-05 12:04:24 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures
Fix model overlay visibility and texture properties
2016-10-05 11:54:11 -07:00
Ken Cooke
d6aa74c22d Fix 16khz support and hot-unplugging audio devices 2016-10-05 11:49:09 -07:00
Brad Hefta-Gaub
6f86ce8d3b Merge pull request #8683 from jherico/oglplus_b_gone2
Remove all usage of oglplus
2016-10-05 09:59:42 -07:00
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check
Domain check
2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2
Support external GL textures with proper fencing
2016-10-05 05:13:06 -07:00
Ryan Huffman
d50689b795 Remove disabling of teleport in hand grab 2016-10-04 20:25:46 -07:00
Ryan Huffman
6019581f3f Remove commented log line in OpenVrHelpers 2016-10-04 20:24:15 -07:00
Ryan Huffman
d0ba53a069 Change name of isTooCloseToTeleport to be more descriptive 2016-10-04 20:22:22 -07:00
Ryan Huffman
1e6aba1928 Fix teleport not removing overlay on teleport 2016-10-04 20:21:32 -07:00
Ryan Huffman
2ef7c9a57a Disable smooth movement in teleport.js 2016-10-04 20:21:32 -07:00
Ryan Huffman
53623f7583 Make teleport.js normal rejection more lenient 2016-10-04 20:21:30 -07:00
Ryan Huffman
16d535c495 Move EntityTree RayArgs back to header 2016-10-04 20:20:48 -07:00
Ryan Huffman
a84f774999 Remove line3doverlay local start/end changed 2016-10-04 20:20:47 -07:00
Ryan Huffman
813ed59f00 Update teleport to not collide with non collidable entities 2016-10-04 20:19:54 -07:00
Ryan Huffman
ee50469213 Add collidableOnly arg to findRayIntersection 2016-10-04 20:19:54 -07:00
Ryan Huffman
75265cff6e Update teleport to not let you teleport into walls 2016-10-04 20:19:54 -07:00
Ryan Huffman
da6afb605b Fix default findRayIntersection surfaceNormal to be in world space 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Zach Pomerantz
05aded5c9d differentiate smaples/frames from dropped audio 2016-10-04 18:45:03 -07:00
Zach Pomerantz
00fabb77b4 use proper audio frame naming 2016-10-04 18:27:56 -07:00
Zach Pomerantz
972a611d03 retain stereo on dead audio resampling 2016-10-04 17:54:20 -07:00