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

55642 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
e02021bddf Tidying 2017-05-30 14:38:59 +12:00
David Rowe
b176dbe544 Refactoring 2017-05-30 14:35:59 +12:00
David Rowe
4c0296daaa Reposition imported JSON entities so that they start at import distance 2017-05-30 14:29:10 +12:00
David Rowe
18558dd795 Make JSON import distance 2m 2017-05-30 13:34:17 +12:00
David Rowe
31df18ff5b Fix snap-to-grid elevation 2017-05-29 18:43:49 +12:00
David Rowe
6c890d90ef Adjust position of model after its been resized 2017-05-29 17:48:01 +12:00
David Rowe
f0785cd39e Adjust creation position so that bounding box is creation distance away 2017-05-29 13:52:36 +12:00
David Rowe
9b679325ff Don't raise creation position if in independent or entity view mode 2017-05-29 13:35:54 +12:00
David Rowe
508dee4580 Increase entity creation distance to 2m 2017-05-29 13:35:18 +12:00
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
Menithal
0e46c11a94 Fixed not being able to override slider sizes 2017-05-28 11:59:30 +03: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
Menithal
4e97f8ad9c Removed stray print 2017-05-27 16:21:25 +03:00
Menithal
26389be826 Minor tweaks to unselect behavior 2017-05-27 11:18:29 +03:00
Menithal
9201af96bd Added Changes from Alan's Feedback 2017-05-27 11:02:01 +03:00
Menithal
5500f8240d Merge remote-tracking branch 'upstream/master' into 21324 2017-05-27 09:55:56 +03:00
Sam Gateau
bc44a03e13 Merge pull request #10537 from samcake/brown 
Fix the flickering and other lighting issues related to zone entities (part 1)
 2017-05-26 18:22:56 -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
David Rowe
019e92b2a3 Fix buttons not working with controllers 2017-05-27 11:27:18 +12:00
Chris Collins
fd3b6cdf1a Merge pull request #10564 from birarda/bug/content-loading-always 
fix progress bar / stats reference to pending transfer count
 2017-05-26 15:29:06 -07:00
Stephen Birarda
6c2758e4ea fix reference to pending transfer count for progress/stats 2017-05-26 14:37:24 -07:00
Atlante45
ccc7cb638d Fix "retain avatar info" 2017-05-26 14:18:29 -07:00
Stephen Birarda
cfbbf3183a Merge pull request #10560 from birarda/bug/zfox-teeth 
fix issue with textures with alpha as a mask
 2017-05-26 13:11:02 -07:00
seefo
1d29610dbb Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-26 12:49:56 -07:00
Brad Davis
952d3629ec Merge pull request #10559 from jherico/fix_compressed_ktx_loading 
Fix compressed KTX loading
 2017-05-26 12:46:11 -07:00
Andrew Meadows
fa003b0c14 swap order of changes and deactvations 2017-05-26 12:29:37 -07:00
Stephen Birarda
07440e325f fix force of BC3 instead of BC1a compression 2017-05-26 12:04:35 -07:00
seefo
cc57d28ccc Made requested changes to PR10554 2017-05-26 11:49:43 -07:00
Brad Davis
f663573f19 Fix compressed KTX loading 2017-05-26 11:25:15 -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
seefo
90d5b2a6d4 Removed SoundProcessor's dependence on Sound objects 2017-05-26 10:32:34 -07:00
seefo
74f0ac5b78 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-26 09:13:20 -07:00
Dante Ruiz
1b8bd016fe Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-26 17:03:05 +01:00
Dante Ruiz
d317d9236f made requested changes 2017-05-26 16:40:21 +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
David Rowe
8a659955cc Delete old script 2017-05-26 13:02:26 +12:00
David Rowe
b1280ff810 Implement start/stop and reset button actions 2017-05-26 13:02:05 +12:00
David Rowe
f25a9dcede Add entities to capture stopwatch button clicks 2017-05-26 13:01:19 +12:00
seefo
0e4fbe01dc Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-25 17:04:03 -07:00
seefo
32b5ac5020 Moved audio asset processing to a separate thread 2017-05-25 16:10:53 -07:00
Sam Gateau
5b0d2f32b4 Merge pull request #10458 from jherico/ktx_validation 
Add KTX validation routines
 2017-05-25 16:02:23 -07:00
Brad Davis
aa5aba428a PR feedback 2017-05-25 15:03:39 -07:00
Seth Alves
f474361a7e Merge pull request #10549 from seefo/master 
Focus is now changed when adding a new list item in DS settings
 2017-05-25 14:47:07 -07:00
Zach Fox
6616a85be0 Merge pull request #10534 from zfox23/fixCollisionSignalEmission 
Fix collision signal emission for static objects
 2017-05-25 14:43:07 -07:00
Andrew Meadows
971855e6bf add asserts to catch dangling pointers sooner 2017-05-25 14:29:14 -07:00
Brad Hefta-Gaub
54bca1e53d Merge pull request #10551 from Atlante45/fix/infinite-loop 
Prevent Infinite loop in FBXReader
 2017-05-25 14:25:06 -07:00
Dante Ruiz
ce52494650 Merge branch 'master' of github.com:highfidelity/hifi into head-puck 2017-05-25 22:13:18 +01:00