Seth Alves
|
5af07dfb62
|
more memory-debugger
|
2017-06-23 08:16:48 -07:00 |
|
Seth Alves
|
d290f03edb
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
|
2017-06-22 13:53:23 -07:00 |
|
Seth Alves
|
a053a1da4b
|
more HIFI_MEMORY_DEBUGGING fixes
|
2017-06-22 13:50:46 -07:00 |
|
Brad Hefta-Gaub
|
a2fa1cd532
|
Merge pull request #10757 from CainFoool/master
WL 21386: ShortBow Improvements
|
2017-06-22 13:38:41 -07:00 |
|
Andrew Meadows
|
62e862fef0
|
Merge pull request #10733 from Menithal/21384
21384: Added Support to Disabling flight from client side
|
2017-06-22 13:38:01 -07:00 |
|
Howard Stearns
|
922b66d447
|
Merge pull request #10779 from howard-stearns/no-sand-box-if-new-install-option
installer allows /nSandboxIfNew command line switch
|
2017-06-22 13:37:28 -07:00 |
|
Brad Hefta-Gaub
|
7668fbb7a0
|
Merge pull request #10755 from seefo/fb5278
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
|
2017-06-22 13:35:05 -07:00 |
|
Brad Hefta-Gaub
|
197006e3d3
|
Merge pull request #10780 from kencooke/audio-hrtf-avx512
HRTF optimizations
|
2017-06-22 13:34:05 -07:00 |
|
Stephen Birarda
|
01d9812247
|
Merge pull request #10772 from birarda/bug/domain-double-connect
use existing node ID during repeated connect requests
|
2017-06-22 13:16:33 -07:00 |
|
Seth Alves
|
4c5090e8ac
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
|
2017-06-22 13:11:17 -07:00 |
|
howard-stearns
|
cec4b4e86b
|
change var to a global per CR
|
2017-06-22 12:54:30 -07:00 |
|
howard-stearns
|
6a5dfd6fc5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into no-sand-box-if-new-install-option
|
2017-06-22 12:13:59 -07:00 |
|
Stephen Birarda
|
86b2382f7c
|
Merge pull request #10785 from birarda/bug/manage-avatar-identity
push AvatarData sequence number when managing identity data for agent
|
2017-06-22 12:02:42 -07:00 |
|
Stephen Birarda
|
ccbae07170
|
rename _sequenceNumber to _lastSequenceNumber
|
2017-06-22 11:23:58 -07:00 |
|
Stephen Birarda
|
42cceb02a4
|
push sequence number when managing identity data for agent
|
2017-06-22 11:10:43 -07:00 |
|
Clément Brisset
|
48aadb2899
|
Merge pull request #10775 from 1P-Cusack/21401
Adding support for loading obj.gz files in ModelCache.
|
2017-06-22 11:03:23 -07:00 |
|
Seth Alves
|
9ce173f682
|
missed a few
|
2017-06-22 10:56:08 -07:00 |
|
Seth Alves
|
517bf0af0f
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
|
2017-06-22 10:07:44 -07:00 |
|
Seth Alves
|
7ff576ef18
|
add memory-debugging macro to some cmake files
|
2017-06-22 10:07:39 -07:00 |
|
Andrew Meadows
|
e5602aa7d3
|
Merge pull request #10773 from Atlante45/fix/refresh-content
Fix reload content for baked skyboxes
|
2017-06-22 08:40:42 -07:00 |
|
Andrew Meadows
|
424848f8e3
|
Merge pull request #10769 from sethalves/fix-linux-fbx-lib
have cmake find fbx library on Linux
|
2017-06-22 08:37:57 -07:00 |
|
1P-Cusack
|
f8c30c70e8
|
Addressing some feedback. Making the .obj.gz checks more specific and adding an exception if gunzip fails.
|
2017-06-22 11:21:19 -04:00 |
|
David Kelly
|
34edd95926
|
Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch
new switches to override avatarURL
|
2017-06-22 07:11:29 -07:00 |
|
David Kelly
|
5da01f0074
|
updated comments
|
2017-06-22 07:09:24 -07:00 |
|
Ken Cooke
|
af0f460659
|
Fix extra whitespace
|
2017-06-22 06:38:13 -07:00 |
|
Ken Cooke
|
5d235f8c52
|
Fix typo
|
2017-06-22 06:32:32 -07:00 |
|
Seth Alves
|
d2a8300a3f
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-fbx-lib
|
2017-06-21 20:31:16 -07:00 |
|
Seth Alves
|
b1119ff465
|
more changes to get oven building on Linux
|
2017-06-21 20:10:54 -07:00 |
|
Stephen Birarda
|
e2f6ad8306
|
Merge pull request #10781 from birarda/feat/replicants-advanced
make broadcasting settings advanced in DS settings
|
2017-06-21 19:28:19 -07:00 |
|
Seth Alves
|
5277a0803c
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-fbx-lib
|
2017-06-21 18:59:58 -07:00 |
|
Seth Alves
|
c70365d04a
|
Merge pull request #10729 from druiz17/hand-pucks
Hand pucks and Calibration UI
|
2017-06-21 18:10:15 -07:00 |
|
Stephen Birarda
|
95704c1ba5
|
make broadcasting settings advanced
|
2017-06-21 17:58:19 -07:00 |
|
Stephen Birarda
|
c516dd06e4
|
Merge pull request #10714 from highfidelity/replicants
add broadcasting/replication to downstream avatar mixers and audio mixers
|
2017-06-21 17:55:07 -07:00 |
|
howard-stearns
|
8f51beda17
|
installer allows /nSandboxIfNew command line switch, which defaults
sandbox to off if this is a new install
|
2017-06-21 16:54:47 -07:00 |
|
Howard Stearns
|
ea5b074f6e
|
Merge pull request #10758 from howard-stearns/event-installer-interface-options
Event installer interface options
|
2017-06-21 16:46:06 -07:00 |
|
Ryan Huffman
|
06a305d04b
|
Merge pull request #10777 from birarda/feat/replicants
address code review comments
|
2017-06-21 16:24:02 -07:00 |
|
Stephen Birarda
|
e39e5c8c3b
|
simplify lambda capture in gate keeper
|
2017-06-21 16:21:40 -07:00 |
|
Stephen Birarda
|
aeb3f443f8
|
address code review comments
|
2017-06-21 16:14:14 -07:00 |
|
David Kelly
|
92cbb86e8b
|
remove debugging
|
2017-06-21 16:09:08 -07:00 |
|
David Kelly
|
94a33fea94
|
new switches to override avatarURL
|
2017-06-21 16:03:05 -07:00 |
|
1P-Cusack
|
781e2f409f
|
Adding support for loading obj.gz files in ModelCache.
|
2017-06-21 18:50:39 -04:00 |
|
Stephen Birarda
|
9285c88e46
|
check if usernames do not match before using hint ID
|
2017-06-21 15:34:43 -07:00 |
|
Atlante45
|
4a552affe6
|
Fix reload content for baked skyboxes
|
2017-06-21 15:19:03 -07:00 |
|
Stephen Birarda
|
3e97b07fc2
|
Revert "force domain-server to use new ID if node requests connect"
This reverts commit cd023e0384.
|
2017-06-21 15:14:16 -07:00 |
|
Dante Ruiz
|
c4699e00ca
|
added hand offsets
|
2017-06-21 23:10:08 +01:00 |
|
Seth Alves
|
0d9aa8182e
|
have cmake find fbx library on Linux
|
2017-06-21 17:10:19 -04:00 |
|
Clément Brisset
|
4929939501
|
Merge pull request #10768 from Atlante45/fix/skyboxes
Fix skyboxes sometimes not showing
|
2017-06-21 13:56:42 -07:00 |
|
Chris Collins
|
f3ae1d8078
|
Merge pull request #10750 from Atlante45/master
Stable -> Master
|
2017-06-21 13:34:28 -07:00 |
|
Ken Cooke
|
38c87b0f08
|
Fallback code to allow compiling with VS2013
|
2017-06-21 13:19:46 -07:00 |
|
Brad Hefta-Gaub
|
88a4f5c576
|
Merge pull request #10766 from humbletim/sort-running-scripts
Sort Running Scripts... list alphabetically
|
2017-06-21 13:08:47 -07:00 |
|