Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75283 commits 71 branches 56 tags 1.2 GiB
Commit graph

75283 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
c035de63e8 Updated. 2019-01-21 09:29:04 -08:00
NissimHadar
6777748230 Updated. 2019-01-21 09:15:09 -08:00
NissimHadar
c891226161 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-21 08:41:45 -08:00
NissimHadar
c817c66513 Removed debug code. 2019-01-18 18:39:34 -08:00
NissimHadar
b62b781fb0 Added per Austin's recommendation. 2019-01-18 17:37:36 -08:00
NissimHadar
628a420f91 DEBUG. 2019-01-18 17:14:39 -08:00
NissimHadar
108a308a97 Added per Austin's recommendation. 2019-01-18 16:54:58 -08:00
NissimHadar
9047a8f707 Cleanup in progress. 2019-01-18 16:10:24 -08:00
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
Adam Smith
da7cd6b2f7
Merge pull request #14691 from SamGondelman/multifrustum 
Case 20394: Fix multi-frustum view updating
 2019-01-18 15:23:58 -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
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter 
Limit upstream bandwidth to the Avatar Mixer
 2019-01-18 13:32:03 -08:00
Antonina Savinova
a3e82c1869
Merge pull request #14734 from Atlante45/fix/ess-log-spam 
Add ESS to the Agent's node interest set
 2019-01-18 13:29:23 -08:00
Jeff Clinton
09b16d2d7a
Merge pull request #14735 from SamGondelman/snap 
Case 20724: Fix Snap app settings issue
 2019-01-18 13:00:18 -08:00
NissimHadar
74d5e4891c Cleanup in progress. 2019-01-18 12:20:05 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits 
case 15962: case 20481: Mouse grab with traits
 2019-01-18 11:56:41 -08:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp 
Change Avatar App design for avatar collisions
 2019-01-17 16:06:17 -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
Clement
74b83d9961 Add ESS to the Agent's node interest set 2019-01-17 15:23:40 -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