Matti Lahtinen
b1639ee3aa
Removed a Stray Print json that would spam logs.
2017-02-27 23:40:06 +02:00
Menithal
d9f86612de
Fixed view toggle, Added new Notifications
...
- View Toggle now only toggles if no other modifiers are pressed
- More notification, and cases for notification
- Parenting to existing parent
- Unparenting when there is no parent
- Unparenting single entities
2017-02-19 20:18:11 +02:00
Menithal
2a4b493de5
Changed order on Menu
2017-02-19 18:24:56 +02:00
Menithal
f3c806e910
Revert of hotkey detection, removed menu hotkeys
...
- Holding hotkeys will no longer spam parent events rapidly, detects only
the release
2017-02-18 18:33:00 +02:00
Menithal
0df6305f90
Revert removal of hotkey from js event
2017-02-18 18:22:01 +02:00
Menithal
dcbe3c622d
Added Hotkey Listening to the webview
...
Ctrl + P and Ctrl + Shift + P are now available even if the edit window
has been selected
2017-02-18 11:51:19 +02:00
Menithal
f5d266a562
Updated
2017-02-17 23:28:28 +02:00
Menithal
f211f015d7
Merge branch 'master' into parent-hotkey
2017-02-17 19:22:28 +02:00
Howard Stearns
5bef6ea029
Merge pull request #9687 from davidkelly/dk/3177
...
Ban only by machine fingerprint, when possible
2017-02-16 18:50:38 -08:00
Howard Stearns
7afd13d2cb
Merge pull request #9693 from howard-stearns/fix-requestsDomainListData
...
fix rquestsDomainListData
2017-02-16 17:06:29 -08:00
Stephen Birarda
24591ee82b
Merge pull request #9691 from zzmp/fix/audio-packet-queue
...
Fix audio packet queue behavior
2017-02-16 16:45:51 -08:00
howard-stearns
04712e3744
fix rquestsDomainListData
2017-02-16 16:43:16 -08:00
Zach Pomerantz
07e97a0cab
unqueue from front for audio packets
2017-02-16 21:40:53 +00:00
David Kelly
821c01eeca
Merge pull request #9689 from howard-stearns/pal-mini-code-cleanup
...
cleaner living for pal
2017-02-16 13:51:26 -07:00
howard-stearns
6e3ae1fe4f
cleanup some accumulated cruft in pal code
2017-02-16 10:53:02 -08:00
David Kelly
a8831e89ff
Ban only by machine fingerprint, when possible
2017-02-16 09:50:56 -07:00
Menithal
afbf4bc30f
Fixed Parenting/Unparenting Menu Removal and Binding
2017-02-16 10:52:42 +02:00
Menithal
7a5665ff4f
Hotkey change to make AudioScope similar to earlier
2017-02-16 10:09:19 +02:00
Menithal
d96f95a7e9
Updated edit.js and selection tool
...
Last selected entity will now be yellow instead of orange
2017-02-16 10:05:59 +02:00
Menithal
ff2c344eaa
Migrated Audioscope Hotkeys to use F2 instead of P
...
Apparently ctrl + shift + P which was planned to be used in the client
for unparenting entities did not work out, as the command went out of
the main view.
Migrating to ctrl + F2 and ctrl + alt + F2
2017-02-16 10:05:01 +02:00
Menithal
7afe0d7fc0
Merge remote-tracking branch 'origin' into parent-hotkey
2017-02-16 08:43:59 +02:00
Stephen Birarda
a3c123818d
Merge pull request #9661 from Atlante45/fix/possible-race
...
Fix possible race condition
2017-02-15 18:38:01 -08:00
Howard Stearns
34a4770ffa
Merge pull request #9669 from davidkelly/dk/2656
...
inform gatekeeper immediately when kicking someone
2017-02-15 15:13:10 -08:00
Zach Pomerantz
a976d191ad
Merge pull request #9679 from zzmp/fix/audio-assert-ignore-memoization
...
Loosen audio memoization precondition
2017-02-15 17:50:33 -05:00
Menithal
856cdcbd28
Merge remote-tracking branch 'origin' into parent-hotkey
2017-02-16 00:38:01 +02:00
David Kelly
5ec3bbde52
Merge pull request #9648 from davidkelly/dk/zoneFilters2
...
Zone Filters
2017-02-15 13:36:11 -07:00
Menithal
c3021ae60d
Fixing Menu Items for Parenting / Unparenting
2017-02-15 22:21:29 +02:00
David Kelly
f0e87360c1
don't capture a temporary by reference. Ugh
2017-02-15 12:37:00 -07:00
Clément Brisset
eba6a8f028
Merge pull request #9674 from Atlante45/fix/mac-macro
...
Fix SSE2 macros for Macs
2017-02-15 11:29:55 -08:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Zach Pomerantz
2e9217fb47
loosen audio memoization precondition
2017-02-15 13:36:03 -05:00
Zach Pomerantz
ed4f96eadd
Merge pull request #9646 from zzmp/load/audio/packets-in
...
log full i/o stats
2017-02-15 13:32:48 -05:00
Faye Li
2388ec65fe
Merge pull request #9659 from fayeli/users-fix
...
Tablet Users Fixes
2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0
simpler filter code
2017-02-15 10:23:36 -08:00
Faye Li
5ece3f1e1a
use new users icon
2017-02-15 10:16:20 -08: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
David Kelly
e6969321ca
fix for not properly filtering entity adds
2017-02-15 09:15:35 -07: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
