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

49797 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
368f48f0a7 Merge pull request #9247 from huffman/feat/tutorial-touch-grip 
Add support for new Touch grip mappings to tutorial
 2017-01-04 17:58:05 -08:00
Clément Brisset
e34ecac843 Merge pull request #9299 from Atlante45/settings 
Fix settings hitch
 2017-01-04 17:19:44 -08:00
howard-stearns
9709bedca7 checkpoint 2017-01-04 16:55:58 -08:00
Seth Alves
a585d43a5e attempt to get laser-based web scrolling to work, again 2017-01-04 16:51:47 -08:00
Zach Fox
0c77ff2556 Fix silly quotation bug 2017-01-04 16:28:23 -08:00
Zach Fox
083bf95917 Fix PAL scrollbar; add helper popup to ADMIN tab 2017-01-04 16:25:13 -08:00
Brad Hefta-Gaub
f9ca41e89c Merge pull request #9302 from jherico/expose_dropped_count 
Expose dropped frames count to stats UI
 2017-01-04 16:12:35 -08:00
Howard Stearns
90cc9c565a Merge pull request #9298 from howard-stearns/pal-show-lastEditedBy 
selecting user in pal shows entities lastEditedBy user this session
 2017-01-04 16:10:55 -08:00
howard-stearns
97780ac97e color, infront 2017-01-04 16:09:15 -08:00
Seth Alves
fb4263de93 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-04 16:01:06 -08:00
howard-stearns
d78b7d9a28 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy 2017-01-04 15:48:45 -08:00
Ken Cooke
9a81a076e8 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-hdr-volume 2017-01-04 15:40:12 -08:00
Ken Cooke
afacb59999 Use logarithmic quantization of injector "volume" over the wire. 
Allow gains > 1.0 (up to +30dB)
Better quantization at low levels (uniform steps in dB)
 2017-01-04 15:38:26 -08:00
Seth Alves
ed934c37ae put code that allows lasers vs web entities or overlays back in 2017-01-04 15:23:55 -08:00
Zach Fox
9a44cf1720 Merge pull request #9304 from zfox23/ClearPersonalMute 
Also clear personalMutedList upon reset()
 2017-01-04 15:07:28 -08:00
Zach Fox
e80ae92327 Also clear personalmutedlist upon reset() 2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
675159be45 Last commit to fix final bugs 2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4 Bugfix re: population; remove user image for now 2017-01-04 14:06:51 -08:00
Zach Fox
03fbfc85f9 Short delay before populating PAL when changing domains 2017-01-04 13:50:37 -08:00
Zach Fox
c695878025 Clear local ignored list upon domain change 2017-01-04 13:31:16 -08:00
Brad Davis
3f2fdd1915 Expose dropped frames count to stats UI 2017-01-04 13:20:58 -08:00
Faye Li Si Fi
934b56bd50 replace redundant toggle logic 2017-01-04 12:41:49 -08:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Faye Li Si Fi
475430c1e0 testing new active state with mute.js 2017-01-04 12:25:27 -08:00
Faye Li Si Fi
32bc73dad3 added activeText and activeIcon properties in QML 2017-01-04 12:20:41 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Seth Alves
d85ecc2b79 Merge pull request #9297 from druiz17/homeBug 
home button fix and tablet updates
 2017-01-04 11:34:55 -08:00
Dante Ruiz
8327df55e4 removed commented out code 2017-01-04 19:21:03 +00:00
howard-stearns
c79c489002 selecting user in pal shows entities lastEditedBy user this session 2017-01-04 11:19:32 -08:00
Dante Ruiz
4dd8a8aa0d added new model 2017-01-04 11:09:27 -08:00
Dante Ruiz
3f34cb863e removed whitespace 2017-01-04 11:09:26 -08:00
Dante Ruiz
f81402fb0f improved tablet position 2017-01-04 11:09:26 -08:00
Dante Ruiz
a30ad2709b Home button fix 2017-01-04 11:09:26 -08:00
Seth Alves
0c2d08db4a Merge pull request #9295 from hyperlogic/tablet-ui 
Make eventBridge work for web pages on tablet.
 2017-01-04 11:00:29 -08:00
Ryan Huffman
afdd1f3de1 Merge pull request #9286 from ZappoMan/improveScriptRPC 
Improve performance of Entities.callEntityMethod()
 2017-01-04 08:16:09 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4 Merge pull request #9294 from fayeli/tablet-mic-level 
Audio level calculation in tabletUI.js
 2017-01-03 16:12:04 -08:00
Anthony J. Thibault
94c6cc8e6a Added test script demonstrating event bridge on the tablet 2017-01-03 15:44:02 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Anthony J. Thibault
3c2f9acd39 Hooked up EventBridge to TabletScriptingInterface. 2017-01-03 15:43:21 -08:00
Brad Hefta-Gaub
94fcecb0ec Merge branch 'master' of https://github.com/highfidelity/hifi into improveScriptRPC 2017-01-03 14:42:37 -08:00
Faye Li
fc186a281f update audio bar only when tablet is shown 2017-01-03 14:37:25 -08:00
Brad Hefta-Gaub
fcd6c0a878 Merge pull request #9269 from zzmp/graphics/fetch-cull-sort 
Factor out render item fetch/sort/cull
 2017-01-03 13:57:54 -08:00
Faye Li
752051834d function style casting 2017-01-03 13:30:19 -08:00
Faye Li
4391e9eaee send the mic level from js 2017-01-03 12:57:08 -08:00
Faye Li
d8227a686c fill in updateAudioBar function, invokes qml function 2017-01-03 12:51:26 -08:00
Faye Li
68aacfe544 added "updateAudioBar" function signature in header file 2017-01-03 12:38:23 -08:00
Brad Hefta-Gaub
3c7fa41be9 update test script 2017-01-03 11:29:52 -08:00