Brad Davis
7e9ea596a0
Add more efficient overlay getters, don't use blocking calls
2017-07-07 21:00:31 -07:00
Zach Fox
d0c521d7b4
Add clarifying comment.
2017-07-07 19:19:48 -07:00
Stephen Birarda
420e9233b6
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53
Merge pull request #10906 from druiz17/audio-qml-fix
...
Made the output audio listview dynamically change height base on content size
2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294
Merge pull request #10835 from birarda/bug/invisible-avatars
...
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Zach Fox
e537c494e5
Prevent Image3DOverlays from drifting
2017-07-07 16:04:08 -07:00
Zach Fox
dbb48cd1aa
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-07 16:03:04 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a
Add signal for avatar skeleton changing
2017-07-07 11:48:12 -07:00
Zach Fox
e222753aac
Merge pull request #10911 from zfox23/PAL_adminFix2
...
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Seth Alves
fc8b7c7cc5
Merge pull request #10904 from druiz17/window-root-spam
...
fixed log spamming from windowRoot.qml in toolbar mode
2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4
Merge pull request #10909 from jherico/overlay_crashes
...
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
Zach Fox
ee9cdaff90
Set admin status even if QML can't find user in PAL
2017-07-06 23:26:40 -07:00
NeetBhagat
685b1c2445
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-07 11:30:54 +05:30
Brad Davis
f8b76d65ab
Fixing overlay crashes, for real
2017-07-06 18:01:26 -07:00
Zach Fox
1afa2d3775
Spectator camera icon
2017-07-06 16:24:50 -07:00
David Kelly
b41c470064
first cut, still stereo
2017-07-06 15:59:24 -07:00
Dante Ruiz
1ac415aa14
dynamic listview height
2017-07-06 23:50:32 +01:00
druiz17
b4182fe7ac
Merge pull request #10899 from druiz17/calibration-update-2.0
...
Updates to the Calibration UI
2017-07-06 14:24:45 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Dante Ruiz
b0130896d1
fixed spamming from windowRoot.qml
2017-07-06 22:01:08 +01:00
Dante Ruiz
1fcb3b32d6
fixed letter cap
2017-07-06 20:55:19 +01:00
Seth Alves
0374d24b15
Merge pull request #10901 from druiz17/goto-keyboard-fix
...
Fixed the keyboard not showing up for goto in HMD mode
2017-07-06 12:46:13 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
Dante Ruiz
2d876377d5
keyboard know disappears when you click of the address line
2017-07-06 20:04:44 +01:00
Dante Ruiz
de5802418f
fixed some keybaord logic
2017-07-06 19:27:48 +01:00
Dante Ruiz
4e3dba1767
goto HMD keyboard fix
2017-07-06 19:12:52 +01:00
Dante Ruiz
9e4b5693c7
fixed merge conflicts
2017-07-06 18:49:46 +01:00
anshuman64
e384f6d1b7
Merge pull request #10866 from druiz17/vive-in-desktop
...
Allowing Vive controllers and trackers to be used in desktop mode
2017-07-06 10:40:56 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-06 09:58:00 -07:00
Dante Ruiz
6e1f9d275c
chnaged default head offset
2017-07-06 17:54:06 +01:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
Dante Ruiz
258c21838e
finished calibration-ui updates
2017-07-06 17:32:40 +01:00
Andrew Meadows
4fad9d9b1a
Merge pull request #10858 from jherico/trace_cores
...
Additional threaded tracing of CPU cores
2017-07-06 08:23:21 -07:00
LaShonda Hopper
9cae868492
[Worklist #21420 ] Implement Create button disabled state (details below).
...
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.
* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.
* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
new file: interface/resources/icons/tablet-icons/edit-disabled.svg
modified: scripts/system/edit.js
2017-07-06 10:53:46 -04:00
David Kelly
936c21e849
remove unnecessary cacheDir member
2017-07-06 07:24:58 -07:00
David Rowe
cfd155c198
Merge branch 'master' into 21418
2017-07-06 16:56:10 +12:00
Atlante45
95abbd0ad4
Prevent Interface from trying to send packets bigger than an MTU
2017-07-05 17:08:04 -07:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Dante Ruiz
6c15dffb9d
added new glyph
2017-07-06 00:45:59 +01:00
Zach Fox
39bdc20b4f
On checkbox language change
2017-07-05 16:13:36 -07:00
Zach Fox
f6583a1b87
Use correct text color for checkboxes
2017-07-05 14:46:59 -07:00
Zach Fox
0af53bb4a5
Instructions and cool static :)
2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6
When a display texture isn't set, show preview instructions
2017-07-05 14:46:58 -07:00
Brad Davis
7f1bc07d04
Trying to fix overlay crashes again
2017-07-05 14:30:01 -07:00
David Kelly
89c05244bf
remove unnecessary extra update() calls
2017-07-05 13:24:31 -07:00
David Kelly
85813ac908
render issue fixes
2017-07-05 11:29:34 -07:00
Dante Ruiz
b86a8b8338
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-05 18:27:33 +01:00
Zach Fox
44cb48b17d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-05 09:59:57 -07:00
NeetBhagat
440b941730
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-05 18:47:13 +05:30
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
Seth Alves
fad686571a
Merge pull request #10874 from jherico/overlay_mutex
...
Restore mutex in overlay interface
2017-07-03 17:25:42 -07:00
Zach Fox
fcc131187d
Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup
...
Spectator Camera position/orientation update speedup
2017-07-03 16:44:12 -07:00
David Kelly
36467983d8
cr stuff
2017-07-03 16:29:26 -07:00
David Kelly
2a3b4b3bfb
minor cleanup, and adjusted includes per austin's suggestion
2017-07-03 15:54:54 -07:00
David Kelly
99bf100ff8
fix for jitter and not rendering in tablet
2017-07-03 15:19:04 -07:00
Chris Collins
1f7d2b283a
Merge pull request #10872 from jherico/fix_laggy_overlays
...
Don't use a blocking connection for a high-frequency script function
2017-07-03 14:58:32 -07:00
Brad Davis
97edbb7f37
Restore mutex in overlay interface
2017-07-03 14:49:57 -07:00
David Kelly
373bd0cc8a
aspect ratio preserved upon blitting, minor qml tweak, warnings fixed
2017-07-03 14:23:23 -07:00
David Kelly
5f015ec77f
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:25 -07:00
David Kelly
045b009b00
Merge branch 'dk/spectatorCameraPreview' of https://github.com/davidkelly/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:05 -07:00
anshuman64
70b9e9b41e
Merge pull request #10849 from druiz17/calibration-ui-update
...
Updated calibration UI visuals and added UserActivity events.
2017-07-03 12:42:09 -07:00
Brad Davis
6c86c297cb
Don't use a blocking connection for a high-frequency function like editOvleray
2017-07-03 12:40:52 -07:00
1P-Cusack
38baeabbe5
Add View->Enter First Person Mode in HMD checkbox.
...
When checked, changing to an HMD display will switch the user to first
person mode. WL 21425.
2017-07-03 15:21:40 -04:00
Zach Fox
9c96cf811e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup
2017-07-03 10:33:55 -07:00
Zach Fox
9411c2e732
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-03 10:24:02 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
Dante Ruiz
063984f573
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
2017-07-03 16:44:47 +01:00
David Kelly
073eae39b2
timer now resumes when visible again
2017-06-30 18:44:32 -07:00
Dante Ruiz
6f30cb1825
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-01 00:48:49 +01:00
Dante Ruiz
51792769b5
finished vive in desktop mode
2017-07-01 00:48:36 +01:00
David Rowe
07697c5083
Merge branch 'master' into 21418
...
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
2017-07-01 11:19:00 +12:00
David Kelly
455233dc16
black background when camera is off
2017-06-30 16:08:40 -07:00
Dante Ruiz
309a03230c
Merge branch 'calibration-ui-update' into vive-in-desktop
2017-06-30 23:43:59 +01:00
Dante Ruiz
577969481d
head puck working
2017-06-30 23:43:12 +01:00
Zach Fox
7851c8002f
Remove unnecessary guard
2017-06-30 15:25:33 -07:00
Zach Fox
36dfff78e2
Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined
2017-06-30 15:13:31 -07:00
Ryan Downe Karpf
ddce264dd9
Merge pull request #10819 from Menithal/21387
...
WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2
2017-06-30 14:57:04 -07:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
David Kelly
09d959bdeb
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-30 14:16:01 -07:00
Zach Fox
9bd80ec2bf
Improve naming and API
2017-06-30 14:07:00 -07:00
David Kelly
133af0b522
jittery, still not working in tablet
2017-06-30 12:55:11 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Zach Fox
f765b4136d
Cleanup
2017-06-30 10:12:47 -07:00
Zach Fox
5ceb80b3e7
It's working!
2017-06-30 10:12:46 -07:00
Zach Fox
8d89ea75f5
Initial commit
2017-06-30 10:12:46 -07:00
Zach Fox
e66b4f1761
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-30 10:12:24 -07:00
Zach Fox
0f9c917965
Merge pull request #10853 from samcake/brown
...
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
2017-06-30 10:05:54 -07:00
Brad Davis
8372d73fec
Additional thread safety
2017-06-30 09:15:06 -07:00
NeetBhagat
5ff0bc409b
solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously .
2017-06-30 15:40:38 +05:30
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Menithal
bf0a8e0f91
Updated Comment
2017-06-29 23:18:52 +03:00
Brad Davis
8ec20ef042
Additional tracing of CPU cores
2017-06-29 13:16:15 -07:00
David Kelly
02b712716b
testing some rendering issues...
2017-06-29 11:12:10 -07:00
Seth Alves
c4667aa1a7
Merge pull request #10839 from vladest/file_dialog_crash_qt59
...
File dialog crash qt59
2017-06-29 10:34:26 -07:00
Zach Fox
00966966df
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-29 10:13:11 -07:00
Zach Fox
3170bdd08c
Merge pull request #10837 from samcake/flash
...
Fix projection & lighting issues identified with 2nd rendering pipeline
2017-06-29 10:12:03 -07:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Sam Gateau
b766c256db
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-29 10:29:05 +02:00
Thijs Wenker
e781f97ddc
Merge pull request #10846 from sethalves/fix-server-scripts-more
...
make ResourceManager be owned by DependencyManager
2017-06-28 17:05:30 -07:00
Howard Stearns
3606418a22
Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
...
minor fix for --scripts switch
2017-06-28 16:11:18 -07:00
Dante Ruiz
f077e40dd3
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
2017-06-28 23:51:13 +01:00
Dante Ruiz
a7e4dc1473
clean up code
2017-06-28 23:51:00 +01:00
David Rowe
be0e1a75a4
User-friendly SDL2 controller name
2017-06-29 10:03:58 +12:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
David Kelly
48de8011b2
cr feedback
2017-06-28 14:15:29 -07:00
howard-stearns
3293b4c898
Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm
2017-06-28 13:53:32 -07:00
Patrick Manalich
cb52122726
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up
2017-06-28 12:40:36 -07:00
Dante Ruiz
a2df2f8472
added user activity status
2017-06-28 19:52:19 +01:00
Clément Brisset
a2c15c9794
Merge pull request #10770 from jherico/fix_deps_1
...
Cleanup entity dependencies
2017-06-28 10:48:58 -07:00
David Kelly
b73102d063
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-28 08:57:04 -07:00
Sam Gateau
9b0a0fb23b
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-28 17:33:26 +02:00
Andrew Meadows
1e23fa7baa
Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
...
Eliminated toe wiggle while pucks are enabled.
2017-06-28 08:30:27 -07:00
Vladyslav Stelmakhovskyi
51b44d9021
Implement same for HMD mode
2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0
Cleanup
2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
0d4328fa51
Merge branch 'master' into file_dialog_crash_qt59
2017-06-28 15:54:53 +02:00
Sam Gateau
93963b3257
Apply the projection and deferred transform fixes found while working on spectator camera
2017-06-28 15:44:17 +02:00
Sam Gateau
37e5454421
Fix lighting issues identified with 2nd rendering pipeline
2017-06-28 15:12:20 +02:00
Sam Gateau
1e2b0ca91c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-28 10:21:05 +02:00
Menithal
ffd9ee2908
More appeasement of GNU C Compiler warnings
2017-06-28 07:09:15 +03:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
David Kelly
9417a176a1
make scripts tree show scripts in directory passed in with --scripts
2017-06-27 18:10:54 -07:00
Stephen Birarda
9e822de196
remove local collection of radius ignored nodes
2017-06-27 17:41:07 -07:00
Zach Fox
5d8d2fd83e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-27 16:47:44 -07:00
Menithal
24616f150f
Appeasing the Linux gods
2017-06-28 00:37:18 +03:00
Patrick Manalich
6d0b853668
Comment structure changes for compacting
2017-06-27 14:34:01 -07:00
Vladyslav Stelmakhovskyi
241231c00c
file lists works, but not initial yet
2017-06-27 22:14:58 +02:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
Sam Gateau
63835d0863
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-27 14:24:55 +02:00
Anthony J. Thibault
8602d57a57
Eliminated to wiggle while pucks are enabled.
...
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
2017-06-26 14:09:10 -07:00
David Kelly
564d935065
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch
2017-06-26 13:32:02 -07:00
Menithal
0a0e40e182
Removed Redudant qualification from heade:>r
2017-06-26 23:04:48 +03:00
Ryan Huffman
209a4f33b5
Merge pull request #10784 from huffman/feat/pal-replicated
...
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub
a32f7b2395
Merge pull request #10743 from humbletim/21383
...
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
Menithal
232382e6d0
21387: Fixed issue with av scaling via script
2017-06-26 19:52:11 +03:00
Brad Hefta-Gaub
6314a8d273
Merge pull request #10782 from vladest/fix_browse_black
...
Make background with default color. Fix few warnings
2017-06-26 09:50:09 -07:00
Seth Alves
2f2a13ec27
Merge pull request #10799 from jherico/object_parent_warnings
...
Fix warnings about creating QObjects with parents in different thread
2017-06-26 09:39:29 -07:00
Sam Gateau
75e457ce7c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-26 10:05:04 +02:00
David Rowe
72d712ac76
Add "enabled" setting for Sixense; bail in update if note enabled
2017-06-26 16:43:06 +12:00
David Rowe
31714675c3
Remove unused Sixense preference and associated methods
2017-06-26 16:14:57 +12:00
David Rowe
361bc1ce03
Add "enabled" setting for SDL2 joystick; bail in update if not enabled
2017-06-26 16:00:18 +12:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Menithal
359642eb0e
Refining and allowing for Avatar Scale to be saved as well
2017-06-25 23:55:47 +03:00
Menithal
d43d8ae846
Removed Old Comments
2017-06-25 22:01:14 +03:00
Menithal
f811971a42
Avatar Bookmarking
2017-06-25 21:57:07 +03:00
Seth Alves
9ae390853c
Merge pull request #10814 from jherico/linux_fix_static_plugins
...
Fix static plugin initialization on Linux
2017-06-25 08:17:16 -07:00
anshuman64
8d5bdd2d84
Merge pull request #10730 from hyperlogic/feature/pole-vector
...
Pole vector support for elbow and knee joints
2017-06-24 23:08:22 -07:00
Bradley Austin Davis
960017ddd7
Fix static plugin initialization on Linux
2017-06-24 22:22:47 -07:00
Brad Davis
9c99b9d4c5
Merge pull request #10783 from sethalves/fix-linux-asan
...
Fix linux asan
2017-06-23 22:43:24 -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
Ryan Huffman
b56cfa56c7
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
2017-06-23 14:23:20 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12: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
Seth Alves
5e2aeb96d3
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
2017-06-23 10:18:33 -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
Seth Alves
5af07dfb62
more memory-debugger
2017-06-23 08:16:48 -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
Brad Davis
d50c448151
Fix heap corruption coming out of running scripts dialog
2017-06-22 19:15:58 -07: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
Zach Fox
8bb105a112
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-22 15:29:03 -07: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
Seth Alves
d290f03edb
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
2017-06-22 13:53:23 -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
Zach Fox
a1dfbc91da
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-22 10:27:52 -07:00
Zach Fox
a4a4ba817f
Fixup merge - whoops
2017-06-22 10:27:28 -07:00
Seth Alves
517bf0af0f
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
2017-06-22 10:07:44 -07:00
Seth Alves
7ff576ef18
add memory-debugging macro to some cmake files
2017-06-22 10:07:39 -07:00
samcake
96a10d2e95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-22 09:32:49 -07:00
Vladyslav Stelmakhovskyi
30714d5d25
Make background with default color. Fix few warnings
2017-06-22 16:47:40 +02: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
Zach Fox
af3c249ae5
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-21 17:16:10 -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
