Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 15:32:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75259 commits 75 branches 59 tags 1.2 GiB
Commit graph

75259 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377 
Trait-level flow control
 2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout 
Set minimum timeout for retransmits within reliable network service
 2019-01-09 15:35:40 -08:00
John Conklin II
e4abb66199
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates 
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
 2019-01-09 14:55:23 -08:00
Wayne Chen
ba8620b644 updating user activity logging 2019-01-09 13:51:40 -08:00
Simon Walton
5bcdf143b9 Add per-destination-avatar traits-rate stats 2019-01-09 13:45:07 -08:00
birarda
3c6b7e3bd0 add a cap to cycled message channels in SendQueue 2019-01-09 13:06:30 -08:00
John Conklin II
100c88e800
Merge pull request #14669 from kencooke/audio-mixer-mastergain-solo-fix 
Apply master volume to audio streams when solo is active
 2019-01-09 12:03:02 -08:00
Ken Cooke
b854840f43 Fix ASAN warnings due to mixed signed/unsigned arithmetic 2019-01-09 10:03:35 -08:00
Simon Walton
cb6b86a236 Tweak web display 2019-01-09 09:36:17 -08:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
Simon Walton
73d688610f Track stats for total AvatarData bytes, traits bytes and identity bytes 2019-01-08 18:33:00 -08:00
Jamil Akram
39f4af505c
Merge pull request #14671 from SamGondelman/lightFix 
Case 20534: Fix light crash
 2019-01-08 14:43:11 -08:00
Jamil Akram
ce05dcd59e
Merge pull request #14670 from thoys/feat/create/textEntityAddMissingProperties 
MS20150: add missing Text properties to Create App
 2019-01-08 13:02:38 -08:00
SamGondelman
928ea55d95 fix light crash? 2019-01-08 11:47:28 -08:00
Thijs Wenker
24022f0ccc add missing Text properties to Create App 2019-01-08 20:38:31 +01:00
Roxanne Skelly
910c359443 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-08 10:50:45 -08:00
Roxanne Skelly
0297d337d5 Add some comments as per CR request 2019-01-08 10:50:16 -08:00
Ken Cooke
963269f3f6 Apply master volume to audio streams when solo is active 2019-01-08 10:50:11 -08:00
John Conklin II
00a9367f14
Merge pull request #14662 from dback2/addGridEntitiesToCreate 
Add grid entities to create
 2019-01-08 10:12:34 -08:00
Jamil Akram
4c6b14bf72
Merge pull request #14642 from dback2/propertyRangeAudit 
Entity property range/step audit
 2019-01-08 09:42:59 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones 
Case 15518: shaped zones
 2019-01-08 09:06:45 -08:00
David Back
0791443c5c Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 18:29:36 -08:00
David Back
d9e229d38e remove add Grid entity button, fix color 2019-01-07 18:20:20 -08:00
David Back
90e2feb977 replace placeholder icon with real icon from Alan 2019-01-07 18:20:20 -08:00
David Back
7581c77be8 update tooltips, use Cube icon for now 2019-01-07 18:20:20 -08:00
David Back
e0e9a7de15 tabs 2019-01-07 18:20:20 -08:00
David Back
9013eee352 add grid entities to create - icons pending 2019-01-07 18:20:19 -08:00
Roxanne Skelly
d54fec4476 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 18:17:40 -08:00
Antonina Savinova
a9bec719d6
Merge pull request #14668 from SamGondelman/crashFix 
Fix crash
 2019-01-07 18:16:33 -08:00
SamGondelman
f60b272f11 fix crash 2019-01-07 17:24:07 -08:00
Sam Gondelman
2c0b2e13ab
Merge pull request #14665 from SamGondelman/exportFix 
Case 20533: Fix export entities
 2019-01-07 15:47:01 -08:00
David Back
84b2a7d474 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 15:42:02 -08:00
Sam Gondelman
1fe62ecb10
Merge pull request #14657 from SamGondelman/propFix 
Case 20504: Trying to fix avatar entity issue
 2019-01-07 15:37:52 -08:00
David Back
3aa245036b
Merge branch 'master' into propertyRangeAudit 2019-01-07 15:36:18 -08:00
John Conklin II
edd329c601
Merge pull request #14663 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch 
MS20142 - CreateApp - Fix active colorPicker to update on selection update
 2019-01-07 15:00:36 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8 
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
 2019-01-07 14:53:27 -08:00
SamGondelman
791257bd0a convert old created to quint 2019-01-07 14:17:01 -08:00
SamGondelman
62dbca6ce7 fix export entities 2019-01-07 14:08:52 -08:00
Simon Walton
c88af5c4be Merge branch 'master' into reliable-service-min-timeout 2019-01-07 13:28:13 -08:00
SamGondelman
4210d4a7cd write created as quint64 2019-01-07 13:24:38 -08:00
SamGondelman
fa66ed766d one more try 2019-01-07 12:31:52 -08:00
David Rowe
683e633469 Fix play back of input recording's numeric values 2019-01-08 09:18:53 +13:00
Thijs Wenker
7823b3d4a3 clarifying comments 2019-01-07 21:08:41 +01:00
Roxanne Skelly
c340d478a5 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:57:30 -08:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
SamGondelman
5cded6938b possible fix for texture path 2019-01-07 11:55:34 -08:00
Thijs Wenker
7d9cad3e8e CreateApp - Fix active colorPicker to update on selection update 2019-01-07 20:35:09 +01:00
David Back
5aa5b997fe remove logs 2019-01-07 11:33:08 -08:00
David Back
2f99729905 add rect case, fix step rounding 2019-01-07 11:31:04 -08:00