Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-16 06:30:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56191 commits 22 branches 0 tags 1.2 GiB
Commit graph

56191 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
b105ad8338 measure linear velocity of tractor position 2017-06-16 16:55:00 -07:00
Zach Fox
6230dcf93d Thanks to Thoys! 2017-06-16 16:34:35 -07:00
Zach Fox
74fde8efd7 Revert "Fix teleporting to another user from the PAL" 
This reverts commit 6b659101d5.
 2017-06-16 15:33:47 -07:00
Brad Davis
a675dfe7d2 Prevent deadlocks from different locking orders in FileCache 2017-06-16 15:30:50 -07:00
Zach Fox
6b659101d5 Fix teleporting to another user from the PAL 2017-06-16 15:09:13 -07:00
Stephen Birarda
39e8510ccb Merge pull request #10720 from seefo/fb5386 
Fixed a bug where you could not print polaroids if you took a gif
 2017-06-16 15:03:45 -07:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Atlante45
097e75285a Remove extra profiling 2017-06-16 14:31:56 -07:00
Atlante45
c2650c2b71 Declare KTXDescriptor* metatype 2017-06-16 14:31:56 -07:00
Atlante45
54fc8085f3 Remove pointer to file in NetworkTexture 2017-06-16 14:31:56 -07:00
Atlante45
4d3fc39ab6 Make KTX async tasks thread safe 2017-06-16 14:31:56 -07:00
Atlante45
fb8aa96a57 Add resource processing tracking to KTX 2017-06-16 14:31:56 -07:00
Atlante45
306b55e45d Synchronous mip loading 2017-06-16 14:31:56 -07:00
Atlante45
57e8d8e1fd Fix download retries 2017-06-16 14:31:56 -07:00
Atlante45
31d2592e7d Handle header and high mips in the same callback 2017-06-16 14:31:56 -07:00
Atlante45
d2251bb840 Offload ktx processing to threadpool 2017-06-16 14:31:56 -07:00
Atlante45
3110dd72bf More ktx work 2017-06-16 14:31:56 -07:00
Atlante45
35a0c41cf5 Move Ktx processing to thread pool. 2017-06-16 14:31:56 -07:00
Chris Collins
a0cd210b60 Merge pull request #10724 from Atlante45/master 
Stable -> Master
 2017-06-16 13:48:37 -07:00
Atlante45
69a5444993 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-06-16 13:43:41 -07:00
NeetBhagat
2909aa9ac8 Resolve comments of @zappoman. 
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
 2017-06-17 01:00:32 +05:30
Zach Fox
54bf0c64a7 Merge pull request #10715 from zfox23/spectatorCamera_buttonMapping 
Spectator Camera controller button mapping + QML Language Fix
 2017-06-16 10:33:17 -07:00
Chris Collins
f160034bf0 Merge pull request #10681 from zzmp/audio/parity 
Revamp audio device selection
 2017-06-16 10:31:55 -07:00
Zach Fox
378d8e80cf Remove random component of button mapping name 2017-06-16 10:08:58 -07:00
Zach Fox
e2c6993ae9 Fix bug found by Cain with his patch - thank you! 2017-06-16 10:08:58 -07:00
Zach Fox
749dede8b3 Start with empty string for checkbox 2017-06-16 10:08:58 -07:00
Zach Fox
3df414df36 Bugfixes and language changes 2017-06-16 10:08:58 -07:00
Zach Fox
65b910bcf6 Support Vive 2017-06-16 10:08:58 -07:00
Zach Fox
8cf9c8708d Allow user to click left thumbstick to switch 'MONITOR SHOWS' 2017-06-16 10:08:58 -07:00
Zach Fox
416ebaa2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 10:08:10 -07:00
seefo
a4d008eec9 Fixed a bug where you could not print polaroids if you took a gif 2017-06-16 08:57:27 -07:00
David Rowe
3cee2b3764 Ensure desktop dialogs' title bars are visible 2017-06-16 20:10:24 +12:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Thijs Wenker
87a6b16d16 Merge pull request #10713 from huffman/feat/remove-tutorial 
Remove /tutorial in favor of new repo
 2017-06-16 01:18:40 +02:00
Stephen Birarda
c7e37a09fb Merge pull request #10710 from seefo/fb5376 
Fixed a bug where custom port wasn't used in AC when passed through CLI
 2017-06-15 15:38:11 -07:00
Zach Fox
130d98fcfc Merge pull request #10708 from zfox23/spectatorCamera_fixMonitorDisplay 
Ensure monitor never shows frozen SpectatorCamera preview
 2017-06-15 15:35:31 -07:00
Zach Pomerantz
eb4255e1ac fix audio checkbox bindings 2017-06-15 18:21:23 -04:00
Ryan Huffman
154b33bddb Remove /tutorial in favor of new repo 
Tutorial code has been moved to a new hifi-tutorial repo
 2017-06-15 15:17:45 -07:00
seefo
6d480600d8 Fixed a bug where custom port wasn't used in AC when passed through CLI 2017-06-15 14:59:36 -07:00
Chris Collins
a1933b535d Merge pull request #10704 from sethalves/remove-chat-from-default-scripts 
remove chat from default scripts
 2017-06-15 14:44:47 -07:00
Zach Fox
eef4c9d747 Merge pull request #10706 from zfox23/spectatorCamera_cauterizedFix 
Show MyAvatar's head in the SpectatorCamera view!
 2017-06-15 13:49:13 -07:00
Zach Fox
d7a9354b37 More CR comments; rename function 2017-06-15 13:25:16 -07:00
Zach Fox
70569021a8 Merge pull request #10697 from zfox23/spectatorCamera_HMDOnly 
Make the Spectator button only appear in HMD (also add a debug mode for devs)
 2017-06-15 13:20:56 -07:00
Andrew Meadows
5e0be1a823 Merge pull request #10662 from ctrlaltdavid/21394 
Smoothly ease hands from uncontrolled to controlled positions
 2017-06-15 13:17:26 -07:00
Zach Fox
1088d248e3 Howard's CR comments 2017-06-15 13:13:58 -07:00
Zach Fox
834a2a5c3b Ensure monitor never shows frozen SpectatorCamera preview 2017-06-15 12:49:09 -07:00
Zach Pomerantz
3093a73ce1 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-15 15:04:06 -04:00
Zach Fox
47e5fb56d3 Show MyAvatar's head in the SpectatorCamera view! 2017-06-15 11:31:20 -07:00
Brad Hefta-Gaub
0597c3105f Merge pull request #10705 from ZappoMan/moreAudioFixes 
fix no audio device from previously removed audio device
 2017-06-15 11:04:14 -07:00
Zach Fox
68662bb209 Bugfixes 2017-06-15 10:20:17 -07:00