Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-20 12:37:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55551 commits 76 branches 59 tags 1.2 GiB
Commit graph

55551 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
9088e288e0 don't worry about head controller being enabled, just check to see if head pose is valid 2017-06-02 13:57:53 -07:00
Seth Alves
d91b3700a7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 10:07:50 -07:00
Seth Alves
bc2311cb35 Merge pull request #10561 from AndrewMeadows/sanity-check-physics 
fix crash in EntityMotionState::handleDeactivation()
 2017-06-02 09:55:20 -07:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble 
Add UserActivity calls for bubble usage
 2017-06-02 09:48:15 -07:00
David Kelly
2feea16063 added comment 2017-06-02 09:47:03 -07:00
Seth Alves
f47a49e631 Merge pull request #10597 from druiz17/record-standard 
Saved recording are officially g zipped and pose are played back to the standard endpoint
 2017-06-02 09:44:03 -07:00
David Kelly
4dae77cd9d make sure we dont log the initial call to onBubbleToggled 2017-06-02 08:45:02 -07:00
Brad Davis
9a80a81321 Merge pull request #10565 from vladest/fix_claraio_download_clones 
Make sure that there is only one connection created for web events, s…
 2017-06-01 20:42:50 -07:00
Stephen Birarda
6a89726a6a Merge pull request #10593 from birarda/log-api-session-id 
print the metaverse session ID to the debug log
 2017-06-01 18:02:17 -07:00
David Kelly
37b738ff8b initial cut at some UserActivities for the bubble 2017-06-01 16:46:31 -07:00
Seth Alves
27664756de with vive head-puck, isHeadController is true, even when HMD isn't mounted 2017-06-01 16:37:04 -07:00
Seth Alves
48ee546545 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 16:15:03 -07:00
Seth Alves
7d21ab88b0 add some saftey checks. cleanups 2017-06-01 16:14:59 -07:00
Brad Davis
3fdad14ca4 Merge pull request #10571 from jherico/ktx_tests 
FileCache refactoring and test, plus KTX unit tests
 2017-06-01 16:09:14 -07:00
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
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
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
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
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
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
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
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
Seth Alves
0b2eb43ee2 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 07:02:31 -07:00
Sam Cake
07eb1d89e1 fixing the warning on macosx about the non portable file name 2017-05-31 23:59:44 -07:00
Sam Cake
3c9b14ee94 Oene more fix 2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c Fixing the warnings 2017-05-31 23:20:10 -07:00
Sam Cake
0372deebff Last warnings? 2017-05-31 22:09:30 -07:00