Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 19:52:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75628 commits 67 branches 56 tags 1.2 GiB
Commit graph

75628 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
c199654ded Gabriel Calero's hint. 2019-01-21 10:32:33 -08:00
NissimHadar
56fa467b63 Testing. 2019-01-21 10:26:19 -08:00
NissimHadar
16ef503930 Gabriel Calero's hint. 2019-01-21 09:51:06 -08:00
Wayne Chen
4d61a65bbf
wrapping request nonce and userID with conditional 2019-01-21 09:48:12 -08:00
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
Thijs Wenker
93516423bb zone visualizer prototype 2019-01-21 17:25:06 +01:00
NissimHadar
c817c66513 Removed debug code. 2019-01-18 18:39:34 -08:00
raveenajain
379f98b26d just using change 2019-01-18 18:20:28 -08:00
sabrina-shanman
556a2ec3b6 Add material inspector to Luci.js 2019-01-18 18:15:44 -08:00
Anthony Thibault
5dbd62cc67 code review feedback 2019-01-18 17:52:53 -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
Anthony Thibault
205e375d36 Settings > Controls > User Recenter Model now saves properly 2019-01-18 16:58:26 -08:00
NissimHadar
108a308a97 Added per Austin's recommendation. 2019-01-18 16:54:58 -08:00
raveenajain
d2e37d0c90 my and other avater changes, if setting toggled can pass through other avatar 2019-01-18 16:50:44 -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
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -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
Sam Gondelman
17ac4138b6
typos 2019-01-18 13:43:56 -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
luiscuenca
43244193e8 Mesh picking against default pose with transformed ray 2019-01-18 12:46:18 -07:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Brad Davis
a3e9ad9bc2 Revert target SDK to 26 due to splash screen bug: https://tinyurl.com/yb9ll4cd 2019-01-18 10:30:02 -08:00
Anthony Thibault
e68a8794ce Remove unused variable 2019-01-17 16:18:43 -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
SamGondelman
717da1b6fa track texture loading 2019-01-17 15:59:32 -08:00
Brad Davis
f552f8d78a Working on fixing build problems 2019-01-17 15:48:30 -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
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
Wayne Chen
238f020392
remove trailing whitespace 2019-01-17 14:20:47 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
Ken Cooke
3ffaced0f3 Experimental attenuation curve: linear falloff, with prescribed propagation limit. 
A positive coefficient sets logarithmic falloff, as before.
A negative coefficient sets linear falloff, where abs(coefficient) is the distance limit in meters.
 2019-01-17 13:59:33 -08:00
Andrew Meadows
74f9a415d3 move _cauterizationNeedsUpdate back to MyAvatar 2019-01-17 13:58:34 -08:00
luiscuenca
007e3ac577 Fix warning and wrong ID 2019-01-17 14:53:06 -07:00
Andrew Meadows
e22024b0dd revert attempted fix for non-zero velocity for hats 2019-01-17 13:34:36 -08:00