David Kelly
|
1ccf0da7d8
|
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
redo cache switch
|
2017-07-06 09:53:01 -07: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 |
|
David Kelly
|
936c21e849
|
remove unnecessary cacheDir member
|
2017-07-06 07:24:58 -07: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 |
|
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 |
|
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 |
|
Brad Davis
|
97edbb7f37
|
Restore mutex in overlay interface
|
2017-07-03 14:49:57 -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 |
|
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 |
|
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 |
|
David Kelly
|
455233dc16
|
black background when camera is off
|
2017-06-30 16:08:40 -07: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 |
|
Brad Davis
|
8372d73fec
|
Additional thread safety
|
2017-06-30 09:15:06 -07:00 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Menithal
|
232382e6d0
|
21387: Fixed issue with av scaling via script
|
2017-06-26 19:52:11 +03: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
|
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 |
|
samcake
|
77650ac1b3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-06-23 20:10:35 -07: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 |
|
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 |
|
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 |
|