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

52001 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
8893c4770e Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers 2017-03-02 10:02:33 -08:00
Seth Alves
93055a67a8 use new-style hand-lasers for both hands 2017-03-02 10:01:08 -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
Dante Ruiz
5ba89e67af fixed message dialog bug 2017-03-02 16:50:42 +00: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
Dante Ruiz
ea804578ce Merge branch 'master' into menuFix 2017-03-02 16:06:32 +00:00
Andrew Meadows
a55ab94cd9 other avatars use jointData no Rig animation 2017-03-02 07:52:02 -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
Anthony J. Thibault
4f03c06a94 Added General Preference to control stylus vs finger usage 
By default the finger is preferred over the stylus.
 2017-03-01 18:07:53 -08:00
Thijs Wenker
f42f8cf602 bullet moved 2017-03-02 02:39:34 +01:00
Seth Alves
7f6b803652 3d-line-overlays can now have an endParentID and endParentJointIndex 2017-03-01 17:27:32 -08: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
David Kelly
81451191c1 no need to get the ScriptableAvatar from DependencyManager every time 2017-03-01 18:06:03 -07:00
Dante Ruiz
58c1a2fb99 Merge branch 'master' into menuFix 2017-03-02 00:55:18 +00:00
Seth Alves
7c4869eb73 fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother 2017-03-01 16:10:07 -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
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
Dante Ruiz
accff0a37a Merge branch 'master' into menuFix 2017-03-01 16:05:58 +00:00
Dante Ruiz
e2479a78bd Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-01 16:04:12 +00: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
Seth Alves
319c5f69e7 Merge pull request #8 from druiz17/tablet-edit-js 
fixed combobox and pushOntoStack
 2017-02-28 13:53:59 -08:00
David Kelly
c10b0389de Add a getAvatarGain method to NodeList and UsersScriptingInterface 2017-02-28 14:45:34 -07:00
Dante Ruiz
16d3f22e77 remove uncommented code 2017-02-28 21:39:33 +00:00
Dante Ruiz
606d618fe8 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js 2017-02-28 21:35:14 +00:00
Seth Alves
c2085ebb6e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-28 13:33:51 -08:00
Dante Ruiz
f0f2b8c4da fix comboBox and PushOntoStack 2017-02-28 21:30:25 +00:00
Stephen Birarda
8562a294fa cleanup some extra spacing 2017-02-28 13:24:41 -08:00