Bradley Austin Davis
960017ddd7
Fix static plugin initialization on Linux
2017-06-24 22:22:47 -07:00
samcake
77650ac1b3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 20:10:35 -07:00
humbletim
c10475186c
add support for switching cursor from arrow to reticle
2017-06-23 18:48:29 -04:00
Seth Alves
43ba5f3772
Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward
...
Fix for eye direction when no look at targets are present.
2017-06-23 14:32:21 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
humbletim
f6262ad54d
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-06-23 16:37:10 -04:00
samcake
17e2140826
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 13:28:58 -07:00
Brad Davis
f1fe4ed7cc
Merge pull request #10804 from jherico/fix_deps_3
...
Remove dependency between codec plugins and UI
2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
Brad Davis
fe7d4b1d23
Remove dependency between codec plugins and UI
2017-06-23 12:25:18 -07:00
David Kelly
bda50af780
this uses qt's test location for AppData/Local, but leaves Roaming alone
2017-06-23 11:06:48 -07:00
Anthony J. Thibault
8f89ef0931
Fix for eye direction when no look at targets are present.
2017-06-23 10:52:23 -07:00
Brad Davis
416852c0cd
Fix warnings about creating QObjects with parents in different thread
2017-06-23 10:19:16 -07:00
David Kelly
04160f2ca1
switch to change ktx_cache directory (only)
2017-06-23 09:19:41 -07:00
humbletim
35f27313ba
persist command history to data folder; fix warning message color
2017-06-23 12:05:44 -04:00
David Kelly
63279f4525
Merge pull request #10790 from davidkelly/dk/scriptsSwitch
...
Command line switch to override default scripts location
2017-06-23 08:53:40 -07:00
druiz17
91ce9235ea
Merge pull request #10747 from zzmp/audio/select-log
...
Log audio selections
2017-06-23 07:54:03 -07:00
Zach Pomerantz
a82cc0ec09
retab
2017-06-23 09:35:48 -04:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
David Rowe
b26f5c5811
Clear finger joints when finger poses no longer being updated
2017-06-23 16:15:40 +12:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
David Rowe
8682cee17a
Refactoring
2017-06-23 11:33:29 +12:00
David Kelly
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Andrew Meadows
62e862fef0
Merge pull request #10733 from Menithal/21384
...
21384: Added Support to Disabling flight from client side
2017-06-22 13:38:01 -07:00
Anthony J. Thibault
79d9bbe6c5
Merge branch 'master' into feature/pole-vector
2017-06-22 13:37:55 -07:00
samcake
96a10d2e95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-22 09:32:49 -07:00
David Kelly
34edd95926
Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch
...
new switches to override avatarURL
2017-06-22 07:11:29 -07:00
David Kelly
5da01f0074
updated comments
2017-06-22 07:09:24 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
David Rowe
c54a5d8506
Tidying
2017-06-22 23:32:16 +12:00
David Rowe
3bdf267900
Implement fingers control
2017-06-22 23:32:06 +12:00
samcake
9ae2861ee6
Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements
2017-06-21 18:29:38 -07:00
Seth Alves
c70365d04a
Merge pull request #10729 from druiz17/hand-pucks
...
Hand pucks and Calibration UI
2017-06-21 18:10:15 -07:00
samcake
2919607f86
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 17:20:44 -07:00
Howard Stearns
ea5b074f6e
Merge pull request #10758 from howard-stearns/event-installer-interface-options
...
Event installer interface options
2017-06-21 16:46:06 -07:00
David Kelly
92cbb86e8b
remove debugging
2017-06-21 16:09:08 -07:00
David Kelly
94a33fea94
new switches to override avatarURL
2017-06-21 16:03:05 -07:00
Anthony J. Thibault
2dcca2125b
Merge branch 'master' into feature/pole-vector
2017-06-21 15:50:03 -07:00
Chris Collins
f3ae1d8078
Merge pull request #10750 from Atlante45/master
...
Stable -> Master
2017-06-21 13:34:28 -07:00
samcake
56d5f4ec5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 11:25:07 -07:00
Anthony Thibault
a12109ed26
Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes
...
Bug Fixes for Eyeless Avatars
2017-06-21 10:59:55 -07:00
David Kelly
f30b12fca6
still doesn't work, pushing just to save it
2017-06-21 10:28:18 -07:00
Brad Hefta-Gaub
f7d42c782d
Merge pull request #10764 from thoys/feat/ac-location-jsapi
...
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Thijs Wenker
47643e1efe
Expose location API to Agent scripts (side-effect, agents now can teleport)
2017-06-21 06:31:36 +02:00
Howard Stearns
fea8a95fc7
Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version.
2017-06-20 18:09:27 -07:00
Howard Stearns
ac1d4d9636
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 17:57:12 -07:00
Dante Ruiz
5e82b13d65
removed double include
2017-06-21 01:15:17 +01:00
Dante Ruiz
b7286db523
fixed merge conflict
2017-06-21 01:10:54 +01:00
Dante Ruiz
2c3db0fb91
finished calibration-ui
2017-06-21 01:07:12 +01:00
Atlante45
6bd1946e96
Merge branch 'stable' of https://github.com/highfidelity/hifi
2017-06-20 16:36:57 -07:00
Zach Pomerantz
8e1cf763e3
Merge pull request #10756 from zzmp/audio/input-level
...
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391
Merge pull request #10744 from zzmp/audio/output-sample
...
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
David Kelly
06b59fe13e
still broken, but added initial cut of GLsync stuff
2017-06-20 15:02:05 -07:00
howard-stearns
41003bd307
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 13:25:38 -07:00
howard-stearns
480ff784b9
add a skipTutorial option, that does not change settings
2017-06-20 13:25:03 -07:00
Zach Pomerantz
f55d842fac
add SoundCache to tablet for PlaySampleSound
2017-06-20 12:16:08 -07:00
Matti Lahtinen
256484cd21
Removed Whitespace
2017-06-20 21:44:32 +03:00
Zach Pomerantz
8436d0cc6b
rm unused AvatarInputs props
2017-06-20 11:43:02 -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
Anthony J. Thibault
29e3af820b
Fix for avatars with no eyes.
...
The calculation of the centerEyeCalibration matrix (and several others) were incorrect.
2017-06-20 10:14:34 -07:00
howard-stearns
d71666f337
Remove useless command line arg for steam, but add one for version.
2017-06-20 09:59:15 -07:00
howard-stearns
974768390c
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 09:47:52 -07:00
Anthony J. Thibault
21c0e45d87
recenter rotation while driving.
...
This should reduce foot sliding in HMD mode.
2017-06-20 09:43:38 -07:00
Dante Ruiz
13dff29bd5
adding calibration screen
2017-06-20 01:19:10 +01:00
Zach Pomerantz
497ee3a522
add Audio.inputLevel
2017-06-19 17:07:43 -07:00
Zach Pomerantz
4bff925506
rm unused bools
2017-06-19 17:01:39 -07:00
Anthony J. Thibault
c236afe68c
Simplify passing data from MySkeletonModel to Rig
2017-06-19 16:54:39 -07:00
Zach Pomerantz
3d80774317
clean up select_audio_device
2017-06-19 15:57:24 -07:00
samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -07:00
Zach Pomerantz
837f37220a
log selected_audio_device
2017-06-19 15:11:02 -07:00
Zach Pomerantz
5f236bd025
simplify device settings
2017-06-19 15:11:02 -07:00
Zach Pomerantz
5c0e9e7496
improve wording for MyAvatar.qmlPosition doc
2017-06-19 14:52:32 -07:00
David Kelly
b4c75c3f87
working, except tablet issue
2017-06-19 14:41:42 -07:00
Zach Pomerantz
a7e1b75909
stopgap with MyAvatar.qmlPosition
2017-06-19 14:41:01 -07:00
howard-stearns
91656a5fe5
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-19 14:22:12 -07:00
Zach Fox
2e215e6544
Fix build problems
2017-06-19 14:04:51 -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
howard-stearns
c6d66d439b
report and quit command line switches
2017-06-19 12:57:26 -07:00
Matti Lahtinen
82df64d5e7
flyingAllowed to zoneAllowsFlying
2017-06-19 21:44:43 +03:00
Olivier Prat
0211338657
Put back test if not physics enabled in entity items should fade function as it gives too many undesired refades
2017-06-19 20:38:47 +02:00
Seth Alves
39fb94d76d
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-19 11:21:08 -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
samcake
ebc4745df0
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 09:27:35 -07:00
Olivier Prat
21276a85ad
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-19 18:20:03 +02:00
Olivier Prat
b6b1875dd3
Disabled check on enabled physics when deciding is fade is adequate
2017-06-19 18:19:54 +02:00
humbletim
26f651ae7c
Merge remote-tracking branch 'upstream/master' into HEAD
2017-06-19 10:01:37 -04:00
Vladyslav Stelmakhovskyi
59a77c16bd
Cleanup
2017-06-18 20:59:22 +02:00
Matti Lahtinen
600a39c9b2
Fixed Zone overriding Client.
2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi
f34faa3ee7
Fix backward compatibility with Qt 5.6
2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f
Forgot if statement
2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca
Merge branch 'master' into fix_tablet_buttons_qt59
2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c
Send mouse events before touch event. It seems the order is important for Qt 5.9
2017-06-17 22:24:27 +02:00
David Kelly
c7e4649ec2
add override to avoid warnings in ubuntu/mac
2017-06-17 13:15:22 -07:00
Brad Davis
a69cf31f4b
PR feedback and cmake fixes
2017-06-16 16:59:58 -07:00
Dante Ruiz
da29157a3c
fixed merge conflict'
2017-06-17 00:40:50 +01:00
David Kelly
6dd1e6e069
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-16 16:24:30 -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
humbletim
fc33e95e2d
Merge branch 'master' into 21180-C++
2017-06-16 16:16:42 -04:00
Zach Fox
416ebaa2e8
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-16 10:08:10 -07:00
David Kelly
9b5b99c2b9
not as buggy. Still need ogl work, major cleanup, etc...
2017-06-16 08:59:57 -07:00
David Kelly
6d64261e94
working but often the spectator camera texture is not right.
2017-06-16 08:40:18 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Burt Sloane
4f7a1a6e2e
got rid of tabs
2017-06-15 16:35:53 -07:00
Burt Sloane
7d92ef9f25
more PR fixes
2017-06-15 16:12:16 -07:00
Burt Sloane
a73281b827
fix PR issues
2017-06-15 16:10:08 -07:00
David Kelly
f75cbfa087
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-15 15:45:03 -07:00
Burt Sloane
7022c4009f
midi in and out
2017-06-15 15:18:06 -07:00
David Kelly
3d922f5db6
works, sorta, but blinks like crazy, cursor gets f-ed up...
2017-06-15 14:17:43 -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
druiz17
347f020b04
Merge pull request #10692 from jherico/fix_tablet_crash
...
Fix crash on exit when tablet is open
2017-06-15 08:15:02 -07: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
samcake
d8380923f0
Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages
2017-06-14 18:06:42 -07:00
David Kelly
54dfc33b38
initial skeleton of qml objects
2017-06-14 14:36:37 -07:00
David Rowe
16bebdd409
Rename identifiers
2017-06-15 09:20:55 +12:00
David Rowe
55e0082792
Code review
2017-06-15 09:10:08 +12:00
Brad Davis
7a6df850c5
Fix crash on exit when tablet is open
2017-06-14 13:22:53 -07:00
Menithal
112f186304
Added minor Comments
2017-06-14 22:24:18 +03:00
Zach Fox
8a217acd2b
Defaults for camera projection parameters
2017-06-14 12:19:38 -07:00
Zach Fox
03c61e2191
vFoV and clipping plane distances now come from config
2017-06-14 11:53:05 -07:00
Zach Fox
ec3b488897
Remove SECONDARY_CAMERA_RENDER_MODE for now
2017-06-14 10:27:08 -07:00
Menithal
a1c2f71f30
Added couple of state getters
...
This allow scripts to check if avatar is flying or if the avatar is in
air (but not flying). Both of these allows one to distinguish if the
avatar is flying or falling or just jumping with Velocity
2017-06-14 20:19:04 +03:00
Menithal
66d43b80e2
Added getters for State if in Air or Flying
2017-06-14 19:53:08 +03:00
Menithal
c92e22fd20
21384: Added Menu Option
2017-06-14 19:05:00 +03:00
Menithal
53fe5736d8
21384: Initial Disable Flying
2017-06-14 18:24:45 +03:00
Zach Pomerantz
969582c23d
clean audio device names
2017-06-14 09:04:22 -04:00
Howard Stearns
87f3ce7699
reset avatar on domain change if the last domain imposed something on us
2017-06-13 19:30:01 -07:00
David Rowe
be2bcb1c13
Turn with head roll in HMD when walking or flying
2017-06-14 12:20:46 +12:00
David Rowe
05f19d54f4
Add HMD roll control JavaScript API
2017-06-14 11:55:04 +12:00
Zach Pomerantz
b24681125d
rm debugging
2017-06-13 18:16:16 -04:00
Zach Pomerantz
d4797dc9f8
update shift-x
2017-06-13 17:44:59 -04:00
Zach Pomerantz
a8f69bb2e0
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-13 17:41:52 -04:00
Zach Pomerantz
79563b7d83
fix header on AudioDevices.h
2017-06-13 14:55:20 -04:00
Zach Pomerantz
9b131ee4af
rm old AudioDevice interface
2017-06-13 14:55:10 -04:00
Zach Pomerantz
4a39798a97
sticky audio selection
2017-06-13 14:38:52 -04:00
Zach Fox
7b6033f7bc
Getting closer to a solution
2017-06-13 11:37:27 -07:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
Zach Fox
4acbb81413
Checkpoint
2017-06-13 10:22:48 -07:00
Zach Fox
ec162327a2
Merge branch 'spectator-camera' into flash
2017-06-13 10:22:02 -07:00
Zach Fox
7d1a7f4c0b
Merge branch 'master' of https://github.com/highfidelity/hifi into
...
spectator-camera - INCLUDING MERGE CONFLICT FIXES
2017-06-13 09:42:14 -07:00
Zach Pomerantz
89bd895054
mv showAudioTools to just AvatarInputs
2017-06-13 12:31:05 -04:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
NeetBhagat
b0e9c62c12
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-13 10:10:44 +05:30
Sam Cake
f973f7b5e3
Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend
2017-06-12 21:25:27 -07:00
Brad Davis
db8bdbc0a6
Merge pull request #10659 from samcake/orange
...
simple Render Engine refactors coming from the Spectator Cam project
2017-06-12 20:31:07 -07:00
Seth Alves
aeaddd23c7
Merge pull request #10658 from seefo/fb5087
...
Resolved FB5087
2017-06-12 17:25:05 -07:00
Zach Pomerantz
7d3bf75f0b
wip: sticky devices
2017-06-12 18:48:26 -04:00
Zach Pomerantz
b5dab39f83
sticky mic meter / noise reduction
2017-06-12 18:41:32 -04:00
Zach Pomerantz
8dac83d3fe
add reverb to qml Audio
2017-06-12 18:11:08 -04:00
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04:00
Dante Ruiz
e4e261287a
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
2017-06-12 22:01:57 +01:00
Andrew Meadows
321e307c9f
Merge pull request #10609 from 1P-Cusack/21317
...
WL21317 helper functions for getting into avatar coordinate space
2017-06-12 11:18:29 -07:00
seefo
cb5a114145
Fixed Ubuntu warning
2017-06-12 10:47:55 -07:00
Dante Ruiz
1b13cd6d45
saving work
2017-06-12 17:31:02 +01:00
Dante Ruiz
067fc9bb98
fixed merge conflict
2017-06-12 16:45:34 +01:00
NeetBhagat
e6a5930365
Merge branch 'master' into 21369
2017-06-12 11:17:26 +05:30
Chris Collins
4b6c13bc1f
Merge pull request #10646 from ZappoMan/debugAudioProblems
...
Fix for no-audio on clean install
2017-06-10 11:32:42 -10:00
samcake
bb38938534
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-09 14:34:25 -07:00
ZappoMan
6fe20f90a3
add better debugging for audio problems
...
use OS default device if settings have no values
2017-06-09 13:36:12 -07:00
seefo
0343d4e443
Resolved FB5087
2017-06-09 13:33:46 -07:00
Seth Alves
3f425a5f02
Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes
...
Fix head puck broken eyes
2017-06-09 12:50:53 -07:00
Zach Fox
fd50434d86
New camera model; Cleanup; Bashing head :against desk
2017-06-09 11:42:16 -07:00
Zach Fox
5114fd8e1f
Rename correctly?
2017-06-09 11:39:28 -07:00
Zach Fox
7aef4dab4c
Variable renaming pass
2017-06-09 11:39:28 -07:00
Zach Fox
a4f5d327a2
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-09 11:38:35 -07:00
Zach Fox
12e5fc20f7
Merge pull request #10653 from samcake/flash
...
Spectator-camera : Provide a way to render the side camera always mono
2017-06-09 11:34:37 -07:00
Seth Alves
5b62c9e83b
try again to get forward not-looking-at-anyone gaze to work right
2017-06-09 10:45:04 -07:00
seefo
dc02e34782
Resolved FB#5009
2017-06-09 10:23:53 -07:00
Seth Alves
197fb620d4
Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes
2017-06-09 09:28:07 -07:00
Chris Howe
08d93173f0
Minor code feedback changes, moving test scripts to developer/tests.
2017-06-09 11:07:56 -04:00
NeetBhagat
c5d8268007
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-09 18:04:34 +05:30
samcake
4c8eec4e16
Introducing a way to prevent a frame to render in stereo accross batches
2017-06-08 17:38:26 -07:00
Seth Alves
485df396ef
Merge pull request #10628 from jherico/qt59
...
Fixes for Qt 5.9 compatibility
2017-06-08 16:51:08 -07:00
Seth Alves
ce4c3e1601
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-08 13:55:30 -07:00
Seth Alves
3b47142592
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-08 10:28:38 -07:00
Olivier Prat
20d4fcbbc7
Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL
2017-06-08 09:24:12 +02:00
samcake
3664655512
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-07 17:43:50 -07:00
howard-stearns
9cf027a68c
pr feedback
2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-07 16:43:25 -07:00
howard-stearns
51982b1294
display textures in plugins
2017-06-07 14:39:18 -07:00
Seth Alves
69520ff3db
pull from upstream, code review
2017-06-07 10:28:02 -07:00
Seth Alves
b1c7c251ac
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-07 10:09:46 -07:00
Zach Fox
d1719fade6
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-07 09:46:04 -07:00
NeetBhagat
ead0d42cf3
Merge branch 'master' into 21369
...
# Conflicts:
# libraries/gl/src/gl/OffscreenQmlSurface.cpp
# libraries/gl/src/gl/OffscreenQmlSurface.h
2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3
intial commit #21369 Working on clear method of console
2017-06-07 14:37:18 +05:30
Brad Hefta-Gaub
e5ac3eeea7
Merge pull request #10548 from NeetBhagat/21255
...
On Oculus Rift on/off, switch automatically to/from desktop mode
2017-06-06 18:05:56 -07:00
samcake
bac66ee4c7
Introducing the renderview task
2017-06-06 18:00:41 -07:00
David Kelly
06527ac0a2
Merge pull request #10611 from davidkelly/dk/4873
...
protect _text member of Text3DOverlay with mutex
2017-06-06 16:50:57 -07:00
Bradley Austin Davis
fc6a278217
Fixing dangling thread issues, consolidating thread management
2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe
Merge pull request #10623 from jherico/qml_engine_singleton
...
Migrate to single QML engine
2017-06-06 15:00:43 -07:00
Zach Pomerantz
d416464b62
add Audio to tablet context
2017-06-06 17:55:19 -04:00
Zach Pomerantz
67288528da
add Audio.context
2017-06-06 17:55:06 -04:00
Zach Pomerantz
2b99f299c8
testing
2017-06-06 17:54:52 -04:00
Dante Ruiz
8d6e4bf28c
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
2017-06-06 21:09:19 +01:00
Stephen Birarda
0ccd0d3fd6
Merge pull request #10621 from highfidelity/stable
...
Merge Stable back into Master
2017-06-06 10:39:03 -07:00
NeetBhagat
c3621d7c32
Resolved two issues:
...
1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on.
2) Menu sync problem while switching modes.
2017-06-06 22:31:14 +05:30
Chris Howe
8166fec0e0
Minor changes based on code review feedback
...
See https://worklist.net/21317 ,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
2017-06-06 12:11:57 -04:00
Dante Ruiz
038ffe920a
fixing merge conflicts
2017-06-06 16:42:08 +01:00
NeetBhagat
ae9a928740
Merge branch 'master' into 21255
...
# Conflicts:
# interface/src/Application.cpp
2017-06-06 19:06:50 +05:30
NeetBhagat
e79fd9c5cb
Merge branch 'master' into 21369
2017-06-06 15:26:40 +05:30
NeetBhagat
0f9cd5d0c7
intial commit hifi: #21369 Implement parts of the JS "console" object
2017-06-06 15:20:08 +05:30
Howard Stearns
3de243b093
Include the radius of the sphere at the avatar's feet.
2017-06-05 18:48:11 -07:00
Seth Alves
20c9228050
Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller
2017-06-05 15:53:23 -07:00
Seth Alves
7a276f027f
fix orientation used for 3d audio
2017-06-05 15:53:01 -07:00
Bradley Austin Davis
995fe11c05
Migrate to single QML engine
2017-06-05 15:14:44 -07:00
Brad Hefta-Gaub
51e00b9de9
Merge pull request #10614 from samcake/brown
...
Introduce a stencil mask pass in the rendering to optimize HMD
2017-06-05 14:14:11 -07:00
Zach Pomerantz
d8815d1dce
prep audio menu
2017-06-05 16:24:00 -04:00
humbletim
7cab0363a9
standalone 21180 branch with just the C++ changes
2017-06-05 15:57:54 -04:00
Zach Pomerantz
7cb38d22c3
fix AudioBuffers to work in tablet
2017-06-05 15:06:47 -04:00
Zach Pomerantz
9395de1873
add nop notify signals to Audio(Devices)
2017-06-05 14:57:44 -04:00
Seth Alves
3ab67cf27e
fix forward gaze in HMD while not looking at anyone
2017-06-05 11:44:27 -07:00
howard-stearns
4ccfef9702
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype
2017-06-05 11:18:40 -07:00
Zach Fox
87fca16e0d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-05 10:48:12 -07:00
Chris Collins
6cc6cd3bf6
Merge pull request #10604 from highfidelity/RC-42
...
Beta Release 42 - Includes up to Developer Release 6626
2017-06-05 09:13:19 -07:00
Seth Alves
27669d44a7
in deriveBodyFromHMDSensor, avoid using invalid head pose
2017-06-05 08:58:40 -07:00
Howard Stearns
ca526e0776
git rid of a lambda
2017-06-05 07:11:25 -07:00
Howard Stearns
05f41fb4f8
cleanup
2017-06-04 08:13:12 -07:00
Howard Stearns
a0ea306aed
cleanup, and include missing allowBackface parameter
2017-06-04 07:55:23 -07:00
Howard Stearns
fd01258c76
cleanup
2017-06-03 16:02:58 -07:00
Howard Stearns
02c46080f7
we don't need to force, but we do need some extra room for confined spaces
2017-06-03 15:43:14 -07:00
Howard Stearns
c48b729527
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-02 18:05:20 -07:00
Ryan Huffman
52c60b35df
Add startup_sent_to user activity event
2017-06-02 17:57:40 -07:00
Seth Alves
1b719ee654
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-02 16:31:23 -07:00
Dante Ruiz
f0f10f74c6
inpput configutration stub
2017-06-03 00:30:00 +01:00
manapa01
8e1577d3d3
Merge pull request #10596 from manapa01/Snapshot-Sound
...
Snapshot sound
2017-06-02 16:07:05 -07:00
David Kelly
12cbc206d2
cr feedback
2017-06-02 15:59:15 -07:00
Clément Brisset
c636922a5d
Merge pull request #10590 from huffman/fix/running-marker
...
Update server-console to watch interface via pid rather than marker
2017-06-02 15:57:44 -07:00
David Kelly
9b34abeb40
oops initializer order...
2017-06-02 15:43:29 -07:00
Seth Alves
3359a0a794
work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation
2017-06-02 15:29:20 -07:00
David Kelly
f9e1f02888
protect _text member of Text3DOverlay with mutex
2017-06-02 14:59:27 -07:00
samcake
0a3c1712eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-02 14:35:05 -07:00
Patrick Manalich
76901f5bf9
Final Application.cpp change
2017-06-02 14:08:56 -07:00
Seth Alves
c40a76f320
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-02 13:58:00 -07:00
Seth Alves
9088e288e0
don't worry about head controller being enabled, just check to see if head pose is valid
2017-06-02 13:57:53 -07:00
Ryan Huffman
c0bca73ec7
Merge pull request #10606 from huffman/feat/startup-went-to-event
...
Add startup_sent_to user activity event
2017-06-02 13:49:41 -07:00
Stephen Birarda
d89febac71
use a sleep instead of a yield waiting for close event
2017-06-02 13:22:02 -07:00
Stephen Birarda
e3d8229abe
rename ClosureEventSender to CloseEventSender
2017-06-02 13:21:55 -07:00
Stephen Birarda
ecc697dbe1
remove crash event definition for now
2017-06-02 13:21:45 -07:00
Stephen Birarda
40dfcb1e6e
send quit event during shutdown on thread, with timeout
2017-06-02 13:21:37 -07:00
Stephen Birarda
f5d732f332
initial version of the ClosureEventSender using std::thread
2017-06-02 13:21:28 -07:00
Chris Collins
34201ea1da
Merge pull request #10599 from jherico/ktx_cache_wipe
...
Add versioning support to the KTX cache
2017-06-02 13:02:18 -07:00
Sam Gateau
8a2837e1f7
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-02 11:52:11 -07:00
Brad Davis
1f95daf5c1
Add dev menu option to wipe KTX cache on next launch
2017-06-02 11:19:43 -07:00
Ryan Huffman
0d96f82888
Merge pull request #10592 from birarda/close-report
...
Send a close event to API on shutdown
2017-06-02 10:57:41 -07:00
Patrick Manalich
1f478bdf13
Repair Application.cpp
2017-06-02 10:44:58 -07:00
Patrick Manalich
a705e722f1
Ctrl-S sound feature added
2017-06-02 10:35:57 -07:00
Patrick Manalich
0c71cf4bda
Edit: Snapshot will make sound when initially clicked
2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263
Snapshot will make sound when initially clicked
2017-06-02 10:24:27 -07:00
Seth Alves
d91b3700a7
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-02 10:07:50 -07:00
Ryan Huffman
0fdbf4a342
Add startup_sent_to user activity event
2017-06-02 09:59:29 -07:00
Seth Alves
bc2311cb35
Merge pull request #10561 from AndrewMeadows/sanity-check-physics
...
fix crash in EntityMotionState::handleDeactivation()
2017-06-02 09:55:20 -07:00
NeetBhagat
6228ff19bf
Resolve the reviewed comments of @ZappoMan
2017-06-02 15:23:21 +05:30
Sam Cake
f9aa400b95
Refining the stencil configuration and triggering only in hmd mode
2017-06-02 00:22:38 -07:00
NeetBhagat
e08c3453a4
Merge branch 'master' into 21255
2017-06-02 12:36:07 +05:30
Ryan Huffman
86da91ac8d
Remove the runningMarker timer
2017-06-01 18:19:13 -07:00
Stephen Birarda
6d1bbc389d
use a sleep instead of a yield waiting for close event
2017-06-01 17:57:23 -07:00
Stephen Birarda
9fad8d1821
rename ClosureEventSender to CloseEventSender
2017-06-01 17:52:01 -07:00
howard-stearns
6b2e4c5abc
zaru stuff
2017-06-01 17:08:22 -07:00
Seth Alves
7d21ab88b0
add some saftey checks. cleanups
2017-06-01 16:14:59 -07:00
Stephen Birarda
0f22b07026
move session ID logging later in app startup
2017-06-01 16:07:36 -07:00
Seth Alves
552b69bb1c
cleanups
2017-06-01 13:47:19 -07:00
Stephen Birarda
c513d04b52
remove crash event definition for now
2017-06-01 13:40:50 -07:00
Seth Alves
ac6135387c
display plugins are never head controllers
2017-06-01 13:37:16 -07:00
howard-stearns
1068a4a9bd
remove the optimization for upperId == lowerId. Doesn't work in zaru
...
tunnels.
2017-06-01 13:21:24 -07:00
Stephen Birarda
792d938262
send quit event during shutdown on thread, with timeout
2017-06-01 13:01:24 -07:00
Ryan Huffman
aaf9b9ac7f
Update server-console to watch interface via pid rather than marker
2017-06-01 11:20:36 -07:00
Seth Alves
b83620f7c5
Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller
2017-06-01 10:58:33 -07:00
Seth Alves
eca05d9c42
more use of head input
2017-06-01 10:57:53 -07:00
Seth Alves
eb94c48c5b
merge from upstream
2017-06-01 10:10:11 -07:00
Seth Alves
0b2eb43ee2
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-01 07:02:31 -07:00
NeetBhagat
d27ad061cb
Merge branch 'master' into 21255
2017-06-01 12:46:14 +05:30
NeetBhagat
c7c07b28e9
Resolve the reviewed comments of @ZappoMan
2017-06-01 12:17:13 +05:30
Sam Cake
3c9b14ee94
Oene more fix
2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c
Fixing the warnings
2017-05-31 23:20:10 -07:00
Stephen Birarda
1d9d83b157
initial version of the ClosureEventSender using std::thread
2017-05-31 19:00:41 -07:00
Zach Pomerantz
954e4979f8
expose Audio.devices.input/output
2017-05-31 20:14:58 -04:00
howard-stearns
1e1dd3a633
checkpoint with working detector
2017-05-31 17:10:37 -07:00
Seth Alves
e37387f45c
sync
2017-05-31 14:01:09 -07:00
Chris Howe
6edc6b2756
WL21317
...
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
2017-05-31 15:05:43 -04:00
Patrick Manalich
7b69a5dbd5
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
2017-05-31 10:46:04 -07:00
NeetBhagat
58142817a1
Resolve the review comments of @ZappoMan.
2017-05-31 19:18:14 +05:30
howard-stearns
07ea2e271b
hook into location changes
2017-05-30 14:59:19 -07:00
Seth Alves
ffe844a8e7
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-05-30 13:42:20 -07:00
Chris Collins
5db0975554
Merge pull request #10556 from highfidelity/RC-41
...
Beta Release 41 - Includes up to Developer Release 6603
2017-05-30 12:52:30 -07:00
howard-stearns
fe351f8ea2
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-05-30 12:04:15 -07:00
Seth Alves
250e381ea7
Merge pull request #10563 from Atlante45/fix/reset-settings
...
Fix "retain avatar info"
2017-05-30 10:00:55 -07:00
volansystech
e90b1b5a67
Resolve the comments of @ZappoMan.
2017-05-29 18:21:59 +05:30
volansystech
212627bd5d
Merge branch 'master' into 21255
2017-05-29 17:51:45 +05:30
volansystech
0920dbc1a8
Resolve the comments of @ZappoMan.
2017-05-29 15:53:33 +05:30
Zach Pomerantz
4a3f2e1d09
use subclass for interface's Audio interface
2017-05-28 19:25:37 -04:00
Zach Pomerantz
b2eda7cf22
rm AudioDevice interface
2017-05-28 19:04:51 -04:00
Zach Pomerantz
2b40ad4275
mv Audio... to Settings as dialog
2017-05-28 17:42:24 -04:00
Zach Pomerantz
8ca8c3aa69
mv AudioPreferencesDialog to AudioBuffers
2017-05-28 17:40:57 -04:00
Zach Pomerantz
03d3666c0c
show menu after requesting it
2017-05-28 17:34:11 -04:00
Zach Pomerantz
156b3f9738
use showDialog instead of toggleMenu
2017-05-28 17:10:59 -04:00
Seth Alves
66415dadc6
Merge pull request #10496 from volansystech/Wl-21298
...
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.
2017-05-27 08:28:19 -07:00
samcake
882df7391b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-26 16:47:49 -07:00
howard-stearns
92aeadd70f
rotation of local capsule offset
2017-05-26 16:34:08 -07:00
howard-stearns
f694691efb
add fixme comments and make isUp/isDown ordinary methods.
2017-05-26 16:15:18 -07:00
howard-stearns
4be31f1b18
thread safety
2017-05-26 15:31:59 -07:00
Atlante45
ccc7cb638d
Fix "retain avatar info"
2017-05-26 14:18:29 -07:00
Zach Pomerantz
637a448c2c
abstract toggleMenu
2017-05-26 17:12:15 -04:00
Zach Pomerantz
380a16f9dd
use SYSTEM_TABLET static
2017-05-26 17:11:32 -04:00
Andrew Meadows
fa003b0c14
swap order of changes and deactvations
2017-05-26 12:29:37 -07:00
howard-stearns
7cee438298
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-05-26 11:36:04 -07:00
Anthony Thibault
84901ba94b
Merge pull request #10542 from druiz17/arm-pucks
...
Added pucks calibration for upper arm/shoulders
2017-05-26 11:17:15 -07:00
volansystech
8d9cfbdf31
Resolve comments of @sethalves . Remove whitespaces.
2017-05-26 11:41:35 +05:30
Clément Brisset
efe72e1b85
Merge pull request #10530 from Atlante45/fix/default-scripts
...
Ensure user never loses its running scripts
2017-05-25 18:33:11 -07:00
howard-stearns
905b5261d1
If collisions are enabled, turn them off in safeLanding, and
...
restore.
2017-05-25 16:32:44 -07:00
Seth Alves
af5ba3a90a
ask display-plugins if they are head-controllers
2017-05-25 15:14:10 -07:00
howard-stearns
ac8cb63419
clean and DRY
2017-05-25 14:34:24 -07:00
Dante Ruiz
108c444cc7
clean up code
2017-05-25 21:59:06 +01:00
Andrew Meadows
3bd0c111d7
verify empty ShapeManager in Application dtor
2017-05-25 13:47:40 -07:00
howard-stearns
9d73d0c931
works with nested enclosing entities
2017-05-25 12:09:22 -07:00
Seth Alves
3823ece153
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1
change some code to look at head-controller position rather than hmd position
2017-05-25 10:50:41 -07:00
howard-stearns
74c163d047
snapshot of safeLanding. Works as long as entities don't intersect.
2017-05-25 10:25:29 -07:00
volansystech
a2851b5bcb
Put proper comments and indentation.
2017-05-25 18:47:59 +05:30
volansystech
8d51be644d
Merge branch 'master' into 21255
2017-05-25 17:48:48 +05:30
volansystech
cab6f3f7c3
Solve Jitteriness while scrolling.
2017-05-25 17:28:19 +05:30
volansystech
aab80629ea
Merge branch 'master' into Wl-21298
2017-05-25 15:44:17 +05:30
volansystech
1f24e38585
Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.
2017-05-25 14:56:06 +05:30
Sam Cake
3eb95d2d19
cleaning the commented code
2017-05-25 01:16:45 -07:00
Stephen Birarda
f897f3f090
send machine fingerprint as uuid without curly braces
2017-05-24 19:08:25 -07:00
Stephen Birarda
50285005be
add machine fingerprint to the launch event
2017-05-24 18:35:57 -07:00
Stephen Birarda
c671817fa3
fix cache http request count in stats
2017-05-24 17:47:40 -07:00
Stephen Birarda
fefb34512d
change asset inbound key to atp
2017-05-24 17:44:09 -07:00
Stephen Birarda
c37fd335e1
track the number of local socket changes
2017-05-24 17:41:52 -07:00
Stephen Birarda
5e61f20df8
add more details about pending downloads
2017-05-24 17:37:42 -07:00
Stephen Birarda
48c4db1ca4
nest the download stats so they are cleaner
2017-05-24 17:36:21 -07:00
samcake
575d4abdf7
bad include fixed maybe
2017-05-24 17:25:21 -07:00
Stephen Birarda
3743cd23b4
add detailed download stats for file/http/atp
2017-05-24 17:22:38 -07:00
Stephen Birarda
ac55908e42
add additional information to stats/launch activities
2017-05-24 16:50:06 -07:00
samcake
044110e4f3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-24 15:40:40 -07:00
Dante Ruiz
8cb9bfcc81
fixed merge conflict
2017-05-24 19:35:41 +01:00
Sam Gateau
f9c6cecb23
Merge pull request #10529 from samcake/ambient
...
Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting
2017-05-24 10:48:21 -07:00
anshuman64
2b63eb9d90
Merge pull request #10469 from druiz17/improve-rotation-jitter
...
Added a LowVelocityFilter to the input system.
2017-05-24 08:35:13 -07:00
volansystech
0c4cd96bfd
Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift.
2017-05-24 12:26:07 +05:30
Dante Ruiz
ac3c9655ec
added arms
2017-05-24 01:28:08 +01:00
samcake
e7b808cbc1
Merging with upstream
2017-05-23 12:12:31 -07:00
Clément Brisset
ed86ca3e55
Merge pull request #10522 from birarda/bug/version-number-jumps
...
remove version difference from update dialog
2017-05-23 10:28:50 -07:00
Dante Ruiz
0cbdeaa1e8
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
2017-05-23 18:26:58 +01:00
Dante Ruiz
54d63f5155
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-23 18:19:38 +01:00
Anthony J. Thibault
06c26f029a
Merge branch 'master' into feature/faster-ik-iterations
2017-05-23 09:10:17 -07:00
Sam Cake
7f9c98a922
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-22 22:54:43 -07:00
Chris Collins
978eb0dfa9
Merge pull request #10492 from ctrlaltdavid/21359
...
Fix eye behavior in recording playback
2017-05-22 21:53:13 -07:00
Atlante45
10eb353126
Ensure user never loses its running scripts
2017-05-22 18:55:58 -07:00
Sam Gateau
e4a516dcbf
Merge pull request #10497 from AndrewMeadows/crashfix-null-rig
...
fix crash for Zone with 'compoundURL' property
2017-05-22 18:18:08 -07:00
Dante Ruiz
d98e7d5bc6
adding left and right arm
2017-05-23 00:26:12 +01:00
samcake
e4f9f2935e
Solving the size evaluation for compressed format
2017-05-22 15:42:18 -07:00
David Rowe
b0962865b2
Code review
2017-05-23 09:57:53 +12:00
Stephen Birarda
3e09c911f5
remove number of versions behind from the update dialog
2017-05-22 14:19:36 -07:00
David Rowe
9f83ca518f
Merge branch 'master' into 21359
2017-05-23 09:18:10 +12:00
volansystech
1cbf685133
Merge branch 'master' into Wl-21298
2017-05-22 10:58:05 +05:30
volansystech
6da46c2d4c
Resolve Mouse hover issue.
2017-05-22 10:53:58 +05:30
Atlante45
2928507e48
Fix "Reset Settings" window poping up every time
2017-05-21 08:37:17 -07:00
samcake
c5b5aa93b1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-19 18:13:42 -07:00
David Rowe
768415695d
Tidying
2017-05-20 12:43:47 +12:00
David Rowe
eef707e4e9
Simplify code
2017-05-20 12:42:40 +12:00
Andrew Meadows
d3956b47d0
remove bad break
2017-05-19 15:35:29 -07:00
Andrew Meadows
bb4d366c40
use SmartPointer for Zone _model
2017-05-19 15:33:23 -07:00
Sam Gateau
36ac623e66
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-19 13:25:36 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Atlante45
c2e2682eff
Fix "Reset Settings" window poping up every time
2017-05-19 10:50:23 -07:00
howard-stearns
af98b3bd4c
cleanup
2017-05-19 10:45:36 -07:00
volansystech
2691855e2b
Merge branch 'master' into Wl-21298
2017-05-19 10:43:31 +05:30
howard-stearns
469ffd41ab
bring back proper cached args
2017-05-18 17:07:41 -07:00
Anthony J. Thibault
e99001d86c
debug draw ik chains, bug fix for flex coef on tips
...
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
howard-stearns
3f5f47e7f3
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype
2017-05-18 16:13:15 -07:00
howard-stearns
242cbdf2df
Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1
2017-05-18 16:02:45 -07:00
howard-stearns
851911f55a
Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1
2017-05-18 15:28:40 -07:00
Zach Fox
8efac1e7f1
Prevent another GIF from being captured while one is processing
2017-05-18 14:30:08 -07:00
Dante Ruiz
984f9e1ba5
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-18 21:23:06 +01:00
Sam Gateau
d9ad45bf4a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 09:37:04 -07:00
samcake
2c6e10fbe1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 09:21:02 -07:00
Dante Ruiz
90ddc16d09
add calibration data to filters
2017-05-18 17:07:28 +01:00
volansystech
b2ac4381eb
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.
2017-05-18 19:13:59 +05:30
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
Andrew Meadows
09433a93ba
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
...
More correct avatar mass
2017-05-17 16:22:06 -07:00
Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -07:00
Seth Alves
8a88b30da7
Merge pull request #10468 from AndrewMeadows/cleanup-actions
...
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
Dante Ruiz
a18940142e
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
howard-stearns
fed5397b38
a camera
2017-05-16 16:46:52 -07:00
Andrew Meadows
d065b569d3
support for variable avatar mass by size
2017-05-16 16:03:51 -07:00
Andrew Meadows
805d23567d
fix simple typo
2017-05-16 16:03:50 -07:00
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -07:00
Andrew Meadows
e9c703b147
add deprecation log for DYNAMIC_TYPE_SPRING
2017-05-16 10:34:39 -07:00
Andrew Meadows
9e08dadaf4
Remove ObjectActionSpring
2017-05-15 22:11:42 -07:00
Dante Ruiz
724f849d88
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-16 00:15:18 +01:00
Dante Ruiz
975b1ab077
moved low velocity filter in the input system
2017-05-16 00:15:06 +01:00
samcake
2df6d0df48
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-15 13:40:56 -07:00
Seth Alves
66a1dbfcfe
Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
...
cleanup Head::simulate() code
2017-05-15 11:21:43 -07:00
howard-stearns
fa9d866369
change camera pos/orientation through config
2017-05-15 07:10:12 -07:00
howard-stearns
3a0cc4e975
begin/end are Model, not ModelI/O, and begin has config
2017-05-14 15:48:40 -07:00
howard-stearns
9d1283e067
resetSize of texture
2017-05-14 15:24:35 -07:00
Vladyslav Stelmakhovskyi
cc10fc81b7
Fix crash in sit script
2017-05-13 20:57:04 +02:00
Howard Stearns
142b4f4203
kill warnings
2017-05-12 18:18:46 -07:00
anshuman64
49d4cf4e68
Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config
...
More stable IK when hips, feet and chest are controlled via external input
2017-05-12 17:22:29 -07:00
howard-stearns
29299976ee
render task should default off and be enabled by script
2017-05-12 17:03:23 -07:00
howard-stearns
bca2cf45c0
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-05-12 15:21:03 -07:00
Seth Alves
4af0a85aa0
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-12 13:03:58 -07:00
Clément Brisset
1658ced671
Merge pull request #10437 from Atlante45/feat/faster-startup
...
Use baked default skybox
2017-05-12 11:35:51 -07:00
Seth Alves
bc6fb182eb
pull out motor action, fix import of slider and cone-twist constraints
2017-05-12 10:32:28 -07:00
samcake
3393456d91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-12 10:15:13 -07:00
Seth Alves
c6131916e1
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-12 09:46:21 -07:00
Seth Alves
e1c805e76f
lock in Overlays::findRayIntersectionInternal
2017-05-11 17:02:00 -07:00
samcake
39241bec13
Prototyping a way to produce a selfie and use the rendering directly
2017-05-11 15:58:31 -07:00
Andrew Meadows
a43447310d
remove physics dependency from avatars-render lib
2017-05-11 15:22:22 -07:00
Andrew Meadows
f4df223d23
cleanup Head::simulation() code
2017-05-11 14:46:00 -07:00
Seth Alves
9d63113e62
Merge pull request #10337 from vladest/audio-source-sync
...
Audio source sync
2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e
Code style fixes
2017-05-11 20:38:09 +02:00
Andrew Meadows
0852852f39
Merge pull request #10443 from ctrlaltdavid/21326-2
...
Fix avatar recording playback mouth not moving
2017-05-11 10:41:41 -07:00
samcake
6b32219f5f
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-11 10:07:27 -07:00
Seth Alves
4042e2bceb
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-11 09:29:30 -07:00
Vladyslav Stelmakhovskyi
f963233a7b
Merge branch 'master' into audio-source-sync
2017-05-11 15:25:24 +02:00
Thijs Wenker
0a3a2705af
Merge pull request #10426 from huffman/fix/tablet-invisible-by-default
...
Fix tablet showing up for a short period of time on launch
2017-05-11 15:03:52 +02:00
David Rowe
1b855f2c6b
Voice modulation and facetrackers write to transient blendshapes
2017-05-11 18:15:38 +12:00
Anthony J. Thibault
147d067c4e
Merge branch 'master' into feature/ik-solver-init-config
2017-05-10 18:12:39 -07:00
samcake
737fdf9dd8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-10 17:28:07 -07:00
Atlante45
79d53d92a1
Use baked default skybox
2017-05-10 16:03:02 -07:00
Vladyslav Stelmakhovskyi
2328da3c48
Merge branch 'master' into audio-source-sync
2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e
Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum
2017-05-10 21:21:39 +02:00
Brad Hefta-Gaub
f91f42b0c8
Merge pull request #10411 from zzmp/feat/tester-flag
...
Add launch.tester to user_actions
2017-05-10 11:58:24 -07:00
samcake
39f6e22da3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-10 09:48:26 -07:00
Seth Alves
9184936496
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-10 09:30:39 -07:00
Anthony J. Thibault
93b8dc550c
Merge branch 'master' into feature/ik-solver-init-config
2017-05-10 09:03:21 -07:00
Ryan Huffman
bddfdfa838
Adjust Web3DOverlay to load QML even if not visible
2017-05-09 16:01:20 -07:00
Zach Pomerantz
45feee38b2
Merge pull request #10269 from zzmp/fix/audio-bg-join
...
Cleanup Audio background threads on shutdown
2017-05-09 17:23:36 -04:00
trent
a3545661dc
Merged hifi/master into this PR and resolved merge conflicts.
2017-05-09 15:09:53 -04:00
samcake
c36035d3eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-09 10:46:38 -07:00
trent
9c8b844e26
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-09 12:51:28 -04:00
trent
7faed38bb5
Just use the smooth time constant instead of a variable.
2017-05-09 12:51:25 -04:00
Seth Alves
1e1968357a
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-09 09:24:50 -07:00
Andrew Meadows
e92e710cdc
Merge pull request #10413 from humbletim/fix_lookat_regression
...
Fix lookAt eye snapping
2017-05-09 08:51:10 -07:00
Vladyslav Stelmakhovskyi
7ab6909c77
Merge branch 'master' into audio-source-sync
2017-05-09 11:08:08 +02:00
humbletim
29b1ac3572
optimizations per feedback
2017-05-08 21:50:24 -04:00
humbletim
42d1498d20
call Model::updateRig (not Parent::updateRig)
2017-05-08 21:19:18 -04:00
Andrew Meadows
2835a73c6b
Merge pull request #10071 from AndrewMeadows/walk-up-steps
...
avatar can walk up steps
2017-05-08 18:17:16 -07:00
Zach Pomerantz
defc3c1c4f
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-08 19:55:10 -04:00
Seth Alves
de589a32f3
clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring
2017-05-08 16:36:51 -07:00
Zach Pomerantz
929079df97
add launch.tester to user_actions
2017-05-08 19:33:09 -04:00
humbletim
ef0e32643d
update refactored logic to match previous application behavior
2017-05-08 18:53:47 -04:00
Anthony J. Thibault
712fcbe27a
Removed cruft/debug code & comments
2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea
Hooked up IK constraint rendering
2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a
WIP: debug render joint constraints.
2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee
WIP commit, first pass at generating limit center joints + debug draw
2017-05-08 15:06:27 -07:00
Andrew Meadows
afe0447322
remove unnecessary virtual keyword
2017-05-08 14:27:39 -07:00
Andrew Meadows
138a987a8f
_rotationChanged is a timestamp
2017-05-08 14:27:18 -07:00
Vladyslav Stelmakhovskyi
d0111ac0bb
Merge branch 'master' into audio-source-sync
2017-05-08 20:09:34 +02:00
Seth Alves
c8cdad5b4e
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-08 11:02:42 -07:00
Chris Collins
4bfb23b5d2
Merge pull request #10388 from humbletim/21308
...
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
Chris Collins
0351ac1575
Merge pull request #10401 from jherico/fix_benny_hill_animations
...
Fix sped up animations
2017-05-08 09:11:23 -07:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07:00
Brad Davis
b63015eaea
Fix sped up animations
2017-05-06 14:34:28 -07:00
Seth Alves
5d539bcc17
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-06 07:49:02 -07:00
Seth Alves
9e0845f17e
Merge pull request #10387 from vladest/tablet-performance
...
Decrease CPU usage in tabletUI periodical updates
2017-05-06 07:07:29 -07:00
Chris Collins
820ed5049b
Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
...
Fix -- dont send non-entity edits to entity-server
2017-05-05 16:37:27 -07:00
samcake
bc1e5101ac
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-05 16:13:51 -07:00
Seth Alves
b2ccc33a79
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-05 14:52:07 -07:00
Zach Pomerantz
ca7cd61c64
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-05 13:04:01 -04:00
Chris Collins
fd836dcd68
Merge pull request #10366 from Atlante45/feat/normal-map-compression
...
Feat/normal map compression
2017-05-05 10:03:01 -07:00
Chris Collins
8d49540f3a
Merge pull request #10380 from vladest/rightclick-fix
...
Rightclick fix
2017-05-05 10:01:11 -07:00
Andrew Meadows
63042eea3a
fix flawed fix of bad rebase
2017-05-05 09:37:00 -07:00
Andrew Meadows
41ad25ade1
fix bad rebase of changed menu option
2017-05-05 09:37:00 -07:00
Andrew Meadows
fe401c7488
improved management of collisionless avatar state
2017-05-05 09:37:00 -07:00
Andrew Meadows
d34b667e82
remove kinematic character controller implemention
2017-05-05 09:35:49 -07:00
Andrew Meadows
0aa579225c
even more correct API: MyAvatar.collisionsEnabled
2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5
restore MyAvatar.setCharacterControllerEnabled()
2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838
fix driving motion of collisionless avatars
2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c
support collisionless avatar when playing recording
2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
humbletim
25807a5258
fix warning color
2017-05-05 09:48:24 -04:00
Vladyslav Stelmakhovskyi
e395a51c60
Merge with master
2017-05-05 07:05:16 +02:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
0406cc41e0
if model-overlay has no name, use its url
2017-05-04 18:37:04 -07:00
Seth Alves
c04c0c5b13
if model-overlay has no name, use its url
2017-05-04 18:36:51 -07:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
Atlante45
ecda313223
Add runtime access to compression settings
2017-05-04 15:07:59 -07:00
humbletim
6cb95b2393
add and connect handlers for scriptWarningMessage and scriptInfoMessage signals
2017-05-04 17:43:00 -04:00
Brad Davis
9def788956
Merge pull request #10314 from jherico/avatars-renderer
...
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
Anthony Thibault
7006fa6da4
Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
...
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi
ba5a371da1
Decrease CPU usage in tabletUI periodical updates
2017-05-04 22:54:41 +02:00
humbletim
fe36e6a793
fix JSConsole script message handlers and about: filename
2017-05-04 16:45:12 -04:00
Vladyslav Stelmakhovskyi
d522864141
Remove debug prints
2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi
c8a9b02c7a
Block only secondary button
2017-05-04 20:26:02 +02:00
Vladyslav Stelmakhovskyi
4cefa0379c
Merge branch 'master' into rightclick-fix
2017-05-04 16:13:07 +02:00
Vladyslav Stelmakhovskyi
99ed2556f2
Do not send non primary button events to Tablet window
2017-05-04 16:11:07 +02:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
Seth Alves
a259d00b63
Merge pull request #10332 from sethalves/bullet-constraints-5
...
Bullet constraints
2017-05-03 16:30:34 -07:00
Zach Fox
4d49ae5b09
Remove the +1s
2017-05-03 15:43:57 -07:00
Zach Fox
07d3e482cf
ARG
2017-05-03 15:40:39 -07:00
trent
d7ed727faf
Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.
2017-05-03 16:56:18 -04:00
trent
ca4b563768
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-03 16:34:34 -04:00
Zach Pomerantz
4a8f5e380f
Merge pull request #10358 from zzmp/fix/minimize-deadlock
...
Fix deadlock from minimizing
2017-05-03 15:06:27 -04:00
Zach Fox
ae72b9b73d
Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2
...
Lots of Snapshot app improvements, Round Two
2017-05-03 11:44:40 -07:00
trent
fc3cce6b73
Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.
2017-05-03 12:35:35 -04:00
trent
24f2678cdd
Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.
2017-05-03 12:05:21 -04:00
trent
786838d092
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 20:21:35 -04:00
Zach Pomerantz
ad8d3e5490
continue idling while minimized
2017-05-02 20:05:55 -04:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
Trent Polack
0a5dfbb9af
Changed l to interp.
...
In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.
2017-05-02 19:10:33 -04:00
Sam Gateau
a7eecdfb26
Merge pull request #10265 from samcake/ambient
...
Making the render engine Job/Task system configurable and reusable
2017-05-02 14:55:53 -07:00
Zach Fox
d1dff7606c
Lint cleanup; Immediate share button visibility;
2017-05-02 14:10:24 -07:00
Zach Fox
5302110e7b
Merge pull request #10346 from zfox23/newSnapshotReview_Improvements
...
Lots of Snapshot app improvements, Round One
2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02:00
trent
f79e032841
Silly online git merge tool. You are silly. Errors fixed.
2017-05-02 14:48:27 -04:00
Zach Fox
c9e0679b70
Subscribe to changes to snapshotsLocation setter for better UX
2017-05-02 10:55:57 -07:00
trent
6d1fb8a6f8
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-02 13:55:39 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
samcake
df54ad2339
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-02 10:50:39 -07:00
Trent Polack
8f93a9a074
Merge branch 'master' into feature/snap-turn-smoothing-21270
2017-05-02 13:43:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Seth Alves
dc569051f9
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-05-02 09:50:13 -07:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Seth Alves
45a50f9a46
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5
2017-05-01 15:32:29 -07:00
Seth Alves
a75544a9fb
Merge pull request #10319 from hyperlogic/feature/head-standard-action
...
Head, Hips and Chest IK can now be controlled from Controller inputs
2017-05-01 13:03:23 -07:00
trent
4d7eeed343
Marking MyAvatar's rotation as dirty if smoothing is going down.
2017-05-01 15:21:25 -04:00
Brad Davis
40e4e2f307
Merge pull request #10327 from jherico/face_tracker_refactor
...
Remove Faceshift
2017-05-01 12:14:55 -07:00
trent
773563850c
Merge hifi/master with my branch, fixed merge issue.
2017-05-01 13:23:02 -04:00
Vladyslav Stelmakhovskyi
dde363ef3d
Merge branch 'master' into audio-source-sync
2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi
28447cde0b
Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items
2017-05-01 18:41:38 +02:00
Anthony J. Thibault
0c09823f67
clang warning fixes, unused variables...
2017-05-01 09:10:31 -07:00
Seth Alves
7f69bdecb2
first try at angular-velocity setting action
2017-05-01 07:06:21 -07:00
Seth Alves
7ce0ef2ec4
fix spring action so that it can be linear or rotational or both
2017-04-30 10:04:07 -07:00
Seth Alves
4c4e0dffcc
bullet cone-twist constraint
2017-04-29 12:30:12 -07:00
Seth Alves
6623028d71
ball-and-socket constraint
2017-04-29 08:35:55 -07:00
Seth Alves
9e7ef83bd1
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
2017-04-29 07:01:44 -07:00
Brad Davis
2b43a1989f
Moving face and eye trackers out of interface
2017-04-28 23:28:17 -07:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Stephen Birarda
c518aa55be
Merge pull request #10312 from birarda/upload-new-models-to-entity
...
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Vladyslav Stelmakhovskyi
368334e07e
Merge branch 'master' into audio-source-sync
2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49
Reimplemented Tablet Audio screen using C++ model
2017-04-28 23:02:28 +02:00
Anthony J. Thibault
108cd80bb5
Merge branch 'master' into feature/head-standard-action
2017-04-28 10:41:29 -07:00
Andrew Meadows
994eed7b83
safer delete of AvatarMotionStates
2017-04-28 10:18:19 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Seth Alves
2a0fc5b34c
Merge pull request #10273 from hyperlogic/feature/hips-ik-target
...
Avatar IK system now supports manipulating the hips.
2017-04-28 09:17:33 -07:00
Anthony J. Thibault
b80270400f
Merge branch 'master' into feature/hips-ik-target
2017-04-27 18:15:12 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Stephen Birarda
038ac745c8
clear domain octree details if ES killed
2017-04-27 17:47:18 -07:00
Anthony J. Thibault
764f6c69ea
Head input action will override the HMD for IK.
2017-04-27 17:39:25 -07:00
Zach Fox
3ce81844da
Snapshot JS interface for better Settings handling
2017-04-27 14:01:08 -07:00
Zach Fox
6711e8cbc2
Remove duplicate setting; Make settings page open; button state
2017-04-27 14:01:07 -07:00
Zach Fox
3221214283
New Snap FTUE flow
2017-04-27 14:01:07 -07:00
Zach Fox
eaa699bbfd
Wow, it's really coming together!
2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e
Checkpoint
2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d
Rearchitecture
2017-04-27 14:01:06 -07:00
Howard Stearns
88c3b4d9d3
Merge pull request #10258 from howard-stearns/watch-for-announcements
...
watch for announcements
2017-04-27 14:00:39 -07:00
Andrew Meadows
5cf233db3a
less labyrinth
2017-04-27 13:16:50 -07:00
Andrew Meadows
aa90a6bd02
use static methods for setting avatar debug options
2017-04-27 13:16:50 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7
remove unused RenderArgs::_cameraMode hack
2017-04-27 13:16:50 -07:00
Andrew Meadows
00b05ed137
connect menu options to avatar render features
2017-04-27 13:16:50 -07:00
Andrew Meadows
823f3a73c6
remove commented out cruft
2017-04-27 13:16:50 -07:00
Andrew Meadows
72f5860538
restore RecordingScriptingInterface to Application
2017-04-27 13:16:50 -07:00
Andrew Meadows
caf6a77baf
repair bad merge during rebase
2017-04-27 13:16:50 -07:00
Andrew Meadows
2441536de3
remove Avatar dependency on AvatarMotionState
2017-04-27 13:16:49 -07:00
trent
53f47c132f
Avatar snap-turn rotation smoothing (sent out from the local client outward).
2017-04-27 16:12:25 -04:00
Andrew Meadows
010d1dfa22
remove Menu dependency from Avatar class
2017-04-27 13:11:57 -07:00
Andrew Meadows
6393972874
remove AvatarManager dependency from Avatar
2017-04-27 13:11:57 -07:00
Andrew Meadows
65682a914d
remove cufty AvatarManager LocalLights feature
2017-04-27 13:11:57 -07:00
Andrew Meadows
4c212fb1e5
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-27 13:11:57 -07:00
Seth Alves
b0c12dd84a
warn rather than crash if we get unexpected action data
2017-04-27 13:04:47 -07:00
Seth Alves
203a14f2a0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 12:56:11 -07:00
David Kelly
63468cc9e1
Thread safety for sending location
2017-04-27 12:20:56 -07:00
Philip Rosedale
f555291d92
Merge pull request #10296 from Triplelexx/21296
...
21296 - Move two menu items
2017-04-27 11:37:07 -07:00
Seth Alves
93f9716557
merge from upstream
2017-04-27 10:17:00 -07:00
Seth Alves
15661987be
load tablet overlay models with higher priority
2017-04-27 10:16:08 -07:00
Seth Alves
68b59e4601
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b
expose bullet slider constraint to javascript
2017-04-27 07:56:35 -07:00
Triplelexx
a154879001
change menu item text Audio Noise Reduction to Noise Reduction
2017-04-27 03:25:24 +01:00
Triplelexx
f9c6cb27f4
change menu item for avatar collisions to "Collide with world"
2017-04-27 03:16:04 +01:00
ZappoMan
c0df82ff69
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
Triplelexx
f795027ab7
change menu item locations
...
AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.
2017-04-27 01:09:04 +01:00
anshuman64
d146431e9b
Merge pull request #10268 from druiz17/input-recorder
...
Input recorder/ input playback system for all input actions
2017-04-26 16:20:20 -07:00
humbletim
f8bbd9174c
Merge remote-tracking branch 'upstream/master' into 21281
2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631
Merge pull request #10130 from ctrlaltdavid/21249
...
New avatar record and playback script
2017-04-26 15:18:30 -07:00
Ryan Huffman
8ba56a96df
Merge pull request #10240 from zzmp/fix/hmd-tutorial
...
Condition tutorial on active HMD
2017-04-26 14:00:02 -07:00
Andrew Meadows
fd874429c1
remove unused cruft
2017-04-26 12:51:16 -07:00
Andrew Meadows
ac751029c0
remove identity cache code
2017-04-26 12:51:16 -07:00
Andrew Meadows
4511156d7b
cache avatar identity info forever
2017-04-26 12:50:48 -07:00
Anthony J. Thibault
ef43ff4b99
Add default pose matrices to InputCalibrationData structure
2017-04-26 11:55:24 -07:00
ZappoMan
5dd6daaad7
send identity on nodeActivated not nodeAdded
2017-04-26 11:42:38 -07:00
Dante Ruiz
d8e6e8e7d0
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-26 16:53:02 +01:00
David Rowe
1b635d8c5e
Replace FIXMEs with proper code
2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9
Merge branch 'master' into 21249
...
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056
hacking
2017-04-25 18:21:09 -07:00
trent
2963d3d212
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-04-25 19:31:21 -04:00
ZappoMan
90cdeb9582
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-25 23:57:48 +01:00
Atlante45
62b7855e1f
Add pending to stats
2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9
Texture::create returns shared pointer
2017-04-25 15:56:23 -07:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
David Rowe
7c2e1aa846
Tidy FIXME
2017-04-26 10:16:35 +12:00
Anthony J. Thibault
dc19f37726
input/controller routing thru skeleton model and rig.
2017-04-25 15:04:47 -07:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7
Merge pull request #10242 from zzmp/fix/display-log
...
Send changed_display_mode after it changes
2017-04-25 16:36:12 -04:00
trent
f28b58f56e
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-04-25 15:35:11 -04:00
Seth Alves
23592f4a53
get rid of _trackedHeadPosition
...
(cherry picked from commit e909938b232e11400832ae7dd29de16968967668)
2017-04-25 11:03:43 -07:00
Seth Alves
0cd2863df4
start on routing HMD position and rotation through controller interface
...
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
David Rowe
d682924b00
Temporary fix for recording audio
2017-04-25 21:08:10 +12:00
ZappoMan
382645ddd0
more cleanup
2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
Anthony J. Thibault
937f308ba8
code cleanup
2017-04-24 17:04:16 -07:00
humbletim
3641ca3816
add support for jointRotations/jointTranslations to ModelOverlay
2017-04-24 19:24:54 -04:00
humbletim
28b3eef7aa
add getJointTranslations() methods
2017-04-24 19:22:02 -04:00
Zach Pomerantz
4a26785eda
cleanup Audio bg threads in cleanupBeforeQuit
2017-04-24 18:21:27 -04:00
Zach Pomerantz
cd2665fc55
standardize Audio bg thread joins
2017-04-24 18:10:50 -04:00
Anthony J. Thibault
dc3803a225
Re-enable IK _hipsOffset computation when no hips IK target is present.
2017-04-24 13:59:02 -07:00
David Rowe
d52125e2f5
Merge branch 'master' into 21249
2017-04-25 07:19:56 +12:00
Dante Ruiz
f69691afd5
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0
got input recording to work
2017-04-24 19:57:38 +01:00
samcake
c36f8da4c0
Fixing build on mac
2017-04-24 10:46:29 -07:00
trent
b00cd66a2a
Revisited where smoothing was done (to a much lower-level); still needs testing.
2017-04-21 22:36:11 -04:00
Seth Alves
17b83dd64c
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-21 17:19:47 -07:00
Andrew Meadows
3f9f16cc98
Merge pull request #10223 from kunalgosar/blendshapesbug
...
Make setBlendshape changes persist
2017-04-21 16:11:13 -07:00
howard-stearns
ce7f3197f6
watch for announcements
2017-04-21 14:27:38 -07:00
ZappoMan
ff45ad53a3
some more CR cleanup
2017-04-21 10:40:41 -07:00
trent
a94f4ca182
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-04-21 13:22:32 -04:00
ZappoMan
f133713d0e
CR feedback
2017-04-21 10:21:34 -07:00
Ken Cooke
a5ed3007b3
Merge pull request #10248 from vladest/notify-sound-inject
...
Notify sound inject
2017-04-21 09:26:36 -07:00
ZappoMan
c03182546b
some cleanup
2017-04-21 09:11:51 -07:00
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01:00
David Rowe
daedb94b04
Merge branch 'master' into 21249
2017-04-21 14:50:28 +12:00
ZappoMan
e89b6c5d2c
some initial debugging on tpose avatars
2017-04-20 17:26:31 -07:00
Sam Gateau
a668ed0409
Merge pull request #10244 from samcake/ambient
...
Cleaning the Engine/Task/Job interface
2017-04-20 15:48:21 -07:00
Vladyslav Stelmakhovskyi
2665ede06f
Audio injector cleanup
2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106
Code nitpick. Pointer cleanup on exit
2017-04-20 21:12:57 +02:00
trent
805a74c074
First-pass attempt at remedying the smoothing issue (the avatar is never receiving the proper call).
2017-04-20 13:21:38 -04:00
Zach Pomerantz
b77917b8d1
Merge pull request #10241 from zzmp/fix/display-fail
...
Update Display menu on unsuccesful selection
2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi
06406ef7de
Merge branch 'master' into notify-sound-inject
2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8
Implemented snap sound using sound injector
2017-04-20 17:43:16 +02:00
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
Zach Fox
50456f71ed
Merge pull request #10142 from Triplelexx/21258
...
21258 - Don't render (or heavily use GPU) when window in minimized
2017-04-19 16:26:49 -07:00
David Rowe
2108300272
Merge branch 'master' into 21249
2017-04-20 08:43:00 +12:00
Dante Ruiz
d4c8d06575
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe
exprting compressed file
2017-04-19 20:41:56 +01:00
samcake
2c16b2bf3a
Expose the runtime from the engine in Stats
2017-04-18 18:12:42 -07:00
David Rowe
00b6b2a2c0
Implement desktop recordings browser dialog
2017-04-19 12:34:59 +12:00
Zach Pomerantz
e0cb809f58
add hmd:bool to changed_display_mode
2017-04-18 18:48:28 -04:00
Zach Pomerantz
858a1db38b
only log changed_display_mode on successful change
2017-04-18 18:48:23 -04:00
Zach Pomerantz
c7a7fa90ec
update Display menu on unsuccesful selection
2017-04-18 18:47:57 -04:00
Zach Pomerantz
a310acd37f
check HMD usage for tutorial teleport
2017-04-18 18:46:53 -04:00
Dante Ruiz
f8ec49eb96
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-18 21:53:37 +01:00
Dante Ruiz
5cd4007aaa
got input recording working
2017-04-18 21:53:23 +01:00
Seth Alves
0807e036e8
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-18 11:59:23 -07:00
Seth Alves
d077c9f1de
print rather than crash in what should be an impossible situation
2017-04-18 11:58:56 -07:00
Andrew Meadows
da55c96c4c
protect against crash on invalid scene on shutdown
2017-04-18 11:52:22 -07:00
Andrew Meadows
014d7b8d8d
use viewFrustum position for laser pointer render filtering
2017-04-18 11:52:22 -07:00
Andrew Meadows
71c5644c23
more shared_ptr by const reference
2017-04-18 11:52:22 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Andrew Meadows
0cc6763617
fix build by including EntityItem.h
2017-04-18 11:52:22 -07:00
Andrew Meadows
e60a28620d
cleanup FancyCamera implementation
2017-04-18 11:52:22 -07:00
Andrew Meadows
a3682a1a0e
cleanup includes in Avatar.cpp and remove cruft
2017-04-18 11:52:21 -07:00
Andrew Meadows
5a458c9923
remove last qApp usage from Avatar class
2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c
remove Camera argument from Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
fbacbd74f7
pass shared pointers by ref in Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a
more interface-only spaghetti out of Avatar
2017-04-18 11:52:21 -07:00
Andrew Meadows
272cf07c31
removed cruft: unused Camera::toViewFrustum()
2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
kunalgosar
d215856b23
cleanup to blendshapes
2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258
setBlendshapes will presist
2017-04-18 11:44:59 -07:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
Seth Alves
d84dd4ce67
Merge pull request #10234 from druiz17/webview-redesign
...
tablet webview navigation bar redesigned
2017-04-18 10:23:39 -07:00
Seth Alves
b2de5ebdaf
Merge pull request #10136 from mittens/21217
...
Added quadratic ease-in-and-out smoothing to remote avatars
2017-04-18 10:05:48 -07:00
David Rowe
dae6d6fb69
Stub desktop dialog to select recording to play from ATP assets
2017-04-18 11:43:42 +12:00
Dante Ruiz
e46d9da98f
fixed merge conflict
2017-04-18 00:22:35 +01:00
Zach Fox
9c4e367245
Merge pull request #10213 from zfox23/fixGoToFocus
...
FB 4156; Fix GoTo text field focus; other GoTo tweaks
2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352
Entirely remove addressBarToggle()
2017-04-17 12:13:01 -07:00
Dante Ruiz
3eb9b37c29
Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign
2017-04-17 16:41:15 +01:00
David Kelly
3e268fbf68
put shareable_url in UserStory details when creating
2017-04-17 07:38:24 -07:00
Anthony J. Thibault
a10b157aff
First pass at having an explicit Hips IK target.
...
Also, AnimManipulator nodes support setting position and rotation on a single joint.
2017-04-14 17:00:44 -07:00
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Sam Gateau
3519a72f8a
Merge pull request #10190 from samcake/ambient-bis
...
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110
avatar-action-far-grab works now
2017-04-14 12:44:54 -07:00
Thijs Wenker
6f58e91d76
Merge pull request #10121 from birarda/bug/recording-cache
...
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Seth Alves
b1dc5be316
make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar
2017-04-14 11:48:06 -07:00
Dante Ruiz
7189d4d7fa
daving web work
2017-04-14 17:01:23 +01:00
Zach Fox
d9dc8ebc41
More improvements
2017-04-13 15:48:51 -07:00
Seth Alves
0dab94fada
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:34:46 -07:00
Seth Alves
0eb9507a10
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:25:50 -07:00
Zach Fox
75f1168b19
Clearer function names
2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b
Checkpoint!
2017-04-12 14:45:56 -07:00
Chris Collins
c545558b8a
Merge pull request #10199 from AndrewMeadows/avatar-should-vanish
...
Avatar should vanish when teleporting far away
2017-04-12 12:28:46 -07:00
Zach Fox
39587d5308
lol
2017-04-12 10:54:28 -07:00
Seth Alves
cc77fce95f
hinge is sort-of working
2017-04-12 07:12:05 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
Andrew Meadows
b8a3c856be
update model transform even when out of view
2017-04-11 15:03:11 -07:00
Zach Fox
6569de697d
Merge pull request #10187 from zfox23/fix/getAvatar_Fix
...
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
samcake
79bcf95792
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-11 10:00:34 -07:00
Seth Alves
bf16309917
Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002
...
avoid invisible avatars redux
2017-04-11 07:07:03 -07:00
Stephen Birarda
db6fc40277
fix ScriptAvatar promotion of AvatarData
2017-04-10 22:15:45 -07:00
Stephen Birarda
b8620f6919
make getAvatar in AvatarManager Q_INVOKABLE
2017-04-10 22:15:45 -07:00
Stephen Birarda
e7299a5435
add missing include for ScriptAvatar in AvatarManager
2017-04-10 22:15:45 -07:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Zach Fox
54ca8bd89e
grab audio loudness from correct avatar
2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a
add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts
2017-04-10 22:15:45 -07:00
Stephen Birarda
4ed22ad7ac
move audio loudness to AvatarData, change AvatarData to ScriptOwnership
2017-04-10 22:15:44 -07:00
Seth Alves
05bf1930ca
Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame
...
Added accessor to get Avatar default pose in avatar space
2017-04-10 12:55:02 -07:00
samcake
16e6f0900d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-10 10:12:23 -07:00
Philip Rosedale
c74778116a
Merge pull request #10156 from Triplelexx/21256
...
21256 - Add packet loss % to stats
2017-04-09 18:00:01 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
Triplelexx
7936637e9c
and tired..
2017-04-09 11:02:35 +01:00
Triplelexx
54eb7c10c6
distracted
2017-04-09 10:50:22 +01:00
Triplelexx
ec6885a2fb
change audioPacketLoss stat to display largest of upstream/downstream loss
2017-04-09 09:49:41 +01:00
Chris Collins
8e12f62cbb
Merge pull request #10153 from druiz17/goto-fix
...
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
Anthony J. Thibault
e065c1bac4
Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API
2017-04-07 14:12:03 -07:00
Anthony J. Thibault
40844d2a49
Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API.
2017-04-07 14:03:31 -07:00
Seth Alves
03065ee6c8
Merge pull request #9938 from kunalgosar/jsRenderBug
...
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
Andrew Meadows
92495d9622
delete in proper order on shutdown
2017-04-07 11:10:48 -07:00
Andrew Meadows
8773497f7e
remvoe commented out cruft
2017-04-07 11:08:06 -07:00
Andrew Meadows
1fb88a0315
add a helpful comment
2017-04-07 11:08:06 -07:00
Andrew Meadows
6d627aa9bc
don't remove other avatars on sign-out
2017-04-07 11:08:06 -07:00
Andrew Meadows
2f18e51f6b
lock mutex around fading avatar list
2017-04-07 11:08:06 -07:00
Andrew Meadows
662c34c266
fix avatar scale animation and avatar render debug
2017-04-07 11:06:16 -07:00
Triplelexx
4c2823b42d
change increment operator
2017-04-07 18:21:43 +01:00
Andrew Meadows
40e223cb82
cleanup unused return values and redundant variables
2017-04-07 09:58:04 -07:00
Andrew Meadows
2775b17a65
unravel one loop of spaghetti
2017-04-07 09:56:26 -07:00
Andrew Meadows
b9c7d6351f
Merge pull request #10135 from samcake/ambient
...
Rename render::PendingChanges to render::Transaction
2017-04-07 09:54:10 -07:00
Triplelexx
fcfd206e9c
change implict conversions
2017-04-07 17:47:04 +01:00
Triplelexx
27a404d0ea
remove extra lines
2017-04-07 07:09:18 +01:00
Triplelexx
279997d905
change display plugin to deactivate when window minimized
2017-04-07 06:49:28 +01:00
Seth Alves
584905a618
fix warning
2017-04-06 15:41:35 -07:00
Dante Ruiz
a89081601c
fix merge issues
2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3
Merge pull request #10103 from vladest/master-qml-bugfixes
...
Master qml bugfixes
2017-04-06 14:22:06 -07:00
trent
21f810e040
Fixed formatting concerns as well as a benign order-of-constructor warning.
2017-04-06 14:50:16 -04:00
trent
76d3e6d598
Added an assert for out-of-bounds values in the smoothing function; also clamped the values that I was sending in on the avatar-side.
2017-04-06 13:21:59 -04:00
Triplelexx
1b2887d5b1
change paintGL to return if window is minimized
2017-04-06 17:06:06 +01:00
Triplelexx
f588612fc3
add audioPacketLoss % display in stats
2017-04-06 16:04:14 +01:00
trent
43b3a6c624
Addressing some style inconsitency issues, as well as making the position/orientation times constants.
2017-04-05 21:31:13 -04:00
Dante Ruiz
90f5d02c99
goto toggle option
2017-04-06 00:13:53 +01:00
trent
c739db7562
Added quadratic ease-in-and-out smoothing to remote avatars position/orientation updates (through... one path, at least?).
2017-04-05 17:39:52 -04:00
samcake
1a9005ed8b
Avoid unexpected changes
2017-04-05 13:57:40 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
kunalgosar
8749428ede
dont assume no query tags
2017-04-04 13:51:34 -07:00
howard-stearns
6f79b2eaeb
send initial path in location update (e.g., on login)
2017-04-04 12:05:43 -07:00
kunalgosar
cc81bcab66
updating url check from hifi master
2017-04-04 11:58:38 -07:00
Kunal Gosar
e5c075f107
fix typo and namespace
2017-04-04 11:54:58 -07:00
kunalgosar
8e4229b211
dont redirect people from webentity
2017-04-04 11:54:58 -07:00
kunalgosar
3b88553699
check scripts
2017-04-04 11:54:58 -07:00
kunalgosar
9d0667cb31
add url tag to web entities
2017-04-04 11:54:58 -07:00
kunalgosar
19ab7526d3
apply profile to relevant entities
2017-04-04 11:54:21 -07:00
kunalgosar
9b758dbdba
updated headers
2017-04-04 11:54:21 -07:00
kunalgosar
a0f0879087
added file type filter and interceptor
2017-04-04 11:54:21 -07:00
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -07:00
Lexx
af95741a7e
Merge branch 'master' into 21224
2017-04-04 18:24:49 +01:00
Triplelexx
b4b5d4fe9b
resolve merge conflict
2017-04-04 18:15:12 +01:00
Triplelexx
01b13d7032
fix crash when pressing "Bookmark Avatar" button
...
also modified LocationBookmarks for consistency
2017-04-04 18:05:00 +01:00
Vladyslav Stelmakhovskyi
072e024d9a
Fixed warning in JSConsole
2017-04-04 16:10:37 +02:00
Thijs Wenker
2b85563413
Merge pull request #10115 from sethalves/fix-fast-talking
...
Fix fast talking
2017-04-04 02:13:09 +02:00
Seth Alves
fbf2014f04
Merge pull request #10102 from vladest/tablet-ui-goto
...
Put current address to location instead of inputfield
2017-04-03 16:09:58 -07:00
Seth Alves
55c2d36752
math fixes, cleanups
2017-04-03 15:30:06 -07:00
Seth Alves
2a43c41954
Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking
2017-04-03 14:44:13 -07:00
Seth Alves
7ac09398be
include deltaTime in audioAttack running average
2017-04-03 14:44:05 -07:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
Seth Alves
7f1095c590
use deltaTime rather than calling usecTimestampNow
2017-04-03 11:55:08 -07:00
Seth Alves
9e08925d7e
involve clock time in _mouthTime calculation
2017-04-03 11:34:29 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
c45514a557
Merge pull request #10066 from vladest/tablet-ui-connection-dialog
...
Implemented no connection dialog for Tablet UI
2017-04-03 09:57:00 -07:00
Seth Alves
98a54d9119
Merge pull request #10101 from ctrlaltdavid/21252
...
Fix tablet scrolling getting stuck to mouse pointer
2017-04-03 09:52:45 -07:00
Seth Alves
0f936f7511
Merge pull request #10078 from hyperlogic/feature/avatar-skeleton
...
Expose Avatar Skeleton to JavaScript
2017-04-03 09:39:35 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987
Fix tablet window getting stuck to pointer if release mouse off tablet
2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9
Merge pull request #10091 from ctrlaltdavid/21248
...
Fix HTML controls not working properly in the tablet
2017-04-01 08:41:44 -07:00
Chris Collins
cc8b52fff4
Merge pull request #10095 from druiz17/tablet-webView2.0
...
Tablet webview now uses mobile format
2017-04-01 08:33:09 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
Dante Ruiz
b10f491c6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0
2017-04-01 00:58:37 +01:00
Dante Ruiz
d1bf3e4bf2
fixed webview mobile view
2017-04-01 00:58:09 +01:00
Andrew Meadows
0181783290
Merge pull request #10064 from samcake/ambient
...
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
2017-03-31 16:04:00 -07:00
Chris Collins
b36f688a5a
Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default
...
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 15:34:37 -07:00
David Rowe
25ac82f162
Don't send "move" events for non-move events
2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240
Fix controls in HTML pages not responding to mouse events on tablet
2017-04-01 10:40:06 +13:00
Clément Brisset
9d0676dd87
Merge pull request #10088 from huffman/stable-merge
...
Stable merge
2017-03-31 14:27:42 -07:00
howard-stearns
5c8b2ba1c3
restore lost code
2017-03-31 13:28:14 -07:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Vladyslav Stelmakhovskyi
7558765042
Script log now back to HUD
2017-03-31 14:20:15 +02:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
Anthony J. Thibault
22901a40c8
Expose Avatar skeletons to JavaScript
2017-03-30 17:27:40 -07:00
Ryan Huffman
150dcd7dec
Merge remote-tracking branch 'upstream/master' into stable-merge
2017-03-30 14:22:27 -07:00
Howard Stearns
3056bb16a2
typo, and delete request on abort/fail
2017-03-30 12:40:54 -07:00
Triplelexx
8aa3e56ad4
remove dead code
2017-03-30 19:47:50 +01:00
Triplelexx
57d6213175
remove dead code
2017-03-30 19:42:25 +01:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
Triplelexx
ae3f04288d
cleanup
2017-03-30 14:56:04 +01:00
Triplelexx
aa9a2532a9
fix for displaying "Bookmark Avatar" dialog in tablet ui
2017-03-30 13:54:33 +01:00
Triplelexx
bec70976d8
change hidden overloading
2017-03-30 12:07:19 +01:00
David Rowe
06910d1881
Add comment re scrollbar stability in tablet
2017-03-30 14:20:02 +13:00
David Rowe
f954767b84
Get entities list and entity properties scrollbars working on tablet
2017-03-30 14:04:03 +13:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
Howard Stearns
af25e0e21f
Don't consider changes to location details as update-worthy if we're not discoverable.
2017-03-29 17:55:57 -07:00
Triplelexx
50e35a220b
Merge remote-tracking branch 'upstream/master' into 21224
2017-03-30 01:25:27 +01:00
Howard Stearns
3a7edebb94
Adjust reporting of availability to metaverse.
2017-03-29 16:12:50 -07:00
Seth Alves
371df35013
remove code related to tablet being a model rather than an overlay. start on landscape mode
2017-03-29 14:16:14 -07:00
Delamare2112
3ebe1a0015
Add AvatarInputs::loudnessToAudioLevel
2017-03-29 14:01:27 -07:00
Howard Stearns
b8f557ca54
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
2017-03-29 13:30:15 -07:00
Delamare2112
2f6add3398
Expose LimitlessSpeechRecognition to scripts
2017-03-29 12:56:08 -07:00
Delamare2112
4f7cbd5b7c
Add limitless connection and scripting interface
2017-03-29 12:47:58 -07:00
samcake
9bc7e41642
Remove extra calls for binding default textures, not needed
2017-03-29 10:57:08 -07:00
Vladyslav Stelmakhovskyi
209de29b2a
Intial commit. Basically works. Need some testing
2017-03-29 17:36:05 +02:00
Howard Stearns
c795d2ca3b
Four-way discoverability. (Needs testing.)
2017-03-28 18:31:08 -07:00
Zach Fox
b776f25b3b
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b
Revert "Merge from upstream/master"
...
This reverts commit b5ba4a109d
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d
Merge from upstream/master
2017-03-28 17:37:34 -07:00
Triplelexx
255e781cc7
check-in after menu experiments
...
https://highfidelity.fogbugz.com/f/cases/3714
2017-03-29 00:48:14 +01:00
howard-stearns
c2a49a582e
send credentials to local metaverse servers, and initial users data
...
integration.
2017-03-28 16:44:16 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
39ec53d69a
Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
...
Mark the system TabletProxy object as Cpp ownership.
2017-03-28 10:08:05 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
ec6ef01600
Mark the system TabletProxy object as Cpp ownership.
...
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
2017-03-28 09:53:00 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Dante Ruiz
65be71fa69
min diff
2017-03-28 00:05:02 +01:00
Dante Ruiz
7434cc5644
force vto to false on start up
2017-03-28 00:02:02 +01:00
howard-stearns
85347e3269
new location protocol
2017-03-27 15:55:05 -07:00
Dante Ruiz
02535722ba
removed visible to others opition from general settings
2017-03-27 23:31:41 +01:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
...
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
David Kelly
5c1e085e7b
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 11:29:18 -07:00
David Kelly
76657a670c
added notifications (faked user name for now), along with switch to avatar entities
2017-03-27 11:28:57 -07:00
Dante Ruiz
cba7adf32a
removed qDebug
2017-03-27 19:08:41 +01:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -07:00
Triplelexx
07e6b766b5
rename FILENAME constants
2017-03-26 23:10:50 +01:00
Triplelexx
dc64065668
Merge remote-tracking branch 'upstream/master' into 21224
...
update
2017-03-26 22:20:24 +01:00
Triplelexx
a1db20c5fc
cleanup for QA
...
added sorting
2017-03-26 22:18:37 +01:00
Seth Alves
bb28976d0e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-26 09:32:35 -07:00
Triplelexx
8f507942cf
change storage location
...
still unsure what is best. this is consistent and doesn't require login
2017-03-25 19:10:12 +00:00
Seth Alves
3abd6b3948
Merge pull request #10006 from druiz17/tablet-help
...
Ported help into the tablet
2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704
Merge branch 'tablet-ui' into tablet-ui-audio-screen
2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb
Implemented Audio settings screen for Tablet UI
2017-03-25 13:17:38 +01:00
humbletim
96f905362b
alternative way to connect the button?
2017-03-25 01:17:27 -04:00
Triplelexx
d1eee19d7d
move more Bookmark functionality into base class
2017-03-25 01:01:25 +00:00
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -07:00
Anthony J. Thibault
49a95089d1
Remove hacks for debug rendering of IK targets
...
A AnimContext class was introduced. This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
(cherry picked from commit a028d3ba58
2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3
Added developer option to draw IK targets in world.
...
(cherry picked from commit 7e7803c648
2017-03-24 16:20:52 -07:00
Triplelexx
bda1d54209
create AvatarBookmarks
...
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
2017-03-24 22:58:36 +00:00
Dante Ruiz
6178a86a46
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-24 23:56:33 +01:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Anthony J. Thibault
f7de74109b
Added jsdoc documentation for some of MyAvatar properties and methods
2017-03-24 15:10:26 -07:00
Zach Fox
056d6fbe4f
Actually merge from master
2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087
Revert "Merge from Master"
...
This reverts commit e48123b5bb
2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub
1972b140b9
Merge pull request #9976 from mittens/21215
...
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
2017-03-24 08:52:12 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59
Merge pull request #9970 from Triplelexx/21223
...
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea
Added inputMode property to Web3DOverlay.
...
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
Anthony J. Thibault
8915ecd23d
compile time option to switch from touch to mouse events for web tablet
2017-03-23 13:54:17 -07:00
Zach Fox
e48123b5bb
Merge from Master
2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Dante Ruiz
e708c6478e
Merge branch 'tablet-popup' into tablet-help
2017-03-23 17:35:45 +01:00
Dante Ruiz
af97c7275e
Use loadQMlSource if no stack is aviable
2017-03-23 17:03:24 +01:00
Triplelexx
09cbace975
remove unused getBodyForwardDirection
2017-03-22 21:54:21 +00:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
trent
36619cd2e4
Fixed issue with duplicate physics status icons per sub-object.
2017-03-22 15:07:29 -04:00
Triplelexx
fd312f6bf8
rename fronts to forwards
2017-03-22 18:49:34 +00:00
Dante Ruiz
3a89654111
saving work
2017-03-22 19:14:53 +01:00
Triplelexx
8df0395754
change getFrontDirection to getForwardDirection
2017-03-21 22:28:12 +00:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Seth Alves
91cac892d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 14:04:58 -07:00
Chris Collins
4c789c44aa
Merge pull request #9922 from birarda/bug/stuck-ess
...
fix a couple of ESS issues during ES/ESS restart
2017-03-21 12:44:53 -07:00
Seth Alves
1da6349505
merge from upstream
2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3
Merge pull request #9712 from huffman/feat/edit-particle-icon
...
Add particle system overlay in edit.js
2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Chris Collins
ea13151d55
Merge pull request #9945 from mnafees/21233
...
21233: Remove Scripts Editor option from Edit menu and all related files
2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi
fb0adae0b1
Scripts debug window in Tablet UI
2017-03-21 15:04:38 +01:00
Zach Pomerantz
20ea13e00a
Merge pull request #9897 from zzmp/record/noise-gate
...
Add AudioNoiseGate to recordings played through Interface
2017-03-21 00:21:20 -04:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Vladyslav Stelmakhovskyi
cedc3cf8b6
Fix naming. Move variable instantiation within scope
2017-03-20 23:43:01 +01:00
Stephen Birarda
a4d72c4e67
make AudioScriptingInterface a Dependency
2017-03-20 13:40:15 -07:00
Zach Fox
6c4b23195b
One-line warning fix...I swear I've done this before
2017-03-20 13:26:50 -07:00
Zach Fox
0506fc0033
New goTo() behavior; Fix goBack
2017-03-20 12:55:38 -07:00
Vladyslav Stelmakhovskyi
13cd500c2e
Make runningscripts able to open even if there is no scripts running
2017-03-20 20:46:37 +01:00
Brad Hefta-Gaub
bc5d7d8698
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
...
zero velocity of deactivated dynamic entities
2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub
af790d8474
Merge pull request #9875 from birarda/bug/spin-strafe
...
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Chris Collins
af2748410d
Merge pull request #9932 from Triplelexx/21231
...
21231 - Remove About Interface from File menu
2017-03-20 09:55:57 -07:00
Chris Collins
509057c6d8
Merge pull request #9941 from Triplelexx/21232
...
21232 - Remove Mini Mirror from View menu
2017-03-20 09:55:37 -07:00
Chris Collins
ed27c550af
Merge pull request #9939 from ctrlaltdavid/21237
...
Disable Developer > Assets > ATP Asset Migration menu item
2017-03-20 06:29:33 -07:00
Chris Collins
2e6291f470
Merge pull request #9929 from ctrlaltdavid/21235
...
Replace Developer > Network > Disk cache editor with menu action
2017-03-20 06:26:36 -07:00
Seth Alves
424af2255b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-19 21:17:30 -08:00
Mohammed Nafees
3612b9fccc
Remove Edit > Scripts Editor and all related source files
2017-03-20 00:25:50 -04:00
Vladyslav Stelmakhovskyi
696825580e
Merge branch 'tablet-ui' into tablet-ui-login-logout
2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi
5e162a6447
Implemented login facility for tablet UI
2017-03-18 14:38:49 +01:00
Triplelexx
8e086a8fc8
fix build error
2017-03-18 03:51:55 +00:00
Triplelexx
a9b1a38665
remove Mini Mirror from View menu
...
Avatar inputs only contains the audio meter now.
2017-03-18 00:53:13 +00:00
David Rowe
ab7d82edb6
Use #ifdef instead of comment
2017-03-18 12:56:34 +13:00
David Rowe
38bb48e72c
Disable Developer > Assets > ATP Asset Migration menu item
2017-03-18 12:13:13 +13:00
David Rowe
e3b9d588ec
Merge branch 'master' into 21235
...
# Conflicts:
# interface/src/Menu.cpp
# interface/src/ui/DialogsManager.h
2017-03-18 09:42:36 +13:00
Brad Hefta-Gaub
a75acd139b
Merge pull request #9885 from sethalves/model-scripting
...
Model scripting
2017-03-17 13:13:17 -07:00
Triplelexx
eba6c8de5e
remove About Interface from File menu
2017-03-17 17:37:19 +00:00
Andrew Meadows
60e0eb0cf9
Merge pull request #9917 from Atlante45/fix/sit
...
Cancel Avatar velocity when sitting down.
2017-03-17 10:04:25 -07:00
Atlante45
698791295a
Expose DriveKeys enum to JS
2017-03-16 20:03:27 -07:00
David Rowe
939b4f1612
Remove Developer > Network > Disk Cache Editor menu item and dialog
2017-03-17 13:49:09 +13:00
Atlante45
5a1ce4bb05
CR
2017-03-16 17:46:47 -07:00
Atlante45
9155cc6334
Fix windows warnings
2017-03-16 17:44:56 -07:00
David Rowe
e21d7d9edf
Add Developer > Network > Clear Disk Cache menu action
2017-03-17 13:34:11 +13:00
David Rowe
dc71f502f0
Delete Developer > Network > RAM Caches Size menu item and dialog
2017-03-17 13:09:06 +13:00
Seth Alves
a5d19439f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-16 16:32:07 -07:00
Atlante45
42316e713d
CR drive keys
2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878
CR
2017-03-16 16:24:36 -07:00
Atlante45
7517f224a8
Add MyAvatar drive keys capture capability
2017-03-16 15:44:17 -07:00
Zach Fox
fc2a501474
Cleanup JS<->QML messaging
2017-03-16 15:38:39 -07:00
Andrew Meadows
6f4d9bfba3
Merge pull request #9858 from kunalgosar/logBolding
...
Change to Log Font and Formatting
2017-03-16 13:09:37 -07:00
Zach Fox
b3821bb02d
fix location vs AddressManager woes
2017-03-16 12:57:21 -07:00
Seth Alves
eba2417f41
Merge pull request #9912 from AndrewMeadows/model-cleanup-4
...
minor cleanup of render pipeline for models and avatars
2017-03-16 10:39:43 -08:00
kunalgosar
e7a16d4294
code standard fixes
2017-03-16 10:53:35 -07:00
Zach Fox
05fec328c0
Make tablet popups work like they should
2017-03-16 10:38:46 -07:00
Seth Alves
31e0cfe296
Merge pull request #9825 from thoys/record-fixes
...
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
Andrew Meadows
361e03fc78
remove unused variable
2017-03-15 16:57:31 -07:00
Seth Alves
693aee0628
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-03-15 16:54:40 -07:00
howard-stearns
84fd17bd88
use location.metaverseServerUrl instead of hardcoded value.
2017-03-15 16:33:23 -07:00
Andrew Meadows
d3fa28d4bc
remove cruft and fix indentation
2017-03-15 16:17:59 -07:00
howard-stearns
155e1b8e85
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-15 15:45:36 -07:00
Andrew Meadows
f250c0d298
simpler bindTransform() for ModelMeshPartPayload
2017-03-15 14:41:13 -07:00
Vladyslav Stelmakhovskyi
a4c0ce4240
Typo fix
2017-03-15 22:13:37 +01:00
Vladyslav Stelmakhovskyi
856e15060d
Implemented Domain Connection statistics for Tablet UI
2017-03-15 21:05:13 +01:00
Seth Alves
b66ff19595
prefer-avatar-finger-over-stylus setting now defaults to true
2017-03-15 09:51:30 -08:00
Anthony Thibault
495deba771
Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races
...
Fixes for race conditions in DebugDraw
2017-03-15 10:38:26 -07:00
Zach Pomerantz
789bb7c855
rename audio(Mic)OutboundPPS
2017-03-15 13:30:39 -04:00
Seth Alves
c53b0dff93
Merge pull request #9891 from druiz17/tablet-xbox-fix
...
Allow the user to bring up the tablet when a message is open
2017-03-15 08:43:28 -08:00
Seth Alves
563d59bda9
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
...
Tablet ui entity statistics
2017-03-15 08:40:52 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Vladyslav Stelmakhovskyi
181c7da51a
Fixed warnings
2017-03-15 14:55:53 +01:00
Dante Ruiz
45829574c2
Allow the user to bring up the tablet when a message is open in the tablet
2017-03-15 00:02:42 +01:00
samcake
e0f0cc2102
Fix the unsupported ktx format, it was coming from the BUmp map case
2017-03-14 15:49:44 -07:00
Stephen Birarda
490cb83489
move advanced movement control changes to MyAvatar
2017-03-14 15:03:01 -07:00
Stephen Birarda
1fe02477b0
fix LX behaviour in snap/advanced/basic
2017-03-14 14:21:21 -07:00
Vladyslav Stelmakhovskyi
e2a4011b05
Coloring implemented
2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077
Servers stats added. TODO: coloring
2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi
d9ca8a826d
TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats
2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi
99c74cec41
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca
Merge branch 'tablet-ui' into tablet-ui-graphics
2017-03-14 15:37:36 +01:00
Seth Alves
e8a9ff867d
merge from upstream
2017-03-13 17:57:01 -07:00
Brad Davis
eab91d061d
Merge pull request #9868 from zzmp/ktx/local-not-roaming
...
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Anthony J. Thibault
efc7fbacb1
Bug fix for potential crash when getting DebugDraw::instance
...
(cherry picked from commit b0ad9a8110
2017-03-13 15:23:10 -07:00
Ryan Huffman
8a1bd781f0
Fix overlay findRayIntersection not properly handing multiple drawInFront overlays
2017-03-13 14:44:14 -07:00
Brad Davis
3bef5ad528
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2
use QStandardPaths instead of hardcoded paths
2017-03-13 17:26:42 -04:00
David Rowe
4dd7667fd7
Merge branch 'tablet-ui' into 21209
...
# Conflicts:
# interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi
9e9c64021c
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-13 19:54:40 +01:00
howard-stearns
db06c2650f
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-13 11:53:48 -07:00
Andrew Meadows
546f32431d
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
...
Various noise gate, scope, and audio stats improvements
2017-03-13 11:52:16 -07:00
howard-stearns
ee3ca736fd
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-13 11:51:39 -07:00
Vladyslav Stelmakhovskyi
48db6201e5
Basic statistics showed. TODO: servers statistics, coloring, wrapping
2017-03-13 19:48:50 +01:00
Andrew Meadows
6e7f4b0418
Merge pull request #9829 from ZappoMan/addDoubleClick
...
Add double click message support to entities and overlays
2017-03-13 10:44:54 -07:00
Zach Fox
beb848373b
Update from zfox23/PALv2 branch
2017-03-13 10:15:06 -07:00
Seth Alves
4f71a5b234
Merge pull request #9864 from vladest/tablet-ui-lod-settings
...
Add LOD settings to Tablet UI
2017-03-13 08:59:40 -08:00
Seth Alves
ffd4d1488c
Merge pull request #9866 from vladest/tablet-ui-lodtools
...
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi
49055cfa5c
Some statistics showed
2017-03-13 16:31:29 +01:00
Seth Alves
b3003acb97
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
...
Bring of menu window if tablet is closed on desktop
2017-03-12 12:20:29 -08:00
Brad Hefta-Gaub
a38965d628
add more audio stats
2017-03-11 09:50:30 -08:00
Vladyslav Stelmakhovskyi
81bc56f124
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi
d70943dd6c
Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences
2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi
9f7c5a1603
Add LOD settings to Tablet UI
2017-03-11 11:54:44 +01:00
David Rowe
74839b24a3
Merge branch 'tablet-ui' into 21209
2017-03-11 15:56:38 +13:00
Brad Hefta-Gaub
6ce50269ac
add audio mixer in/out stats to the client stats
2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub
aa65f03509
fix mac warning and remove accidentally added whitespace
2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub
7eb4b8f5f7
expose AudioScope to QML
2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub
eaea718de1
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
2017-03-10 17:08:19 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Dante Ruiz
8a973dae3c
fixed bring menu dialogs in tablet
2017-03-10 23:21:29 +00:00
David Rowe
71713b10f3
Merge remote-tracking branch 'upstream/tablet-ui' into 21209
...
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-11 09:14:06 +13:00
kunalgosar
a974282bdf
bolding timestamps on log
2017-03-10 11:55:36 -08:00
Dante Ruiz
78da936344
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs
2017-03-10 19:33:51 +00:00
Dante Ruiz
9b3810814e
fiexed putting menu items on the hud when tablet not open when on desktop screen
2017-03-10 18:40:18 +00:00
Seth Alves
fffff817a3
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-10 10:20:40 -08:00
Andrew Meadows
8ddcae2a15
restore transform of deactivated entities
2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8
comments, namechange, and temporary debug code
2017-03-09 17:26:53 -08:00
Dante Ruiz
c6c0c6d382
toolbar becomes visible after taking a snapshot
2017-03-09 22:54:22 +00:00
Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -08:00
druiz17
8750982567
Merge pull request #9785 from druiz17/menuFix
...
More dialog porting to tablet
2017-03-09 09:29:31 -08:00
Dante Ruiz
b58a27cf10
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-09 16:26:28 +00:00
Seth Alves
9435c58c2c
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1
2017-03-08 16:10:38 -08:00
Seth Alves
7f47835733
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 16:10:18 -08:00
David Rowe
1fc6d82456
Tablet and desktop versions of avatar attachments dialog
2017-03-09 13:04:57 +13:00
Seth Alves
28ade45f97
make maxFPS a property
2017-03-08 15:30:15 -08:00
Seth Alves
ae48dae96f
get rid of toggleTabletUI lockout period
2017-03-08 15:29:46 -08:00
Atlante45
97c376a09c
Revert "avoid unnecessary copy of priority_queue"
...
This reverts commit e54812430e
2017-03-08 14:08:58 -08:00
Atlante45
188287e345
Revert "minor cleanup"
...
This reverts commit 14e7392a89
2017-03-08 14:08:52 -08:00
Atlante45
9a9f07df71
Revert "expand avatar update time budget"
...
This reverts commit 4bbbcb61be
2017-03-08 14:08:48 -08:00
Atlante45
8bf9b70915
Revert "don't blend animations for otherAvatars"
...
This reverts commit faa272c67c
2017-03-08 14:08:33 -08:00
