Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-28 00:19:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51176 commits 25 branches 0 tags 1.1 GiB
Commit graph

51176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Menithal
c3021ae60d Fixing Menu Items for Parenting / Unparenting 2017-02-15 22:21:29 +02:00
Menithal
ded365ca22 Merge remote-tracking branch 'origin' into parent-hotkey 2017-02-15 19:53:07 +02:00
Menithal
655c49d9c0 edit.js: started to work on Parenting via hotkey 2017-02-15 19:50:15 +02:00
Menithal
7b02d1073a Added a generic Window Notification for Feedback 
This allows to use the existing Pop-up notifications for generic
notification messages
 2017-02-15 19:49:31 +02:00
Menithal
6302ae6bd5 Changed AudioScope Hotkeys, Allowing User Hotkeys 
AudioScope Open Hotkey changed from Ctrl + P to Ctrl + Alt + P and
Audioscope Pause Hotkey changed from Ctrl + Shift + P to Ctrl + Shift +
Alt + P
 2017-02-15 19:48:29 +02:00
Chris Collins
d1a236954b Merge pull request #9673 from zzmp/audio/threaded-decode 
Parallelize audio packet decoding in mixer
 2017-02-15 09:44:42 -08:00
Brad Hefta-Gaub
0cdcee33d8 Merge pull request #9677 from kunalgosar/logFilter 
Revamped Search Feature on Log Window
 2017-02-15 08:56:16 -08:00
Philip Rosedale
01bdac49d0 Merge pull request #9672 from ctrlaltdavid/21121 
Fix far grabbing making entity jump upon grab
 2017-02-14 17:02:42 -08:00
kunalgosar
4579ac4998 Changed button margin 2017-02-14 16:43:55 -08:00
kunalgosar
91a73b2689 Button styling 2017-02-14 16:13:40 -08:00
kunalgosar
5e5d76ead7 Implemented toggle prev search button 2017-02-14 16:13:40 -08:00
kunalgosar
2dd2018d7d change next button style properties 2017-02-14 16:13:40 -08:00
kunalgosar
c01d0b309e Toggle next for search on Log 2017-02-14 16:13:40 -08:00
Howard Stearns
3e52091dee Merge pull request #9676 from birarda/bug/remove-domain-open-hours 
fix empty descriptors map bug in DS
 2017-02-14 16:02:54 -08:00
Stephen Birarda
27412080dd return an empty descriptors map when empty 2017-02-14 15:39:59 -08:00
Zach Pomerantz
09cc4bf48d time events with packets 2017-02-14 21:48:36 +00:00
Seth Alves
d0dc642cd8 Merge pull request #9651 from ctrlaltdavid/21164 
Make it Easier to Change Audio Settings in the Tablet UI
 2017-02-14 13:45:59 -08:00
Zach Pomerantz
41a4ec4200 mv codec init to ctor from negotiateCodecs 2017-02-14 21:26:35 +00:00
Zach Pomerantz
06c8fba35d mv Node out of packet queue 2017-02-14 21:10:30 +00:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Zach Pomerantz
a7386392a1 fix codec parsing 2017-02-14 20:46:27 +00:00
Zach Pomerantz
6f2eb27572 rm debug in Deck.cpp 2017-02-14 20:46:27 +00:00
Zach Pomerantz
b102c2d1d0 generalize audio thread pool to processPackets 2017-02-14 20:46:27 +00:00
Zach Pomerantz
7d8a947e6d add node-isolated packet parsing to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
da5a89f582 move codec negotiation to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
481cd0ca6a move audio packets to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
2f457ae891 add packet queue to AudioMixerClientData 2017-02-14 20:46:27 +00:00
Chris Collins
442e8d68ef Merge pull request #9650 from kunalgosar/browserFix 
Added isAway (paused) property to myAvatar
 2017-02-14 11:16:07 -08:00
Seth Alves
e323971062 Merge pull request #9671 from druiz17/general 
Moved general preference settings to the tablet
 2017-02-14 10:11:33 -08:00
Brad Hefta-Gaub
f433347362 Merge pull request #9652 from sethalves/avatar-as-child-fixes 
some fixes for when an avatar is a child of something else
 2017-02-14 09:07:47 -08:00
Dante Ruiz
968ba1e03d updated file headers 2017-02-14 16:08:25 +00:00
Dante Ruiz
aa164bbf8f diff minimize 2017-02-14 15:55:32 +00:00
Dante Ruiz
9d5f392be3 removed more qml log errors 2017-02-14 07:46:34 -08:00
Dante Ruiz
773ade5b61 removing qml errors 2017-02-14 07:46:34 -08:00
Dante Ruiz
8fbcead6d1 removed/renamed some files 2017-02-14 07:46:33 -08:00
Dante Ruiz
948352cdb6 general preferences work on tablet 2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Dante Ruiz
61912b6ff0 saving work 2017-02-14 07:46:31 -08:00
Seth Alves
4393bc3c2e Merge pull request #9656 from humbletim/21114-part1 
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
 2017-02-14 06:49:05 -08:00
Seth Alves
ba025d44e0 Merge pull request #9642 from AndrewMeadows/beware-humbletim 
fix performance problem for invalid "avatarEntityData"
 2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0 Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-14 06:26:20 -08:00
Seth Alves
2e245e9cba Merge pull request #9667 from huffman/fix/entity-scripts-not-loading 
Fix entity scripts not loading in certain cases
 2017-02-14 06:20:29 -08:00
Ken Cooke
bf077e6fdb Merge pull request #9623 from zzmp/audio/should-ignore 
Optimize ignore zone checks for audio mixer
 2017-02-14 06:18:54 -08:00
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect 
Removed ColorOverlay from TabletButton, added more icon & text states
 2017-02-14 06:16:59 -08:00
David Rowe
2672b8d10a Fix tabs 2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b Fix far grabbing making entity jump upon grab 2017-02-14 17:30:20 +13:00
Anthony Thibault
ab09cc4339 Merge pull request #9658 from Atlante45/feat/capture-entity-clicks 
Add entity clicks capture capabilities
 2017-02-13 19:05:29 -08:00
Brad Hefta-Gaub
0dcf6ebd76 Merge pull request #9664 from howard-stearns/lastEditedBy-without-physics 
lastEditedBy is set by add/edit, but not by physics packets
 2017-02-13 17:17:50 -08:00
howard-stearns
487adc7f18 whitespace 2017-02-13 16:35:03 -08:00