Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:13:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56045 commits 25 branches 0 tags 1.1 GiB
Commit graph

20640 commits

Author SHA1 Message Date
Howard Stearns
c48b729527 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-02 18:05:20 -07:00
Ryan Huffman
52c60b35df Add startup_sent_to user activity event 2017-06-02 17:57:40 -07:00
Seth Alves
1b719ee654 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 16:31:23 -07:00
manapa01
8e1577d3d3 Merge pull request #10596 from manapa01/Snapshot-Sound 
Snapshot sound
 2017-06-02 16:07:05 -07:00
David Kelly
12cbc206d2 cr feedback 2017-06-02 15:59:15 -07:00
Clément Brisset
c636922a5d Merge pull request #10590 from huffman/fix/running-marker 
Update server-console to watch interface via pid rather than marker
 2017-06-02 15:57:44 -07:00
David Kelly
9b34abeb40 oops initializer order... 2017-06-02 15:43:29 -07:00
Seth Alves
3359a0a794 work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation 2017-06-02 15:29:20 -07:00
David Kelly
f9e1f02888 protect _text member of Text3DOverlay with mutex 2017-06-02 14:59:27 -07:00
samcake
0a3c1712eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 14:35:05 -07:00
Patrick Manalich
76901f5bf9 Final Application.cpp change 2017-06-02 14:08:56 -07:00
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
Stephen Birarda
d89febac71 use a sleep instead of a yield waiting for close event 2017-06-02 13:22:02 -07:00
Stephen Birarda
e3d8229abe rename ClosureEventSender to CloseEventSender 2017-06-02 13:21:55 -07:00
Stephen Birarda
ecc697dbe1 remove crash event definition for now 2017-06-02 13:21:45 -07:00
Stephen Birarda
40dfcb1e6e send quit event during shutdown on thread, with timeout 2017-06-02 13:21:37 -07:00
Stephen Birarda
f5d732f332 initial version of the ClosureEventSender using std::thread 2017-06-02 13:21:28 -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
Sam Gateau
8a2837e1f7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 11:52:11 -07:00
David Rowe
58c4a2f12a Fix icon for polylines in entities editor properties page 2017-06-03 06:26:13 +12: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
Patrick Manalich
1f478bdf13 Repair Application.cpp 2017-06-02 10:44:58 -07:00
Patrick Manalich
a705e722f1 Ctrl-S sound feature added 2017-06-02 10:35:57 -07:00
Patrick Manalich
0c71cf4bda Edit: Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263 Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -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
NeetBhagat
6228ff19bf Resolve the reviewed comments of @ZappoMan 2017-06-02 15:23:21 +05:30
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
NeetBhagat
e08c3453a4 Merge branch 'master' into 21255 2017-06-02 12:36:07 +05:30
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
Ryan Huffman
86da91ac8d Remove the runningMarker timer 2017-06-01 18:19:13 -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
Stephen Birarda
0b05774059 change default avatar to new baked mannequin 2017-06-01 17:12:29 -07:00
howard-stearns
6b2e4c5abc zaru stuff 2017-06-01 17:08:22 -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
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
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
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
howard-stearns
1068a4a9bd remove the optimization for upperId == lowerId. Doesn't work in zaru 
tunnels.
 2017-06-01 13:21:24 -07:00
Stephen Birarda
792d938262 send quit event during shutdown on thread, with timeout 2017-06-01 13:01:24 -07:00
Ryan Huffman
aaf9b9ac7f Update server-console to watch interface via pid rather than marker 2017-06-01 11:20:36 -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
David Kelly
b6b2f92af2 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028 2017-06-01 09:58:07 -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
Seth Alves
0b2eb43ee2 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 07:02:31 -07:00
NeetBhagat
d27ad061cb Merge branch 'master' into 21255 2017-06-01 12:46:14 +05:30
NeetBhagat
c7c07b28e9 Resolve the reviewed comments of @ZappoMan 2017-06-01 12:17:13 +05:30
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
howard-stearns
1e1dd3a633 checkpoint with working detector 2017-05-31 17:10:37 -07:00
Seth Alves
e37387f45c sync 2017-05-31 14:01:09 -07:00
Howard Stearns
b552566bf8 Merge pull request #10580 from manapa01/Default-Discoverability-Mode 
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
 2017-05-31 13:00:15 -07:00
Chris Howe
6edc6b2756 WL21317 
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
 2017-05-31 15:05:43 -04:00
Patrick Manalich
7b69a5dbd5 Changed the DEFAULT_DISCOVERABILITY_MODE to Connections 2017-05-31 10:46:04 -07:00
Zach Fox
0441d8c703 Add placeholder image when previous snapshot can't be loaded 2017-05-31 10:27:17 -07:00
Seth Alves
7a47250aa7 oops missed a comma 2017-05-31 10:21:10 -07:00
NeetBhagat
58142817a1 Resolve the review comments of @ZappoMan. 2017-05-31 19:18:14 +05:30
Dante Ruiz
b3401d9762 making some final changes 2017-05-30 23:55:45 +01:00
howard-stearns
07ea2e271b hook into location changes 2017-05-30 14:59:19 -07:00
Dante Ruiz
a0ba1a64b5 Merge branch 'master' of github.com:highfidelity/hifi into head-puck 2017-05-30 22:52:57 +01:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
Chris Collins
5db0975554 Merge pull request #10556 from highfidelity/RC-41 
Beta Release 41 - Includes up to Developer Release 6603
 2017-05-30 12:52:30 -07:00
howard-stearns
fe351f8ea2 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-05-30 12:04:15 -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
volansystech
e90b1b5a67 Resolve the comments of @ZappoMan. 2017-05-29 18:21:59 +05:30
volansystech
212627bd5d Merge branch 'master' into 21255 2017-05-29 17:51:45 +05:30
volansystech
0920dbc1a8 Resolve the comments of @ZappoMan. 2017-05-29 15:53:33 +05:30
Vladyslav Stelmakhovskyi
238a2b2eb8 Merge branch 'master' into fix_claraio_download_clones 2017-05-28 21:40:05 +02:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02: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
Dante Ruiz
a45bea2c90 fixed merge conflicts 2017-05-27 00:57:09 +01:00
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
howard-stearns
92aeadd70f rotation of local capsule offset 2017-05-26 16:34:08 -07:00
howard-stearns
f694691efb add fixme comments and make isUp/isDown ordinary methods. 2017-05-26 16:15:18 -07:00
howard-stearns
4be31f1b18 thread safety 2017-05-26 15:31:59 -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
howard-stearns
7cee438298 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-05-26 11:36:04 -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
Dante Ruiz
1b8bd016fe Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-26 17:03:05 +01: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
howard-stearns
905b5261d1 If collisions are enabled, turn them off in safeLanding, and 
restore.
 2017-05-25 16:32:44 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
howard-stearns
ac8cb63419 clean and DRY 2017-05-25 14:34:24 -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
Dante Ruiz
8538c700b5 saving head work 2017-05-25 21:41:41 +01:00
howard-stearns
9d73d0c931 works with nested enclosing entities 2017-05-25 12:09:22 -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
howard-stearns
74c163d047 snapshot of safeLanding. Works as long as entities don't intersect. 2017-05-25 10:25:29 -07:00
volansystech
a2851b5bcb Put proper comments and indentation. 2017-05-25 18:47:59 +05:30
volansystech
8d51be644d Merge branch 'master' into 21255 2017-05-25 17:48:48 +05:30
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
volansystech
1f24e38585 Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift. 2017-05-25 14:56:06 +05:30
Sam Cake
3eb95d2d19 cleaning the commented code 2017-05-25 01:16:45 -07:00
Stephen Birarda
f897f3f090 send machine fingerprint as uuid without curly braces 2017-05-24 19:08:25 -07:00
Stephen Birarda
50285005be add machine fingerprint to the launch event 2017-05-24 18:35:57 -07:00
Stephen Birarda
c671817fa3 fix cache http request count in stats 2017-05-24 17:47:40 -07:00
Stephen Birarda
fefb34512d change asset inbound key to atp 2017-05-24 17:44:09 -07:00
Stephen Birarda
c37fd335e1 track the number of local socket changes 2017-05-24 17:41:52 -07:00
Stephen Birarda
5e61f20df8 add more details about pending downloads 2017-05-24 17:37:42 -07:00
Stephen Birarda
48c4db1ca4 nest the download stats so they are cleaner 2017-05-24 17:36:21 -07:00
samcake
575d4abdf7 bad include fixed maybe 2017-05-24 17:25:21 -07:00
Stephen Birarda
3743cd23b4 add detailed download stats for file/http/atp 2017-05-24 17:22:38 -07:00
Stephen Birarda
ac55908e42 add additional information to stats/launch activities 2017-05-24 16:50:06 -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
Dante Ruiz
0fdf136251 got the shoulders working 2017-05-24 19:31:48 +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
volansystech
0c4cd96bfd Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift. 2017-05-24 12:26:07 +05:30
Dante Ruiz
ac3c9655ec added arms 2017-05-24 01:28:08 +01:00
Brad Hefta-Gaub
eca045714b Merge pull request #10532 from ctrlaltdavid/21344 
Display spinner in Web controls when they're loading an HTTP page
 2017-05-23 16:39:17 -07:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00
Clément Brisset
499897e271 Merge pull request #10533 from thoys/fix/attachment-scale 
Attachment Scale fix (Breaks previous set attachment scales)
 2017-05-23 10:59:54 -07:00
Clément Brisset
ed86ca3e55 Merge pull request #10522 from birarda/bug/version-number-jumps 
remove version difference from update dialog
 2017-05-23 10:28:50 -07:00
Dante Ruiz
0cbdeaa1e8 Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-23 18:26:58 +01:00
Dante Ruiz
54d63f5155 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-23 18:19:38 +01:00
Thijs Wenker
962d95ca46 add more precision to attachment scale in attachment dialog 2017-05-23 18:16:08 +02:00
Anthony J. Thibault
06c26f029a Merge branch 'master' into feature/faster-ik-iterations 2017-05-23 09:10:17 -07:00
Sam Cake
7f9c98a922 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-22 22:54:43 -07:00
Chris Collins
978eb0dfa9 Merge pull request #10492 from ctrlaltdavid/21359 
Fix eye behavior in recording playback
 2017-05-22 21:53:13 -07:00
David Rowe
bc4af86b57 Display spinner in Web controls when they're loading an HTTP page 2017-05-23 15:40:35 +12:00
Atlante45
10eb353126 Ensure user never loses its running scripts 2017-05-22 18:55:58 -07:00
Sam Gateau
e4a516dcbf Merge pull request #10497 from AndrewMeadows/crashfix-null-rig 
fix crash for Zone with 'compoundURL' property
 2017-05-22 18:18:08 -07:00
samcake
653abf0ee3 brining the new counters to 4.1 2017-05-22 17:34:06 -07:00
samcake
e0487f7e04 Solving the size evaluation for compressed format 2017-05-22 16:51:54 -07:00
Brad Davis
3995f539cf Merge pull request #10500 from Atlante45/feat/bc7 
Add BC7 compression support
 2017-05-22 16:47:27 -07:00
Dante Ruiz
d98e7d5bc6 adding left and right arm 2017-05-23 00:26:12 +01:00
samcake
e4f9f2935e Solving the size evaluation for compressed format 2017-05-22 15:42:18 -07:00
David Rowe
b0962865b2 Code review 2017-05-23 09:57:53 +12:00
Stephen Birarda
3e09c911f5 remove number of versions behind from the update dialog 2017-05-22 14:19:36 -07:00