David Rowe
|
cfd155c198
|
Merge branch 'master' into 21418
|
2017-07-06 16:56:10 +12:00 |
|
Brad Davis
|
d91516c630
|
Merge pull request #10894 from jherico/acclient_fix
Fix ACClient on Linux
|
2017-07-05 18:26:15 -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 |
|
Brad Davis
|
2409c83d5d
|
Fix ACClient on Linux
|
2017-07-05 16:53:42 -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 |
|
Zach Fox
|
6f2e7f5b83
|
Tweak the Snapshot 'Share' button to make its purpose more clear
|
2017-07-05 12:39:15 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Atlante45
|
ac87ea9660
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into rc-46
|
2017-07-03 09:39:31 -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
|
5fbcd494be
|
made final requested changes
|
2017-07-03 16:46:58 +01:00 |
|
Dante Ruiz
|
063984f573
|
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
|
2017-07-03 16:44:47 +01:00 |
|
Chris Collins
|
19bbe307b2
|
Merge pull request #9927 from Patterntrick/21210
Xylophone scripts
|
2017-07-03 05:57:36 -07:00 |
|
Cain Kilgore
|
44f0b8bd60
|
Support for Oculus & Vive - cleaned up some code, using Script.connect instead of setInterval
|
2017-07-02 11:41:33 +01:00 |
|
Cain Kilgore
|
a693a61ec8
|
Cleanup
|
2017-07-02 03:20:54 +01:00 |
|
Cain Kilgore
|
e0120ebf30
|
Rocket Hands
|
2017-07-02 03:20:07 +01:00 |
|
Clément Brisset
|
8744b8e58d
|
Merge pull request #10859 from Atlante45/fix/ac-cleanup
Fix AC cleanup
|
2017-06-30 16:42:15 -07: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 |
|
Stephen Birarda
|
f6fe3f91fd
|
Merge pull request #10829 from birarda/bug/sequence-skips
fix avatar mixer sending empty avatar identities
|
2017-06-30 15:28:29 -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 |
|
Atlante45
|
85601669e1
|
Prevent thrashing by limiting to 10 restarts every 10 minutes
|
2017-06-30 14:34:49 -07:00 |
|
Brad Davis
|
3f48c7aef5
|
Merge pull request #10855 from jherico/snapshot
Fix snapshot connection errors
|
2017-06-30 12:58:48 -07:00 |
|
utkarshgautamnyu
|
c81211edef
|
Merge pull request #10848 from highfidelity/snapshot.js_modify
Update snapshot.js
|
2017-06-30 12:40:08 -07:00 |
|
Brad Davis
|
6fc82bb351
|
Switch to preprocessor macro for blocking invokes to capture function information
|
2017-06-30 11:36:24 -07:00 |
|
Dante Ruiz
|
a749fa19ad
|
made requested changes
|
2017-06-30 19:14:22 +01:00 |
|
Brad Davis
|
9c37b28ba0
|
Remove tool window logic
|
2017-06-30 10:58:19 -07:00 |
|
utkarshgautamnyu
|
82597ac424
|
Update snapshot.js
|
2017-06-30 10:22:05 -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 |
|
Cain Kilgore
|
a3db9ae726
|
Begin Rocket Hands branch
|
2017-06-30 15:40:42 +01:00 |
|
Brad Davis
|
b52dd7b822
|
Don't use blocking connections on the main thread
|
2017-06-29 20:45:17 -07:00 |
|