Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75654 commits 71 branches 56 tags 1.2 GiB
Commit graph

75654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gabriel Calero
fd185f2fb7 Merge branch 'display_name_and_avatar' of https://github.com/gcalero/hifi into display_name_and_avatar 2019-01-22 16:19:19 -03:00
Gabriel Calero
455d27aeb3 Fix merge 2019-01-22 16:18:00 -03:00
Wayne Chen
1ae2ddd926 dont setup another oculus session 2019-01-22 11:08:15 -08:00
raveenajain
d3e0998a7f update with master 
Merge branch 'master' of https://github.com/highfidelity/hifi into collideWithOtherAvatars_scale
 2019-01-22 10:55:26 -08:00
Anthony Thibault
5146f3dfae Bug fix for avatars that have mesh/joint name duplicates 
This change has two parts.  First we do a better job of identifying joints vs meshes in the FBXSerializer.
Second we use this information to better handle duplicate names in AnimSkeleton.
When a duplicate is detected, allow joints to override meshes.
This will ensure that when joints are looked up by name we will not return a mesh object with the same name by mistake.
 2019-01-22 10:47:01 -08:00
Brad Davis
6fb869126e GPU state cleanup 2019-01-22 10:37:08 -08:00
Gabriel Calero
f67d98f296 Merge remote-tracking branch 'upstream/master' into display_name_and_avatar 2019-01-22 14:17:52 -03:00
Gabriel Calero
7c067ba0cf Merge remote-tracking branch 'upstream/master' into display_name_and_avatar 2019-01-22 12:23:42 -03:00
Gabriel Calero
6c431996c7 Allow to set a display name and choose an avatar 2019-01-22 12:21:06 -03:00
Shannon Romano
6cb8cf0202
Merge pull request #14750 from NissimHadar/fixAndroidBuild 
Gabriel Calero's fix (79.0/master)
 2019-01-21 17:40:58 -08:00
SamGondelman
49947d9f6d better default values 2019-01-21 16:51:08 -08:00
NissimHadar
4edd072b3b Removed whitespace 2019-01-21 16:49:54 -08:00
raveenajain
2393db5e12 collision logic 2019-01-21 16:24:32 -08:00
NissimHadar
084d55a414 Gabriel Calero's fix. 2019-01-21 13:26:44 -08:00
raveenajain
3f2aa56187 feedback changes 2019-01-21 13:24:07 -08:00
NissimHadar
a693e0b6f9 Gabriel Calero's fix. 2019-01-21 13:08:37 -08:00
NissimHadar
fb09856c11 Gabriel Calero's fix. 2019-01-21 12:56:13 -08:00
SamGondelman
5b1ea24d20 glsl initializer lists are 4.2 2019-01-21 12:35:48 -08:00
Simon Walton
c3a8c71f60 Add TabletMenu to list of pages that trigger the QmlCommerce bridge 2019-01-21 12:27:14 -08:00
Shannon Romano
c9e53e067d
Merge pull request #14652 from jherico/feature/quest_move_interface 
Migrate android build location to accommodate Quest builds
 2019-01-21 11:09:51 -08:00
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