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

55879 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
4a419f2d07 Merging with upstream 2017-06-01 18:25:24 -07:00
Ryan Huffman
86da91ac8d Remove the runningMarker timer 2017-06-01 18:19:13 -07:00
Ryan Huffman
0536f8974a Remove shutdownWatcher option inside sandbox 2017-06-01 18:13:40 -07:00
Ryan Huffman
aa48f3f063 Rename watchProcessShutdown to shutdownWith 2017-06-01 18:13:27 -07:00
samcake
14f9a9848e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-01 18:05:47 -07:00
samcake
c5e9551bab more cleanup 2017-06-01 18:05:18 -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
Stephen Birarda
6d1bbc389d use a sleep instead of a yield waiting for close event 2017-06-01 17:57:23 -07:00
Stephen Birarda
9fad8d1821 rename ClosureEventSender to CloseEventSender 2017-06-01 17:52:01 -07:00
Andrew Meadows
29a05d7eb4 bid immediately when creating new entity 
also clear EntityMotionState::_numInactiveUpdates on new ownership
 2017-06-01 17:39:21 -07:00
Andrew Meadows
74827fc4c8 recently moved static objects added to changelist 
since static objects are not active this will make the interface
release ownership of recently changed static objects
 2017-06-01 17:39:21 -07:00
Andrew Meadows
e34f979ed9 add EntityMotionState::isLocallyOwned() for cleaner logic 2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8 minor formatting fix 2017-06-01 17:39:21 -07:00
Brad Davis
b9f9cddea0 Add versioning support to the KTX cache 2017-06-01 17:16:24 -07:00
howard-stearns
6b2e4c5abc zaru stuff 2017-06-01 17:08:22 -07:00
seefo
4e190434d1 Added polaroids to snapshots 2017-06-01 16:53:48 -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
e1d37f2167 saving work 2017-06-01 23:29:22 +01: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