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

51884 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
48ad7fcaae Merge pull request #9698 from davidkelly/dk/palVolumeSorting 
PAL average volume sorting
 2017-03-01 15:34:05 -08:00
Menithal
231ebef117 Removed stray debugPrint 2017-03-02 01:01:57 +02:00
Menithal
fd1fded276 Fixed Clone instancing issues 2017-03-02 00:59:45 +02:00
howard-stearns
5be952c4e8 persist sort info for tablet re-opening, and start with column 1 2017-03-01 14:51:48 -08:00
Anthony J. Thibault
465a9e2008 Responsiveness improvement to tablet 
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
 2017-03-01 14:31:04 -08:00
Anthony J. Thibault
d142c3d69b eslint fix 2017-03-01 13:29:24 -08:00
Anthony J. Thibault
f418457100 Index finger touch support for the tablet-ui. 2017-03-01 13:28:17 -08:00
Anthony J. Thibault
01abb4bdb6 Exposed DebugDraw interface to Java Script 2017-03-01 13:14:29 -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
David Kelly
e8b48eb3aa Merge branch 'master' of https://github.com/highfidelity/hifi into dk/agentAvatarDataUpdates 2017-03-01 13:51:28 -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
Menithal
82236bdcb9 Merge remote-tracking branch 'upstream/master' into 21166 2017-03-01 22:09:29 +02:00
Menithal
f538ac24f3 Various Properties 2017-03-01 22:07:02 +02: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
samcake
664163eb17 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-28 18:13:01 -08:00
samcake
6ac85aee7e Adding support for the unliti materials too for overlay's 2017-02-28 18:12:35 -08: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
David Kelly
2635657456 zappoman's feedback, plus added const corrrectness to computeLoudness 2017-02-28 13:24:25 -07: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
David Kelly
0b8624aa6f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/agentAvatarDataUpdates 2017-02-28 09:46:01 -07:00
Matti Lahtinen
d0c2c26a8e One last gotcha from the conflict resolution. 2017-02-28 16:37:08 +02:00
Matti Lahtinen
e21785d5ec Merge branch 'master' into 21166 2017-02-28 16:34:28 +02:00
David Rowe
d8d17be0e0 Rotate about translation grab position 2017-02-28 23:22:07 +13:00
David Rowe
e3f2f3c5bc Tidying 2017-02-28 23:04:23 +13:00
David Rowe
28768d4a78 Rotate the entity by twice the rotating controller's rotation 2017-02-28 22:22:34 +13:00
humbletim
2505a89b5e Per CR feedback bump to strong ref 2017-02-28 00:41:35 -05: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
David Rowe
5b6f953ac2 Add hand controller state of distance-rotating for second grab hand 2017-02-28 17:35:13 +13:00
humbletim
654c72fb7e Add weakRef guard to detect ScriptEngine deletion during ScriptCache::getScriptContents 2017-02-27 22:58:59 -05:00
Atlante45
e03368414e CR 2017-02-27 18:57:44 -08:00
samcake
576660f6ef Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-27 18:17:28 -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