Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 16:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56573 commits 76 branches 59 tags 1.2 GiB
Commit graph

23335 commits

Author SHA1 Message Date
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1 Merge pull request #10676 from NeetBhagat/21369 
WL 21369 - Implement parts of the JS "console" object
 2017-06-20 11:06:34 -07:00
samcake
3727b2af7e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-20 10:53:25 -07:00
Seth Alves
428dc81083 Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race 
ignore remote update younger than recent ownership bid
 2017-06-20 10:42:54 -07:00
Sam Cake
5b6f6ab84f Trying to fix the getCOnfig from QML... 2017-06-20 00:25:51 -07:00
Thijs Wenker
07fefdcb2f Merge pull request #10748 from samcake/brown 
Fix the local lights issue
 2017-06-20 05:17:18 +02:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -07:00
Zach Pomerantz
497ee3a522 add Audio.inputLevel 2017-06-19 17:07:43 -07:00
Stephen Birarda
cf9a97cf10 use length sent by AssetServer to verify asset size 2017-06-19 15:15:45 -07:00
Howard Stearns
ddce665613 Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 
Spectator Camera - Mergeable Rendering Components
 2017-06-19 14:55:43 -07:00
Brad Davis
8aeeab30e7 Merge pull request #10689 from Atlante45/fix/ktx 
Fix KTX performance problems
 2017-06-19 14:44:52 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Atlante45
c4c6142935 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx 2017-06-19 11:06:51 -07:00
Atlante45
8d45c4da7c Fix comments 2017-06-19 11:02:31 -07:00
Stephen Birarda
2933a20a0c some cleanup for audio/avatar replicated packet checking 2017-06-19 10:45:33 -07:00
Zach Fox
08eb07242d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-19 10:31:31 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Clément Brisset
3262e10d76 Merge pull request #10727 from jherico/file_cache_locking 
Prevent deadlocks from different locking orders in FileCache
 2017-06-17 15:13:47 -07:00
Brad Davis
1632e3b35a PR feedback 2017-06-16 20:04:23 -07:00
Atlante45
d090ac4396 CR 2017-06-16 17:04:57 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Andrew Meadows
b105ad8338 measure linear velocity of tractor position 2017-06-16 16:55:00 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Brad Davis
a675dfe7d2 Prevent deadlocks from different locking orders in FileCache 2017-06-16 15:30:50 -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
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
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
416ebaa2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 10:08:10 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Stephen Birarda
c332244f4f fix race for isUpstream and node hole punch 2017-06-15 17:34:20 -07:00
Stephen Birarda
e6ef153148 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants 2017-06-15 15:43:13 -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
Stephen Birarda
8f154321a4 never process null avatar ID in avatar manager 2017-06-15 14:25:10 -07:00
Stephen Birarda
6cf4ff1daf remove debug and fix peek of session ID 2017-06-15 13:44:44 -07:00
Zach Fox
d7a9354b37 More CR comments; rename function 2017-06-15 13:25:16 -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
Zach Fox
60549075dd Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-15 10:09:07 -07:00
ZappoMan
d352163d77 fix no audio device from previously removed audio device 2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
NeetBhagat
a6b1b17d45 Merge branch 'master' into 21369 2017-06-15 11:04:22 +05:30
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
Stephen Birarda
10649c8f6e change new Node flag to isForcedNeverSilent 2017-06-14 17:20:37 -07:00
Stephen Birarda
224a559602 keep downstream nodes around in domain, alive in upstream 2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Clément Brisset
72bf879eb2 Merge pull request #10677 from birarda/feat/avatar-mixer-downstream 
add replication to avatar mixers, fixes for audio
 2017-06-14 16:44:56 -07:00
Andrew Meadows
8d19395b0a ignore remote update younger than recent bid 2017-06-14 16:04:52 -07:00
Atlante45
3f1dfc346d Merge branch 'fix/node-leak' of github.com:Atlante45/hifi into feat/replicants 2017-06-14 15:12:13 -07:00
Stephen Birarda
ca196f6141 Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream 2017-06-14 15:03:26 -07:00
Clément Brisset
44117ac001 Merge pull request #10694 from highfidelity/master 
Update replicants branch with master
 2017-06-14 15:01:22 -07:00
Stephen Birarda
bfa5df778d remove avatar entity data debug 2017-06-14 14:59:49 -07:00
Stephen Birarda
e3c3831efa only output sequence number information if debug is requested 2017-06-14 14:56:15 -07:00
Stephen Birarda
5b45beaa39 cleanup some debug from identity packet changes 2017-06-14 14:51:28 -07:00
Stephen Birarda
f2a61fa59d change incoming/outgoing seq num handling 2017-06-14 14:41:25 -07:00
Zach Fox
f214712b33 Merge pull request #10678 from zfox23/spectatorCamera_improvements1 
Secondary camera and rendering improvements
 2017-06-14 14:39:38 -07:00
Stephen Birarda
ddb6db9f6a fix repeated pushing of avatar identity seq nums 2017-06-14 14:31:22 -07:00
Stephen Birarda
50b56ec761 don't unpack avatar identity that is old 2017-06-14 14:02:22 -07:00
Zach Fox
6b6b6026a4 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-14 13:44:13 -07:00
howard-stearns
2deb26551f typos in comments/help-strings 2017-06-14 11:56:47 -07:00
Atlante45
5777b5e805 Create one packet per node 2017-06-14 11:42:25 -07:00
Atlante45
3cc2396021 CR 2017-06-14 11:42:25 -07:00
Atlante45
a15660993d Fix comment 2017-06-14 11:42:25 -07:00
Atlante45
61eb93af35 Fix SharedNodePointer leak 2017-06-14 11:42:25 -07:00
Stephen Birarda
c132e29b06 remove conditional seek from InboundAudioStream 2017-06-14 11:42:19 -07:00
Stephen Birarda
57cd819307 Merge pull request #10690 from Atlante45/fix/node-leak 
Fix for Jurisdiction listener
 2017-06-14 11:15:17 -07:00
Atlante45
7b62e8854c Create one packet per node 2017-06-14 10:53:36 -07:00
Zach Fox
ec3b488897 Remove SECONDARY_CAMERA_RENDER_MODE for now 2017-06-14 10:27:08 -07:00
Stephen Birarda
29842c67cc use received message faking for cleaner replication in audio 2017-06-13 18:04:59 -07:00
Stephen Birarda
9085a0896a manually activate sockets for downstream servers 2017-06-13 17:19:58 -07:00
Stephen Birarda
76f1a7445e handle replicated bulk avatar data packets 2017-06-13 17:19:57 -07:00
Ryan Huffman
da3cd59a96 Fix avatar mixer not setting last broadcast time for downstream nodes 2017-06-13 17:19:57 -07:00
Ryan Huffman
52150ad971 Add node data to downstream avatar mixers 2017-06-13 17:19:57 -07:00
Stephen Birarda
dc94f83591 build out bulk avatar data replication 2017-06-13 17:19:57 -07:00
Stephen Birarda
8ce6590f0b remove ReplicatedAvatarData and immediate replication of identity 2017-06-13 17:19:57 -07:00
Stephen Birarda
44a63ca27e handle node killed and remove double IDs in kill packets 2017-06-13 17:19:57 -07:00
Atlante45
d0e8612a65 First pass at AvatarMixer replication 2017-06-13 17:19:57 -07:00
Zach Fox
bae27ec209 Merge pull request #10680 from zfox23/ZachRenderingImprovements1 
Small rendering improvements based on spectator-camera changes
 2017-06-13 17:18:43 -07:00
Ryan Huffman
ea56c568a7 Add support for replicating by username 2017-06-13 17:18:28 -07:00
howard-stearns
6271b8ee7c avatar whitelist 2017-06-13 16:56:18 -07:00
David Rowe
570ec8457d Refactor 2017-06-14 10:45:30 +12:00
Zach Fox
79b6dc3f78 Remove one more instance of FramebufferCache 2017-06-13 15:26:07 -07:00