Commit graph

75302 commits

Author SHA1 Message Date
NissimHadar
77f381b558 DEBUG 2019-01-17 09:29:47 -08:00
NissimHadar
88078d168f DEBUG 2019-01-17 08:26:18 -08:00
NissimHadar
9593b0e764 Removed debug code. 2019-01-17 08:23:49 -08:00
NissimHadar
20c52e4104 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-16 23:55:57 -08:00
NissimHadar
74b8937004 Copy folder only in DEV builds. 2019-01-16 18:38:03 -08:00
NissimHadar
84dd4c4e1d Fixed Linux compilation error. 2019-01-16 18:37:38 -08:00
NissimHadar
c6529ae86d Minor clean-up. 2019-01-16 17:44:48 -08:00
NissimHadar
bfe7742e97 Use the `applicationDirPath on Mac 2019-01-16 17:30:55 -08:00
NissimHadar
2307be2785 Corrections. 2019-01-16 17:30:13 -08:00
NissimHadar
7d5bb6eaf8 Added AppData folder copy. 2019-01-16 14:46:52 -08:00
SamGondelman
9727c8fd38 CR 2019-01-16 14:14:01 -08:00
Seth Alves
1104e56bc3 fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level 2019-01-16 13:23:27 -08:00
Simon Walton
024cb70fce Change member-initializer order to fix warnings 2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d Pass udt::Socket pointer in initializer-list for udt::Connection 2019-01-16 12:08:02 -08:00
Brad Davis
0bd6f9e26b Fix JNI signature 2019-01-16 12:03:56 -08:00
Stephen Birarda
0a9ac72e7b
Merge pull request #14720 from birarda/add-comments-to-atv
pepper AssociatedTraitValues with some needed comments
2019-01-16 10:59:08 -08:00
NissimHadar
b0fc794426 Trying to get Jenkins to build correctly. 2019-01-16 10:42:49 -08:00
birarda
a63c2b3e29 pepper AssociatedTraitValues with some needed comments 2019-01-16 10:15:04 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d
Make mouselook directly proportional to right-click mouse
2019-01-16 09:09:38 -08:00
John Conklin II
7c06c18fe4
Merge pull request #14699 from ingerjm0/api-directory
JSDoc > Grav directory change
2019-01-15 18:15:11 -08:00
NissimHadar
f8f8e35e6d Trying ... honestly! 2019-01-15 17:54:25 -08:00
Roxanne Skelly
6cb12daf74 CR Fixes 2019-01-15 17:49:13 -08:00
Seth Alves
c4fc884bce ignore position edits from server when grabs are in effect 2019-01-15 16:35:20 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge
log purge
2019-01-15 16:19:03 -08:00
Seth Alves
b1c34eb9ec update queryAACube during grab rather than only when grab is released 2019-01-15 16:01:44 -08:00
NissimHadar
fcd0a6f20a Funny ... this is needed on Mac... 2019-01-15 15:59:03 -08:00
NissimHadar
b2cf8c8e18 New CMake for nitpick. 2019-01-15 15:21:48 -08:00
Brad Davis
61ea0de742 Update build files based on move 2019-01-15 15:16:14 -08:00
Brad Davis
b11afa48f8 Move files to new location 2019-01-15 15:16:14 -08:00
Wayne Chen
3b913db609
fixing typo 2019-01-15 14:21:37 -08:00
Clement
8480624797 Limit upstream data to avatar mixer 2019-01-15 14:18:53 -08:00
Seth Alves
b5326936d8 grab.js will now ignore click-to-equip entities 2019-01-15 14:17:51 -08:00
Seth Alves
e8676f63c6 release grab if scripts are reloaded before grab is released 2019-01-15 13:44:03 -08:00
Seth Alves
2515c7f73e remove old-style grabbing scripts 2019-01-15 13:43:52 -08:00
Seth Alves
174c79d66d use new-style far-grabbing code for mouse grabs 2019-01-15 13:43:51 -08:00
Roxanne Skelly
6317ceb9b3 Case20277 - Ignoring user causes loading orb to appear at /0,0,0
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
2019-01-15 13:34:29 -08:00
Stephen Birarda
73a5f30350
Merge pull request #14709 from birarda/add-traits-to-dissectors
add message fragment handling to wireshark dissectors
2019-01-15 12:06:18 -08:00
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large
Log a warning if an entity's property is too large
2019-01-15 12:00:04 -08:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings
Fix Avatar apps warnings.
2019-01-15 11:03:43 -08:00
Shannon Romano
0089b91eea
Merge pull request #14609 from sethalves/fb-20280
fix a couple shutdown crashes and a class of asan warning
2019-01-15 10:59:08 -08:00
Shannon Romano
547f167539
Merge pull request #14654 from kencooke/audio-injector-stereo-distattn-bugfix
Fix the distance attenuation of stereo local injectors
2019-01-15 10:54:54 -08:00
Antonina Savinova
6499c4f0ea
Merge pull request #14700 from SimonWalton-HiFi/update-icons
New icons for interface and server-console
2019-01-14 16:04:55 -08:00
Antonina Savinova
89600f4880
Merge pull request #14701 from roxanneskelly/Case20615
Case20615 - Changing Avatars doesn't update to everyone intermittently
2019-01-14 14:44:35 -08:00
NissimHadar
b1788c7228 Corrections. 2019-01-14 14:31:50 -08:00
NissimHadar
86fb794ecf Moved setting of NITPICK_BUNDLE_NAME 2019-01-14 14:31:10 -08:00
NissimHadar
40f83b2564 Just removed blank line 2019-01-14 14:30:07 -08:00
Dante Ruiz
4ab7308669 addressing code review requests 2019-01-14 14:04:01 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
NissimHadar
f0dfa5edd2 Integrating Stephen's hints. 2019-01-14 12:30:58 -08:00