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

75243 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SamGondelman
d57e3b57aa possible fix for created to/from string 2019-01-07 11:10:36 -08:00
David Back
56007c8512 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 10:50:45 -08:00
Shannon Romano
8acae02203
Merge pull request #14660 from thoys/feat/create/newFirstClassImageProperties 
MS20170: Update Image/Text Entity properties in Create with new properties
 2019-01-07 10:45:15 -08:00
David Back
d25948fbd3 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 10:36:27 -08:00
Shannon Romano
963bbbad19
Merge pull request #14661 from danteruiz/grabbing-web-entites 
allow mouse pointer to pick against collidable entities
 2019-01-07 10:24:48 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats 
Only keep aggregated thread stats for Avatar Mixer
 2019-01-07 10:17:26 -08:00
Dante Ruiz
4b99a795dd code review changes 2019-01-07 09:09:35 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
NissimHadar
e134e0dd3f
Merge pull request #14644 from NissimHadar/20339_nitpick_v1.3 
Case 20339 - nitpick v1.3.1
 2019-01-07 08:53:37 -08:00
Roxanne Skelly
0a76554d57 Remove debugging code 2019-01-05 14:04:26 -08:00
Roxanne Skelly
9e887585fa Bad write length calculation was causing faults. 2019-01-05 13:49:33 -08:00
Andrew Meadows
5c750b40c9 fix copy-n-paste errors in EntityItem::contains() for cylinders 2019-01-05 08:03:29 -08:00
Roxanne Skelly
6d791a80c2 Bump protocol version for BulkAvatarTraits and add some guard code 
around packet parsing.
 2019-01-04 19:04:01 -08:00
Dante Ruiz
0dc5e7743f allow mouse pointer to pick against collidable entities 2019-01-04 17:49:38 -08:00
Thijs Wenker
26f46e87a3 new property tooltips 2019-01-05 02:16:12 +01:00
luiscuenca
2a367509cd Fix warnings 2019-01-04 18:02:18 -07:00