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

55568 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
samcake
6dbbd6c8d0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-25 11:25:46 -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
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
seefo
967148e3bf Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-25 09:32:34 -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
Brad Hefta-Gaub
23af6294ab Merge pull request #10521 from sethalves/fix-locked-in-motion 
if something is locked but in motion, make it kinematic rather than static
 2017-05-25 08:32:30 -07:00
Brad Hefta-Gaub
5af95c8fdf Merge pull request #10476 from sethalves/fix-imported-children-querybox 
fix up queryAACubes before sending imported entities to server
 2017-05-25 08:29:23 -07:00
Brad Hefta-Gaub
756e00e9a9 Merge pull request #10502 from kencooke/audio-noisegate-new 
Advanced noise gate
 2017-05-25 08:21:49 -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
Atlante45
05f69ade32 Never store an address with an empty host 2017-05-24 17:39:27 -07:00
samcake
575d4abdf7 bad include fixed maybe 2017-05-24 17:25:21 -07:00
Thijs Wenker
a186d4f5e7 Merge pull request #10545 from ctrlaltdavid/21352 
Fix rotation axes of stopwatch hands
 2017-05-25 00:41:59 +02:00
samcake
044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-24 15:40:40 -07:00
David Rowe
504faf430d Fix rotation axes of stopwatch hands 2017-05-25 09:35:51 +12:00
Stephen Birarda
9cd11a32e2 add a debug log for failed token refresh 2017-05-24 13:47:24 -07:00
Stephen Birarda
14ff6a06b4 require a valid access token and expiry to attempt refresh 2017-05-24 13:16:26 -07:00
Brad Davis
6490c52245 Do not allow divide by zero on assigning mip data 2017-05-24 13:02:54 -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
Brad Davis
191b633081 Refactor KTX defines and validation 2017-05-24 11:15:34 -07: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
Brad Davis
077e56a96f Add KTX validation routines 2017-05-24 09:44:56 -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
Chris Collins
f8b92b6666 Merge pull request #10536 from misslivirose/fix/check-extension-running-scripts 
Fix/check extension running scripts
 2017-05-23 22:15:50 -07:00
Howard Stearns
b46ff07d65 Merge pull request #10527 from davidkelly/dk/4756 
Should fix crash in general setting dialog
 2017-05-23 18:08:13 -07:00
samcake
c256893575 some clean up: 2017-05-23 18:00:22 -07:00
Stephen Birarda
5865cbbdde Merge pull request #10535 from seefo/master 
DS HTTP auth will no longer accept any password if the assigned password is blank
 2017-05-23 17:36:05 -07:00
Ken Cooke
0fe404adbb Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noisegate-new 2017-05-23 17:31:03 -07:00
Dante Ruiz
ac3c9655ec added arms 2017-05-24 01:28:08 +01:00
seefo
cb831733a1 Added warning if trying to change DS HTTP password to blank string 2017-05-23 17:07:37 -07: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
Ken Cooke
3d67978caa Delete the old noise gate 2017-05-23 15:53:38 -07:00
Stephen Birarda
9cdd7cc895 fix model check for filenames with periods 2017-05-23 15:46:45 -07:00
Ken Cooke
f3797798d3 Cleanup 2017-05-23 15:33:37 -07:00
Ken Cooke
c47d80574e Replace the other noise gate, in Agent.cpp 2017-05-23 15:32:41 -07:00
Brad Hefta-Gaub
e38381b0ef Merge pull request #10523 from birarda/bug/null-identity-packet-uuid 
ensure AvatarMixerClientData AvatarData has session ID
 2017-05-23 15:24:58 -07:00
Liv
b2bbf21fb0 style fixes 2017-05-23 15:21:21 -07:00