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

53262 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
1ef5f048a3 Inform user if recording failed to start 2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a Play recording 2017-04-07 18:38:55 +12:00
David Rowe
75d970f5d5 Remove unresponsive players from list 2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de Refactor log and error messages 2017-04-07 17:13:23 +12:00
David Rowe
5e55233934 Assignment client player script receives "play" command from recorder 2017-04-07 17:04:24 +12:00
David Rowe
506a414762 Lint fix 2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3 Encapsulate recording methods in Recorder object 2017-04-07 14:03:08 +12:00
David Rowe
68901c8af5 Merge branch 'master' into 21249 2017-04-07 11:04:43 +12:00
David Rowe
49907970fb Fix countdown showing if restart with dialog open and recording enabled 2017-04-07 11:01:11 +12:00
Seth Alves
ec2ebc00c0 Merge pull request #10145 from hyperlogic/feature/openvr-1.0.6 
OpenVR: upgrade to version 1.0.6, for better generic tracker support
 2017-04-06 15:53:49 -07:00
David Rowe
f164fe7532 Improve error handling 2017-04-07 10:46:40 +12:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column 
fix sorting by pal connections-tab friends column
 2017-04-06 15:43:21 -07:00
David Rowe
0400e5a1f2 Report error status in setMapping() callback 2017-04-07 10:31:52 +12:00
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
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
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
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
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
David Rowe
23c937e55d Make avatar recording and upload to asset server 2017-04-06 18:50:47 +12:00
David Rowe
5676364aec Fix missing return value in Recording.saveRecordingToAsset() 2017-04-06 18:50:15 +12:00
David Rowe
a9f5b60319 Fix recording starting on tablet when close dialog rather than tablet 2017-04-06 15:32:42 +12:00
David Rowe
982c0ec559 Display countdown in overlay 2017-04-06 15:01:53 +12: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
David Rowe
4580b89aa6 Add countdown delay before starting recording 2017-04-06 12:08:27 +12: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
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
David Rowe
096909d423 Close dialog if open when stop script 2017-04-06 10:10:07 +12:00
David Rowe
b8de31db12 Make toolbar icon close dialog if it's open 2017-04-06 10:09:41 +12:00
David Rowe
813a5684e3 Display instruction text only if recording is enabled 2017-04-06 09:22:01 +12:00
samcake
309c6b8d9b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-05 13:11:12 -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