Zach Fox
|
1afa2d3775
|
Spectator camera icon
|
2017-07-06 16:24:50 -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 |
|
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 |
|
Brad Davis
|
d91516c630
|
Merge pull request #10894 from jherico/acclient_fix
Fix ACClient on Linux
|
2017-07-05 18:26:15 -07:00 |
|
Zach Fox
|
8c36e5c69f
|
Merge pull request #10893 from zfox23/spectatorCamera_instructions
Spectator Camera preview instructions
|
2017-07-05 17:23:17 -07:00 |
|
Seth Alves
|
c058a166d4
|
Merge pull request #10888 from jherico/overlay_crashes
Trying to fix overlay crashes again
|
2017-07-05 17:16:53 -07:00 |
|
David Kelly
|
4a22fbca1b
|
redo cache switch
|
2017-07-05 17:01:31 -07:00 |
|
Brad Davis
|
2409c83d5d
|
Fix ACClient on Linux
|
2017-07-05 16:53:42 -07: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 |
|
David Kelly
|
8c0697f26b
|
Merge pull request #10882 from davidkelly/dk/spectatorCameraPreview
render issue fixes
|
2017-07-05 14:46:16 -07:00 |
|
Brad Davis
|
7f1bc07d04
|
Trying to fix overlay crashes again
|
2017-07-05 14:30:01 -07:00 |
|
Zach Fox
|
64a443ee0d
|
Merge pull request #10883 from zfox23/snapshots_TweakShareButton
Tweak the Snapshot 'Share' button to make its purpose more clear
|
2017-07-05 13:27:51 -07:00 |
|
David Kelly
|
89c05244bf
|
remove unnecessary extra update() calls
|
2017-07-05 13:24:31 -07:00 |
|
Zach Fox
|
6f2e7f5b83
|
Tweak the Snapshot 'Share' button to make its purpose more clear
|
2017-07-05 12:39:15 -07:00 |
|
David Kelly
|
85813ac908
|
render issue fixes
|
2017-07-05 11:29:34 -07:00 |
|
Brad Davis
|
1bcfe1eaba
|
Merge pull request #10880 from samcake/hobbes
Fixing the bug appearing on Nvidia 384.76
|
2017-07-05 10:56:03 -07:00 |
|
Zach Fox
|
44cb48b17d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-05 09:59:57 -07:00 |
|
Sam Gateau
|
48b4b5f49c
|
Fixing the bug appearing on Nvidia 284.76
|
2017-07-05 18:39:09 +02:00 |
|
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
|
c205d3eb2a
|
Merge pull request #10721 from davidkelly/dk/spectatorCameraPreview
Spectator camera preview
|
2017-07-03 16:42:27 -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 |
|
Chris Collins
|
ad996cba3d
|
Merge pull request #10871 from Atlante45/master
Stable => Master
|
2017-07-03 12:19:51 -07:00 |
|
Atlante45
|
3b5b0e9a50
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-07-03 12:17:45 -07:00 |
|
Chris Collins
|
9264365328
|
Merge pull request #10867 from highfidelity/rc-46
Beta Release 46 - Includes up to Developer Release 6801
|
2017-07-03 12:16:43 -07:00 |
|
Ryan Huffman
|
b8ce4b9006
|
Merge pull request #10801 from huffman/fix/oven-native-separators
Add support for native separators in oven, and vs2015/2017 FBX sdk
|
2017-07-03 12:07:26 -07:00 |
|
Zach Fox
|
495f702722
|
Merge pull request #10868 from CainFoool/rocket-hands
WL 21421 - Script to Fly with Rocket Hands
|
2017-07-03 12:05:06 -07:00 |
|
Cain Kilgore
|
eddb7a349c
|
Boilerplate
|
2017-07-03 20:01:01 +01:00 |
|
Cain Kilgore
|
1c5923914b
|
Combining three if statements into one!
|
2017-07-03 19:58:26 +01:00 |
|
Cain Kilgore
|
bfcddcf3b7
|
Cleaned up the code, created a function to check if the hands are in the right position.
|
2017-07-03 19:53:29 +01:00 |
|
Cain Kilgore
|
5f600b4ea9
|
Cleanup again
|
2017-07-03 19:31:41 +01:00 |
|
Cain Kilgore
|
44624c5fab
|
space
|
2017-07-03 19:11:57 +01:00 |
|
Cain Kilgore
|
2c53b5b372
|
QA Cleanup
|
2017-07-03 19:09:54 +01: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 |
|
Cain Kilgore
|
7d382d9da0
|
Fixed spelling, added is in HMD Check, removed Haptic Feedback as it wasn't part of the WL
|
2017-07-03 17:47:54 +01:00 |
|