Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 03:57:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55857 commits 76 branches 59 tags 1.2 GiB
Commit graph

55857 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
0f22b07026 move session ID logging later in app startup 2017-06-01 16:07:36 -07:00
anshuman64
694d1d042d Merge pull request #10573 from druiz17/head-puck 
Added head puck configuration
 2017-06-01 16:06:00 -07:00
Stephen Birarda
06b3ecfdc3 also log metaverse session ID during ctor of AccountManager 2017-06-01 15:50:56 -07:00
Anthony J. Thibault
3710637254 warning fix 2017-06-01 15:17:02 -07:00
Dante Ruiz
77eb75db95 add .json to extension 2017-06-01 22:48:59 +01:00
Seth Alves
f45db99149 for the moment, vive input plugin isn't a head-controller unless the HMD is being worn 2017-06-01 14:35:53 -07:00
Dante Ruiz
6bc53388f8 Merge branch 'master' of github.com:highfidelity/hifi into record-standard 2017-06-01 22:34:57 +01:00
Seth Alves
4c69ec4365 Merge pull request #10588 from druiz17/recorder-fix 
Changed  the input recorder to store actions by strings
 2017-06-01 14:34:09 -07:00
Dante Ruiz
725388043f removed double semi-colons 2017-06-01 22:30:50 +01:00
Dante Ruiz
2a5c43026a gzip recording data 2017-06-01 22:27:51 +01:00
Anthony J. Thibault
551426f46e Made computeSplineJointInfosForIKTarget more general 
It should now work for non-vertical oriented splines.
 2017-06-01 13:56:06 -07:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
Stephen Birarda
3d98f1b3ee print metaverse session ID to debug log 2017-06-01 13:46:37 -07:00
Stephen Birarda
c513d04b52 remove crash event definition for now 2017-06-01 13:40:50 -07:00
Anthony J. Thibault
f99b579c14 added some docs 2017-06-01 13:38:18 -07:00
Seth Alves
10ddbecdb9 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 13:37:22 -07:00
Seth Alves
ac6135387c display plugins are never head controllers 2017-06-01 13:37:16 -07:00
Anthony J. Thibault
b9bf6f4c05 whitespace 2017-06-01 13:30:35 -07:00
howard-stearns
1068a4a9bd remove the optimization for upperId == lowerId. Doesn't work in zaru 
tunnels.
 2017-06-01 13:21:24 -07:00
Anthony J. Thibault
226855b2b9 Bug fixes and cleanup 
* Bug fix for problem when chest target is enabled but hips target is not.
* centralized the two computeSplineFromTipAndBase functions into one.
* Removed dead code
 2017-06-01 13:20:50 -07:00
samcake
9c1e99fe3f Removing cruft and organizing the stencil config 2017-06-01 13:06:22 -07:00
Stephen Birarda
792d938262 send quit event during shutdown on thread, with timeout 2017-06-01 13:01:24 -07:00
Ryan Huffman
52f9100332 Fix isProcessRunning error in strict mode 2017-06-01 12:48:42 -07:00
Zach Fox
4e929f6d92 Merge pull request #10581 from zfox23/snapshot_fixForUrlShare 
Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't
 2017-06-01 11:51:14 -07:00
Ryan Huffman
aaf9b9ac7f Update server-console to watch interface via pid rather than marker 2017-06-01 11:20:36 -07:00
Dante Ruiz
c0003f6791 Merge branch 'master' of github.com:highfidelity/hifi into record-standard 2017-06-01 19:06:50 +01:00
Dante Ruiz
9a8030cc09 Merge branch 'recorder-fix' into record-standard 2017-06-01 19:01:54 +01:00
Dante Ruiz
0e82b33d6d final changes 2017-06-01 19:00:31 +01:00
Seth Alves
b83620f7c5 Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller 2017-06-01 10:58:33 -07:00
Seth Alves
eca05d9c42 more use of head input 2017-06-01 10:57:53 -07:00
Dante Ruiz
e52765b641 playback recording back through the standard inputs 2017-06-01 18:51:24 +01:00
David Kelly
017955dca8 Merge pull request #10587 from davidkelly/dk/5028 
Don't allow sorting on non-sortable columns in PAL
 2017-06-01 10:49:11 -07:00
Dante Ruiz
c686acc071 fixing build issue 2017-06-01 18:20:56 +01:00
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -07:00
Vladyslav Stelmakhovskyi
b0e4b752d5 Implements landscape mode for tablet as rotation instead of stretching 2017-06-01 19:07:17 +02:00
Dante Ruiz
23a9209285 Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix 2017-06-01 18:06:37 +01:00
Dante Ruiz
a1e0737928 saving work 2017-06-01 18:06:06 +01:00
David Kelly
b6b2f92af2 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028 2017-06-01 09:58:07 -07:00
Andrew Meadows
e27199601f Merge pull request #10585 from samcake/orange 
Fixing warnings
 2017-06-01 09:33:16 -07:00
samcake
257813ec38 comment the code 2017-06-01 09:19:02 -07:00
Dante Ruiz
36002e8b92 Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix 2017-06-01 17:01:59 +01:00
Anthony J. Thibault
813feeb8fd Limit spine spline compression/stretch to 15% 2017-06-01 08:56:42 -07:00
David Kelly
f79c9ea021 we can sort on ignored 2017-06-01 07:29:31 -07:00
David Kelly
a17886aa58 do not allow sorting on non-sortable columns in PAL 2017-06-01 07:24:03 -07:00
Vladyslav Stelmakhovskyi
30ab9771ef Merge branch 'master' into create_in_landscape 2017-06-01 16:06:15 +02:00
Seth Alves
0b2eb43ee2 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 07:02:31 -07:00
David Rowe
47e65e942e Gradually relax hands from controlled positions when lose tracking 2017-06-01 23:42:08 +12:00
Sam Cake
ea6be93c9c adding another flavor of the prepare stencil 2017-06-01 01:24:57 -07:00
NeetBhagat
d27ad061cb Merge branch 'master' into 21255 2017-06-01 12:46:14 +05:30
Sam Cake
07eb1d89e1 fixing the warning on macosx about the non portable file name 2017-05-31 23:59:44 -07:00