samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -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
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
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
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
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
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
Zach Pomerantz
3093a73ce1
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-15 15:04:06 -04:00
Zach Fox
60549075dd
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-15 10:09:07 -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
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
Brad Davis
7a6df850c5
Fix crash on exit when tablet is open
2017-06-14 13:22:53 -07: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
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
4a39798a97
sticky audio selection
2017-06-13 14:38:52 -04:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
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
Zach Pomerantz
b5dab39f83
sticky mic meter / noise reduction
2017-06-12 18:41:32 -04:00
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04: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
samcake
bb38938534
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-09 14:34:25 -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
Seth Alves
5b62c9e83b
try again to get forward not-looking-at-anyone gaze to work right
2017-06-09 10:45:04 -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
NeetBhagat
c5d8268007
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-09 18:04:34 +05:30
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
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
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
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
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
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
humbletim
7cab0363a9
standalone 21180 branch with just the C++ changes
2017-06-05 15:57:54 -04:00
Seth Alves
3ab67cf27e
fix forward gaze in HMD while not looking at anyone
2017-06-05 11:44:27 -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
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
Seth Alves
3359a0a794
work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation
2017-06-02 15:29:20 -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
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
Sam Gateau
8a2837e1f7
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-02 11:52:11 -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
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
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
ac6135387c
display plugins are never head controllers
2017-06-01 13:37:16 -07:00
Stephen Birarda
792d938262
send quit event during shutdown on thread, with timeout
2017-06-01 13:01:24 -07:00
Seth Alves
eb94c48c5b
merge from upstream
2017-06-01 10:10:11 -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
Stephen Birarda
1d9d83b157
initial version of the ClosureEventSender using std::thread
2017-05-31 19:00:41 -07:00
Seth Alves
e37387f45c
sync
2017-05-31 14:01:09 -07:00
NeetBhagat
58142817a1
Resolve the review comments of @ZappoMan.
2017-05-31 19:18:14 +05:30
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
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
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
samcake
882df7391b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-26 16:47:49 -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
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
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
Seth Alves
af5ba3a90a
ask display-plugins if they are head-controllers
2017-05-25 15:14:10 -07:00
Andrew Meadows
3bd0c111d7
verify empty ShapeManager in Application dtor
2017-05-25 13:47:40 -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
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
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
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
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
Sam Cake
7f9c98a922
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-22 22:54:43 -07:00
Atlante45
10eb353126
Ensure user never loses its running scripts
2017-05-22 18:55:58 -07:00
Dante Ruiz
d98e7d5bc6
adding left and right arm
2017-05-23 00:26:12 +01:00
David Rowe
9f83ca518f
Merge branch 'master' into 21359
2017-05-23 09:18:10 +12:00
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
Sam Gateau
36ac623e66
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-19 13:25:36 -07:00
Atlante45
c2e2682eff
Fix "Reset Settings" window poping up every time
2017-05-19 10:50:23 -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
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -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
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -07: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
howard-stearns
bca2cf45c0
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-05-12 15:21:03 -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
samcake
3393456d91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-12 10:15:13 -07:00
samcake
39241bec13
Prototyping a way to produce a selfie and use the rendering directly
2017-05-11 15:58:31 -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
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
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
samcake
c36035d3eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-09 10:46:38 -07:00
Vladyslav Stelmakhovskyi
7ab6909c77
Merge branch 'master' into audio-source-sync
2017-05-09 11:08:08 +02: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
Zach Pomerantz
929079df97
add launch.tester to user_actions
2017-05-08 19:33:09 -04:00
Vladyslav Stelmakhovskyi
d0111ac0bb
Merge branch 'master' into audio-source-sync
2017-05-08 20:09:34 +02:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -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
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
Vladyslav Stelmakhovskyi
e395a51c60
Merge with master
2017-05-05 07:05:16 +02:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07: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
Vladyslav Stelmakhovskyi
ba5a371da1
Decrease CPU usage in tabletUI periodical updates
2017-05-04 22:54:41 +02:00
Zach Pomerantz
ad8d3e5490
continue idling while minimized
2017-05-02 20:05:55 -04:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02: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
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
Brad Davis
40e4e2f307
Merge pull request #10327 from jherico/face_tracker_refactor
...
Remove Faceshift
2017-05-01 12:14:55 -07: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
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
Anthony J. Thibault
108cd80bb5
Merge branch 'master' into feature/head-standard-action
2017-04-28 10:41:29 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -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
Zach Fox
3ce81844da
Snapshot JS interface for better Settings handling
2017-04-27 14:01:08 -07:00
Zach Fox
16b4af8a9d
Rearchitecture
2017-04-27 14:01:06 -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
72f5860538
restore RecordingScriptingInterface to Application
2017-04-27 13:16:50 -07:00
Andrew Meadows
65682a914d
remove cufty AvatarManager LocalLights feature
2017-04-27 13:11:57 -07: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
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
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
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
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
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
a450f52427
Start to setup image library
2017-04-25 15:56:22 -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
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
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
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
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
Seth Alves
17b83dd64c
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-21 17:19:47 -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
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01: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
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
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
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
Andrew Meadows
da55c96c4c
protect against crash on invalid scene on shutdown
2017-04-18 11:52:22 -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
9cddbbc42a
more interface-only spaghetti out of Avatar
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
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
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
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
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
0dab94fada
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:34:46 -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
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -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
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
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
samcake
16e6f0900d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-10 10:12:23 -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
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
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
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
