NissimHadar
|
1fa516dd56
|
No need to build on Android or in a Production build
|
2019-01-18 16:03:02 -08:00 |
|
NissimHadar
|
acbbe2658d
|
Do not build nitpick in PRODUCTION build.
|
2019-01-18 15:41:06 -08:00 |
|
NissimHadar
|
ecef7834f2
|
Cleanup in progress.
|
2019-01-18 15:40:25 -08:00 |
|
NissimHadar
|
e0bb8c64ca
|
Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac
|
2019-01-18 14:25:22 -08:00 |
|
NissimHadar
|
34c58d4de5
|
Cleanup in progress.
|
2019-01-18 14:24:14 -08:00 |
|
NissimHadar
|
5b81931b83
|
Removed unneeded stuff.
|
2019-01-18 13:47:51 -08:00 |
|
NissimHadar
|
74d5e4891c
|
Cleanup in progress.
|
2019-01-18 12:20:05 -08:00 |
|
NissimHadar
|
6293c84f17
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac
|
2019-01-17 15:38:04 -08:00 |
|
Shannon Romano
|
c764f5182f
|
Merge pull request #14717 from roxanneskelly/Case20277
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
|
2019-01-17 15:36:31 -08:00 |
|
Shannon Romano
|
0370268f56
|
Merge pull request #14723 from SimonWalton-HiFi/connection-parented-to-socket
Make Connection class a Qt-child of Socket class
|
2019-01-17 15:35:29 -08:00 |
|
John Conklin II
|
d64858b1c7
|
Merge pull request #14724 from sethalves/fix-excessive-cauterization-update
case 15942: fix bug that caused avatar cauterization code to run constantly
|
2019-01-17 12:59:57 -08:00 |
|
John Conklin II
|
19e4a7389b
|
Merge pull request #14676 from wayne-chen/updateLoginUserLogging
case 20654: Updating user activity logging for login experience
|
2019-01-17 12:59:12 -08:00 |
|
NissimHadar
|
d6f2a0ebe3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac
|
2019-01-17 12:19:04 -08:00 |
|
John Conklin II
|
45ec44423b
|
Merge pull request #14694 from danteruiz/delete-only-domain-entities
case 20595: case 20563: Do not delete local entities when switching domains.
|
2019-01-17 11:25:58 -08:00 |
|
Adam Smith
|
f955313afc
|
Merge pull request #14687 from SamGondelman/cancel
Case 20580: Trying to fix wearables and avatar app
|
2019-01-17 11:25:30 -08:00 |
|
NissimHadar
|
21bad12b4c
|
Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac
|
2019-01-17 11:17:46 -08:00 |
|
NissimHadar
|
c0519c5a64
|
Corrected back to interface
|
2019-01-17 11:15:45 -08:00 |
|
NissimHadar
|
5e5374ebdd
|
DEBUG
|
2019-01-17 09:47:53 -08:00 |
|
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 |
|
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 |
|
Antonina Savinova
|
560c44a74a
|
Merge pull request #14697 from howard-stearns/more-log-purge
log purge
|
2019-01-15 16:19:03 -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 |
|
Wayne Chen
|
3b913db609
|
fixing typo
|
2019-01-15 14:21:37 -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 |
|
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 |
|