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

53331 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
b1a015affd Merge pull request #10117 from huffman/fix/unlock-propagation 
Fix entity "unlock" edits not being propagated to clients
 2017-04-06 15:28:05 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936 
pal selection changes
 2017-04-06 14:58:46 -07:00
Clément Brisset
da27cd1c8b Merge pull request #10149 from mittens/patch-1 
Link to coding standards.
 2017-04-06 14:46:45 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
Chris Collins
494c8d868e Merge pull request #10126 from samcake/brown 
Fixing the rendering of Image3D overlay when drawn in the scene
 2017-04-06 13:40:09 -07:00
Anthony J. Thibault
4e49774d0e Moved device class check into handleTrackedObject 2017-04-06 13:20:00 -07:00
Trent Polack
d163b34368 Link to coding standards. 2017-04-06 15:57:32 -04:00
David Kelly
46a7d28e16 Merge pull request #10144 from howard-stearns/notice-login-change-in-pal 
notice login/logout change in pal
 2017-04-06 12:57:22 -07:00
David Kelly
e0a1422345 pal selection changes 2017-04-06 12:07:51 -07:00
samcake
19d080c4cc Merging 2017-04-06 11:33:41 -07:00
howard-stearns
1d60a55d5f notice login/logout change in pal 2017-04-06 11:20:08 -07:00
David Kelly
85c78da839 updated, plus fixed some annoying errors in logs from Pal.qml 2017-04-06 11:16:51 -07:00
David Kelly
34a2cefb98 Merge pull request #10132 from davidkelly/dk/analyticsForConnections 
initial analytics for connections
 2017-04-06 10:45:39 -07:00
druiz17
01204f845f Merge pull request #10141 from vladest/tabletwebview-focus 
TabletWebView redesigned to single WebView instance
 2017-04-06 10:40:24 -07:00
Brad Davis
057a9feaf1 Don't crash if KTX file is invalid 2017-04-06 10:09:57 -07:00
Vladyslav Stelmakhovskyi
16fa7988f6 TabletWebView redesigned to single WebView instance 2017-04-06 17:53:46 +02:00
David Kelly
a92162dea9 no mo useless debug statements 2017-04-06 08:50:22 -07:00
Triplelexx
f588612fc3 add audioPacketLoss % display in stats 2017-04-06 16:04:14 +01:00
Anthony J. Thibault
42262aac78 OpenVR: upgrade to version 1.0.6, for better generic tracker support 2017-04-05 18:41:43 -07:00
David Kelly
06bd9c97bf remove info button from avatar image 2017-04-05 18:21:54 -07:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
Anthony Thibault
be2fdd9388 Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects 
Vive: Expose all 16 tracked poses to the controller system
 2017-04-05 16:53:47 -07:00
Stephen Birarda
e4021c168e add special handling for abs drive letter paths from windows 2017-04-05 16:52:22 -07:00
Philip Rosedale
5e91d578c2 Merge pull request #10129 from hyperlogic/bug-fix/teleport-improvements 
Recenter body on teleport, also it works more consistently.
 2017-04-05 16:45:41 -07:00
Dante Ruiz
5bb4edf18c Merge branch 'master' of github.com:highfidelity/hifi into goto-fix 2017-04-06 00:16:59 +01:00
Dante Ruiz
90f5d02c99 goto toggle option 2017-04-06 00:13:53 +01:00
Faye Li
97d75e654e mannually bind avatar and entity 2017-04-05 15:04:21 -07:00
Faye Li
e9934ac696 selfie stick script 2017-04-05 14:59:19 -07:00
samcake
8267db6ce5 Add a description of the Transaction class 2017-04-05 14:19:00 -07:00
samcake
026e7bc249 Add a description of the Transaction class 2017-04-05 14:17:26 -07:00
samcake
1a9005ed8b Avoid unexpected changes 2017-04-05 13:57:40 -07:00
samcake
5629cf425e Cleaning up the files updated 2017-04-05 13:49:07 -07:00
Seth Alves
2e4e10759f teleport raypick now ignores equipped or grabbed entities 2017-04-05 13:17:03 -07:00
samcake
8356e5495f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-05 13:12:21 -07:00
samcake
309c6b8d9b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-05 13:11:12 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Seth Alves
84a66e1003 Merge branch 'master' of github.com:highfidelity/hifi 2017-04-05 12:41:55 -07:00
Seth Alves
b6bf9c3c3c Merge branch 'master' of github.com:sethalves/hifi 2017-04-05 12:41:48 -07:00
Seth Alves
b0ccbae552 Merge pull request #10131 from druiz17/tablet-edit-box 
Fix the text input for edit's newModelDialog
 2017-04-05 12:37:26 -07:00
Seth Alves
b58fe6ee90 Merge pull request #10127 from druiz17/oculus-tracking 
Use old controller data for 3 seconds when losing track of touch controllers
 2017-04-05 12:34:43 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
fa95842c76 Merge branch 'master' of github.com:highfidelity/hifi into tablet-edit-box 2017-04-05 18:01:21 +01:00