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

51657 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
1bba59a459 Revert "Revert "avoid unnecessary copy of priority_queue"" 
This reverts commit 97c376a09c.
 2017-03-13 14:38:02 -07:00
Clément Brisset
52fb6ed4c9 Merge pull request #9837 from Atlante45/new-stable 
Trivial PR to trigger build
 2017-03-08 14:31:15 -08:00
Atlante45
a0befa7f95 Trivial PR to trigger build 2017-03-08 14:28:44 -08:00
Atlante45
97c376a09c Revert "avoid unnecessary copy of priority_queue" 
This reverts commit e54812430e.
 2017-03-08 14:08:58 -08:00
Atlante45
50288bd4ba Revert "remove unused variable" 
This reverts commit 92a32b4651.
 2017-03-08 14:08:56 -08:00
Atlante45
a68674adcc Revert "remove unnecessary context brackets" 
This reverts commit 0657ca1e5e.
 2017-03-08 14:08:54 -08:00
Atlante45
188287e345 Revert "minor cleanup" 
This reverts commit 14e7392a89.
 2017-03-08 14:08:52 -08:00
Atlante45
9a9f07df71 Revert "expand avatar update time budget" 
This reverts commit 4bbbcb61be.
 2017-03-08 14:08:48 -08:00
Atlante45
8bf9b70915 Revert "don't blend animations for otherAvatars" 
This reverts commit faa272c67c.
 2017-03-08 14:08:33 -08:00
Chris Collins
bb03e08e16 Merge pull request #9801 from highfidelity/RC-35 
Beta Release 35 - Includes up to Developer Release 6106
 2017-03-07 11:04:21 -08:00
Atlante45
c52c43e23d Remove weighted offset, special case downward pressure 2017-03-07 06:28:25 -08:00
Seth Alves
74323cb1f0 remove debug print 2017-03-06 13:26:09 -08:00
Seth Alves
e076b32f9c don't automatically unhook overlays from hands unless they were grabbable overlays 2017-03-06 13:25:40 -08:00
Ryan Huffman
1564c76ab4 Merge pull request #9792 from huffman/feat/hand-controller-drop 
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
 2017-03-02 10:51:35 -08:00
Chris Collins
85f25fdfd1 Merge pull request #9800 from highfidelity/stable 
Sync Stable with Master
 2017-03-02 10:45:51 -08:00
Howard Stearns
50cf7b00fd Merge pull request #9797 from davidkelly/dk/3348 
fix unmute when ignoring in PAL (you can't)
 2017-03-02 09:32:38 -08:00
Andrew Meadows
6612d71f85 Merge pull request #9793 from thoys/fix_readme_links 
Prefer HTTPS links in readme/build docs
 2017-03-02 08:25:33 -08:00
David Kelly
79e440be81 fix unmute when ignoring in PAL (you can't) 2017-03-02 08:36:58 -07:00
Stephen Birarda
b586926d09 Merge pull request #9755 from birarda/master 
increase max renderable web entity FPS to 30 for Youtube.com
 2017-03-01 18:09:16 -08:00
Thijs Wenker
f42f8cf602 bullet moved 2017-03-02 02:39:34 +01:00
Andrew Meadows
96bb01e5f9 Merge pull request #9790 from AndrewMeadows/fix-avatar-transform 
fix bug drawing avatar above ground
 2017-03-01 17:20:21 -08:00
Howard Stearns
48ad7fcaae Merge pull request #9698 from davidkelly/dk/palVolumeSorting 
PAL average volume sorting
 2017-03-01 15:34:05 -08:00
howard-stearns
5be952c4e8 persist sort info for tablet re-opening, and start with column 1 2017-03-01 14:51:48 -08:00
Thijs Wenker
c8911d14e6 http->https 2017-03-01 22:04:51 +01:00
David Kelly
dc754cff5f magical new glyphs 2017-03-01 13:57:03 -07:00
Thijs Wenker
1d3be1607d removed broken Faceshift domain from Build manual 2017-03-01 21:35:35 +01:00
Thijs Wenker
64240d3394 use https in readme/build documentation rather than http 2017-03-01 21:31:43 +01:00
David Kelly
45293ab130 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-03-01 12:55:54 -07:00
David Kelly
55d049ff5c style updates 2017-03-01 12:43:45 -07:00
Ryan Huffman
1c3840dc78 Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped 2017-03-01 10:25:16 -08:00
Howard Stearns
8424f151bf Merge pull request #9789 from davidkelly/dk/3313 
Remember gain settings when pal is closed and reopened
 2017-03-01 10:21:02 -08:00
David Kelly
efe44425a6 cr feedback, plus something I missed 2017-03-01 09:26:03 -07:00
Andrew Meadows
148100b26f fix bug drawing avatar above ground 2017-02-28 15:10:20 -08:00
David Kelly
678020fed6 now use it (plus a bit of cleanup) 2017-02-28 15:03:45 -07:00
Seth Alves
0d0c26ef64 Merge pull request #9759 from sethalves/voxel-paint-opti 
no bullet shape for collisionless polyvox
 2017-02-28 13:54:44 -08:00
David Kelly
c10b0389de Add a getAvatarGain method to NodeList and UsersScriptingInterface 2017-02-28 14:45:34 -07:00
Stephen Birarda
8562a294fa cleanup some extra spacing 2017-02-28 13:24:41 -08:00
Andrew Meadows
c6730f7c58 Merge pull request #9745 from AndrewMeadows/faster-avatar-updates 
Faster avatar updates
 2017-02-28 10:55:21 -08:00
David Kelly
1fc57ce9a6 alan's feedback 2017-02-28 11:51:40 -07:00
Clément Brisset
7f9437dcc5 Merge pull request #9690 from Atlante45/feat/sit 
Add hips pinning / Sit script
 2017-02-28 10:41:22 -08:00
Chris Collins
dc61db37a1 Merge pull request #9746 from highfidelity/RC-34 
Beta Release 34 - Includes up to Developer Release 6083
 2017-02-28 09:09:38 -08:00
Seth Alves
6b230bad14 oops 2017-02-27 20:56:25 -08:00
Seth Alves
3b669089e4 Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti 2017-02-27 20:56:16 -08:00
Atlante45
e03368414e CR 2017-02-27 18:57:44 -08:00
Atlante45
38317a23c9 Keep orientation while seated 2017-02-27 17:33:26 -08:00
Seth Alves
60101ac119 Merge pull request #9743 from sethalves/tablet-ui-tablet-is-overlay 
Tablet ui tablet is overlay
 2017-02-27 17:14:29 -08:00
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -08:00
Atlante45
cd10b828dd Store whether avatar is sitting in a setting 2017-02-27 16:38:57 -08:00
Atlante45
9ce10742ec Move avatar not joint 2017-02-27 16:38:57 -08:00
Atlante45
40fdc4ea41 Remove extra script 2017-02-27 16:38:57 -08:00