Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 16:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55568 commits 25 branches 0 tags 1.1 GiB
Commit graph

17657 commits

Author SHA1 Message Date
Seth Alves
c40a76f320 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 13:58:00 -07:00
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
Ryan Huffman
c0bca73ec7 Merge pull request #10606 from huffman/feat/startup-went-to-event 
Add startup_sent_to user activity event
 2017-06-02 13:49:41 -07:00
Chris Collins
34201ea1da Merge pull request #10599 from jherico/ktx_cache_wipe 
Add versioning support to the KTX cache
 2017-06-02 13:02:18 -07:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -07:00
Ryan Huffman
0d96f82888 Merge pull request #10592 from birarda/close-report 
Send a close event to API on shutdown
 2017-06-02 10:57:41 -07:00
Seth Alves
d91b3700a7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 10:07:50 -07:00
Ryan Huffman
0fdbf4a342 Add startup_sent_to user activity event 2017-06-02 09:59:29 -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
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
Seth Alves
7d21ab88b0 add some saftey checks. cleanups 2017-06-01 16:14:59 -07:00
Stephen Birarda
0f22b07026 move session ID logging later in app startup 2017-06-01 16:07:36 -07:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
Stephen Birarda
c513d04b52 remove crash event definition for now 2017-06-01 13:40:50 -07:00
Seth Alves
ac6135387c display plugins are never head controllers 2017-06-01 13:37:16 -07:00
Stephen Birarda
792d938262 send quit event during shutdown on thread, with timeout 2017-06-01 13:01:24 -07: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
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -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
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
Stephen Birarda
1d9d83b157 initial version of the ClosureEventSender using std::thread 2017-05-31 19:00:41 -07:00
Seth Alves
e37387f45c sync 2017-05-31 14:01:09 -07:00
Patrick Manalich
7b69a5dbd5 Changed the DEFAULT_DISCOVERABILITY_MODE to Connections 2017-05-31 10:46:04 -07:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
Seth Alves
250e381ea7 Merge pull request #10563 from Atlante45/fix/reset-settings 
Fix "retain avatar info"
 2017-05-30 10:00:55 -07:00
Seth Alves
66415dadc6 Merge pull request #10496 from volansystech/Wl-21298 
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace  using the scrollbar.
 2017-05-27 08:28:19 -07:00
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
Atlante45
ccc7cb638d Fix "retain avatar info" 2017-05-26 14:18:29 -07:00
Andrew Meadows
fa003b0c14 swap order of changes and deactvations 2017-05-26 12:29:37 -07:00
Anthony Thibault
84901ba94b Merge pull request #10542 from druiz17/arm-pucks 
Added pucks calibration for upper arm/shoulders
 2017-05-26 11:17:15 -07:00
volansystech
8d9cfbdf31 Resolve comments of @sethalves . Remove whitespaces. 2017-05-26 11:41:35 +05:30
Clément Brisset
efe72e1b85 Merge pull request #10530 from Atlante45/fix/default-scripts 
Ensure user never loses its running scripts
 2017-05-25 18:33:11 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
Dante Ruiz
108c444cc7 clean up code 2017-05-25 21:59:06 +01:00
Andrew Meadows
3bd0c111d7 verify empty ShapeManager in Application dtor 2017-05-25 13:47:40 -07:00
Seth Alves
3823ece153 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1 change some code to look at head-controller position rather than hmd position 2017-05-25 10:50:41 -07:00
volansystech
cab6f3f7c3 Solve Jitteriness while scrolling. 2017-05-25 17:28:19 +05:30
volansystech
aab80629ea Merge branch 'master' into Wl-21298 2017-05-25 15:44:17 +05:30
Sam Cake
3eb95d2d19 cleaning the commented code 2017-05-25 01:16:45 -07:00
samcake
575d4abdf7 bad include fixed maybe 2017-05-24 17:25:21 -07:00
samcake
044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-24 15:40:40 -07:00
Dante Ruiz
8cb9bfcc81 fixed merge conflict 2017-05-24 19:35:41 +01:00
Sam Gateau
f9c6cecb23 Merge pull request #10529 from samcake/ambient 
Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting
 2017-05-24 10:48:21 -07:00
anshuman64
2b63eb9d90 Merge pull request #10469 from druiz17/improve-rotation-jitter 
Added a LowVelocityFilter to the input system.
 2017-05-24 08:35:13 -07:00
Dante Ruiz
ac3c9655ec added arms 2017-05-24 01:28:08 +01:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00