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

55401 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Zach Pomerantz
858b980c16 add qml Separator 2017-06-12 15:18:16 -04:00
Zach Pomerantz
d416464b62 add Audio to tablet context 2017-06-06 17:55:19 -04:00
Zach Pomerantz
67288528da add Audio.context 2017-06-06 17:55:06 -04:00
Zach Pomerantz
2b99f299c8 testing 2017-06-06 17:54:52 -04:00
Zach Pomerantz
d8815d1dce prep audio menu 2017-06-05 16:24:00 -04:00
Zach Pomerantz
7cb38d22c3 fix AudioBuffers to work in tablet 2017-06-05 15:06:47 -04:00
Zach Pomerantz
9395de1873 add nop notify signals to Audio(Devices) 2017-06-05 14:57:44 -04:00
Zach Pomerantz
954e4979f8 expose Audio.devices.input/output 2017-05-31 20:14:58 -04:00
Zach Pomerantz
4a3f2e1d09 use subclass for interface's Audio interface 2017-05-28 19:25:37 -04:00
Zach Pomerantz
b2eda7cf22 rm AudioDevice interface 2017-05-28 19:04:51 -04:00
Zach Pomerantz
2b40ad4275 mv Audio... to Settings as dialog 2017-05-28 17:42:24 -04:00
Zach Pomerantz
8ca8c3aa69 mv AudioPreferencesDialog to AudioBuffers 2017-05-28 17:40:57 -04:00
Zach Pomerantz
03d3666c0c show menu after requesting it 2017-05-28 17:34:11 -04:00
Zach Pomerantz
156b3f9738 use showDialog instead of toggleMenu 2017-05-28 17:10:59 -04:00
Zach Pomerantz
637a448c2c abstract toggleMenu 2017-05-26 17:12:15 -04:00
Zach Pomerantz
380a16f9dd use SYSTEM_TABLET static 2017-05-26 17:11:32 -04:00
Zach Pomerantz
297993b358 report success on tablet->pushOntoStack 2017-05-26 17:09:39 -04: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
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
Stephen Birarda
07440e325f fix force of BC3 instead of BC1a compression 2017-05-26 12:04:35 -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
Dante Ruiz
d317d9236f made requested changes 2017-05-26 16:40:21 +01:00
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
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
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
cce19f7027 removed unnessary code 2017-05-25 22:07:51 +01:00
Dante Ruiz
6687b99391 Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-25 21:59:18 +01:00
Dante Ruiz
108c444cc7 clean up code 2017-05-25 21:59:06 +01:00
Seth Alves
a062c964a9 Merge pull request #10550 from sethalves/fix-grab-raypick-props-crash 
fix code that was using old raypickInfo.properties field
 2017-05-25 13:27:19 -07:00
Zach Fox
f2fab57187 Update conditional to handle 'other unowned' case 2017-05-25 13:01:40 -07:00
Zach Fox
b86b07c08f Pull out ownership bidding changes 2017-05-25 13:01:40 -07:00
Zach Fox
be39874999 Changes after discussion with Brad 2017-05-25 13:01:40 -07:00
Zach Fox
f6195cdb1e Committing checkpoint changes, then testing 2017-05-25 13:01:40 -07:00
Zach Fox
0ef507c037 Revert 'dynamicChanged' to be a 'misc' physics property 2017-05-25 13:01:40 -07:00
Zach Fox
acd85b379f Make this PR a protocol change 2017-05-25 13:01:40 -07:00
Zach Fox
4d791211ee Make the changes - big thanks to Andrew! 2017-05-25 13:01:40 -07:00
Atlante45
ea870881ee Log warning when we detect a connection loop 2017-05-25 12:48:21 -07:00
Atlante45
babae456d2 Fix infinite loop in fbx reader 2017-05-25 10:42:33 -07:00
Clément Brisset
aa4059eb05 Merge pull request #10503 from birarda/bake-textures 
update baking tool to enable compression and re-baking
 2017-05-25 10:38:23 -07:00
Seth Alves
de40604042 whitespace 2017-05-25 09:54:40 -07:00
Seth Alves
80e641b6d4 fix code that was using old raypickInfo.properties field 2017-05-25 09:47:02 -07:00
Brad Davis
65c4d31676 Merge pull request #10543 from jherico/mip_data_crash 
Do not allow divide by zero on assigning mip data
 2017-05-25 09:30:27 -07:00
seefo
da41b5dc00 Focus is now changed when adding a new list item in DS settings 2017-05-25 09:20:04 -07:00
Brad Hefta-Gaub
a0484c5f0b Merge pull request #10544 from birarda/bug/refresh-access-token 
require a valid access token and expiry to attempt token refresh
 2017-05-25 08:35:18 -07:00
Brad Hefta-Gaub
ca87b792de Merge pull request #10531 from Atlante45/fix/current-address 
Never store an address with an empty host
 2017-05-25 08:33:16 -07:00