Anthony J. Thibault
|
ec801cb9d8
|
Addressed feedback from code review.
|
2016-10-07 17:46:46 -07:00 |
|
Anthony J. Thibault
|
a4c7e832b5
|
Reset threadID logging to false
|
2016-10-07 11:42:34 -07:00 |
|
Anthony J. Thibault
|
17d00ee3f9
|
Workaround openvr crash by calling Submit before VR_Shutdown
|
2016-10-07 11:41:58 -07:00 |
|
Anthony J. Thibault
|
3158439cba
|
Prevent deadlock when rapidly switching between openvr and desktop mode
|
2016-10-06 15:44:24 -07:00 |
|
Chris Collins
|
aecf71a0d0
|
Merge pull request #8729 from huffman/feat/atp-set-mapping
Add setMapping to ATP scripting interface and fix threading bug
|
2016-10-06 11:46:19 -07:00 |
|
Chris Collins
|
73e29c03ab
|
Merge pull request #8728 from huffman/feat/unequip-using-grab
Trigger unequip at a more lenient angle and with the secondary trigger
|
2016-10-06 10:30:54 -07:00 |
|
Chris Collins
|
14f8fb7c90
|
Merge pull request #8664 from huffman/fix/script-resolve-path
Fix ScriptEngine not properly resolving paths
|
2016-10-06 10:13:44 -07:00 |
|
Chris Collins
|
583332d502
|
Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities
Update entity scripting interface to allow modifications to unknown e…
|
2016-10-06 09:51:35 -07:00 |
|
Chris Collins
|
328ac71f8b
|
Merge pull request #8739 from kencooke/audio-fixes3
Fix 16khz support and hot-unplugging audio devices
|
2016-10-06 09:46:51 -07:00 |
|
Chris Collins
|
80ecf88935
|
Merge pull request #8731 from huffman/feat/interface-run-server
Add flag to interface to have it start the sandbox server
|
2016-10-06 09:18:41 -07:00 |
|
Ryan Huffman
|
42b0d8230c
|
Move extract/encode enitty functions in ScriptEngine
|
2016-10-05 19:14:42 -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 |
|
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
|
df09254437
|
Fix EntityItemID not being converted to string in ScriptEngine
|
2016-10-05 15:45:54 -07:00 |
|
Andrew Meadows
|
e46c15401a
|
take care for division by zero when normalizing
|
2016-10-05 15:00:22 -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 |
|
Andrew Meadows
|
7642e9fd1e
|
remove cmake warning about untestable CPP file
also: fix some broken unit tests
|
2016-10-05 13:06:36 -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 |
|
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 |
|
Ryan Huffman
|
2bb2aca2be
|
Remove commented line in LogHandler
|
2016-10-04 16:54:37 -07:00 |
|
Ryan Huffman
|
a52e2d8bc5
|
Add category to log lines
|
2016-10-04 16:49:24 -07:00 |
|
Ryan Huffman
|
ff8f45d36c
|
Fix application directory path
|
2016-10-04 16:47:59 -07:00 |
|
Ryan Huffman
|
224c35d568
|
Clean up launch server in main.cpp
|
2016-10-04 16:47:59 -07:00 |
|
Ryan Huffman
|
0aba1d3e54
|
Fix server arguments causing crash on startup
|
2016-10-04 16:47:58 -07:00 |
|
Ryan Huffman
|
fe6382d1b6
|
Update server content path to be relative
|
2016-10-04 16:47:58 -07:00 |
|
Ryan Huffman
|
392ecb0dae
|
Update interface to launch server
|
2016-10-04 16:47:58 -07:00 |
|
Ryan Huffman
|
8343cfd687
|
Add grip to unequip
|
2016-10-04 16:34:18 -07:00 |
|
Ryan Huffman
|
289cd6ba2b
|
Adjust hand controller unequip rotation threshold
|
2016-10-04 16:34:18 -07:00 |
|
Ryan Huffman
|
847a5cc7a1
|
Remove old texture setting code in ModelOverlay
|
2016-10-04 16:25:48 -07:00 |
|
Ryan Huffman
|
93d995a5ae
|
Fix model overlay visible not working
|
2016-10-04 16:25:40 -07:00 |
|
Ryan Huffman
|
c683c82817
|
Fix setting textures in model overlays
|
2016-10-04 16:24:43 -07:00 |
|
Howard Stearns
|
4974c88880
|
Merge pull request #8663 from howard-stearns/address-bar-text-area-changes
Address bar text area changes
|
2016-10-04 13:50:40 -07:00 |
|
howard-stearns
|
fd8287dae3
|
Merge branch 'summon-crowd' into domain-check
|
2016-10-04 11:38:25 -07:00 |
|
howard-stearns
|
cdd658d4dd
|
report results
|
2016-10-04 11:31:49 -07:00 |
|
Anthony Thibault
|
60aff44f33
|
Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix
Remove frame lag and jitter from near grabbed physical objects.
|
2016-10-04 11:14:22 -07:00 |
|
Anthony J. Thibault
|
dcd425a165
|
Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls
|
2016-10-04 10:56:44 -07:00 |
|
howard-stearns
|
1c73b3c043
|
Merge branch 'domain-check' of https://github.com/highfidelity/hifi into summon-crowd
|
2016-10-04 10:40:48 -07:00 |
|
howard-stearns
|
5ea4d48e36
|
poll for ready, and include physics in definition of ready, based on #8723
|
2016-10-04 10:23:10 -07:00 |
|
Chris Collins
|
1087885380
|
Merge pull request #8721 from kencooke/audio-fixes2
Fix audio support on Windows7
|
2016-10-04 10:14:37 -07:00 |
|
Brad Hefta-Gaub
|
9554befb68
|
Merge pull request #8714 from Atlante45/ack2
Fix potential race condition on static memory
|
2016-10-04 10:05:53 -07:00 |
|
Ken Cooke
|
6838dc0247
|
Inverted the CMAKE logic, to make the version comparison more clear
|
2016-10-04 09:01:43 -07:00 |
|