Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56857 commits 69 branches 56 tags 1.2 GiB
Commit graph

56857 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
8c15d1bab9 delete-trailing-whitespace 2017-07-06 10:54:02 -07: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
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
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
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
Dante Ruiz
07d098b95b coding standard fix 2017-07-05 19:45:52 +01:00
Dante Ruiz
275f48b65a another requested change made 2017-07-05 19:22:19 +01:00
Dante Ruiz
e567cf0196 made requested changes 2017-07-05 19:04:34 +01: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
Dante Ruiz
27a9880eff removed double add of head offset 2017-07-05 18:34:33 +01:00
Dante Ruiz
b86a8b8338 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-05 18:27:33 +01:00
Dante Ruiz
691b59ffff remove debug statments 2017-07-05 18:26:58 +01: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
a417f74bad Merge branch 'calibration-ui-update' into vive-in-desktop 2017-07-03 16:56:58 +01: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
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
Clément Brisset
8744b8e58d Merge pull request #10859 from Atlante45/fix/ac-cleanup 
Fix AC cleanup
 2017-06-30 16:42:15 -07:00
Dante Ruiz
309a03230c Merge branch 'calibration-ui-update' into vive-in-desktop 2017-06-30 23:43:59 +01:00