Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 10:14:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
47209 commits 71 branches 56 tags 1.2 GiB
Commit graph

47209 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
ace8639f5b Bug fixes in oculus_touch default mapping 
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
  with the handControllerGrab script.  Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
 2016-10-10 18:42:06 -07:00
Brad Hefta-Gaub
6c63213c78 Merge pull request #8772 from hyperlogic/bug-fix/web-entity-crash 
Crash fix for RenderableWebEntityItem::buildWebSurface
 2016-10-10 14:38:05 -07:00
Anthony J. Thibault
e76a7fc577 Crash fix for RenderableWebEntityItem::buildWebSurface 
Gracefully handle the absence of a gl context.  We will continue to retry every render call.
 2016-10-10 13:57:54 -07:00
Chris Collins
2b8765b47e Merge pull request #8765 from ctrlaltdavid/fix-address-bar 
Fix address bar not being able to regain focus
 2016-10-10 10:11:34 -07:00
Chris Collins
8e9b9ddc6f Merge pull request #8764 from ctrlaltdavid/fix-login-keyboard 
Fix virtual keyboard in login dialog
 2016-10-10 09:50:05 -07:00
Brad Hefta-Gaub
735a6ca994 Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes 
openvr deadlock and crash on exit fixes
 2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub
87d66ffdf8 Merge pull request #8756 from jherico/i5_reprojection 
Turn on forced reprojection on i5 systems
 2016-10-08 10:51:27 -07:00
David Rowe
12f4b2854d Fix address bar not being able to regain focus 2016-10-08 19:38:57 +13:00
Anthony J. Thibault
ec801cb9d8 Addressed feedback from code review. 2016-10-07 17:46:46 -07:00
David Rowe
a934f59c2a Fix virtual keyboard in login dialog 2016-10-08 13:37:31 +13:00
Brad Davis
d8242f02a5 Merge pull request #8762 from jherico/stable_merge2 
Stable merge2
 2016-10-07 17:22:36 -07:00
Brad Davis
c6a890af40 Merge remote-tracking branch 'upstream/stable' into stable_merge2 2016-10-07 17:14:36 -07:00
Brad Hefta-Gaub
7e3d63c4e2 Merge pull request #8747 from jherico/buffer_page_fix 
Fix page size usage in gpu buffers
 2016-10-07 16:57:25 -07:00
Chris Collins
66924a7bb9 Merge pull request #8760 from huffman/fix/help-images 
Update help window images
 2016-10-07 16:07:41 -07:00
Ryan Huffman
6476dfecc6 Update help window images 2016-10-07 16:06:26 -07:00
Chris Collins
bde3a6d02a Merge pull request #8627 from huffman/feat/tutorialv3 
Tutorial
 2016-10-07 15:52:25 -07:00
Ryan Huffman
abaa75245e Temporarily remov touch controller configuration 2016-10-07 13:41:23 -07:00
Ryan Huffman
0f0ea5f73f Remove dead code 2016-10-07 13:40:35 -07:00
Ryan Huffman
de14fdffb7 Remove commented log line 2016-10-07 13:38:18 -07:00
Ryan Huffman
8a4cfd4735 Remove unreachable code in PluginUtils 2016-10-07 13:37:52 -07:00
Brad Davis
8526ac74a5 Turn on forced reprojection on i5 systems 2016-10-07 13:36:49 -07:00
Anthony J. Thibault
a4c7e832b5 Reset threadID logging to false 2016-10-07 11:42:34 -07:00
Anthony J. Thibault
17d00ee3f9 Workaround openvr crash by calling Submit before VR_Shutdown 2016-10-07 11:41:58 -07:00
Ryan Huffman
c995e51128 Fix compilation bugs in Application 2016-10-07 10:30:18 -07:00
Ryan Huffman
56a5d82f4b Cleanup tutorial.js and remove unused code 2016-10-07 10:30:18 -07:00
Ryan Huffman
a5e3fa45c3 Fix advanced movement being disabled 2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396 Remove unnecessary lambda for location initialization on startup 2016-10-07 10:30:18 -07:00
Ryan Huffman
d589812c52 Update hand controller detection 2016-10-07 10:30:18 -07:00
Ryan Huffman
79ea7c4075 Update content set version to 9 2016-10-07 10:30:18 -07:00
Ryan Huffman
1592394d6a Update tutorialStartZone to send start to parent immediately 2016-10-07 10:30:18 -07:00
Ryan Huffman
504295cdcf Add extra logging to tutorial zones 2016-10-07 10:30:18 -07:00
Ryan Huffman
09d9cd8311 Update content version to 8 2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e Update initial run logic 2016-10-07 10:30:18 -07:00
Ryan Huffman
92a7a638d4 Update content set to version 7 2016-10-07 10:30:18 -07:00
Ryan Huffman
5f765e94f0 Fix butane lighter sound url 2016-10-07 10:30:18 -07:00
Ryan Huffman
63c72eed65 Update content set for server console 2016-10-07 10:30:18 -07:00
Ryan Huffman
c7ead55380 Update default content set 2016-10-07 10:30:18 -07:00
Ryan Huffman
0e5f670cce Add extra debug to ownershipToken.js 2016-10-07 10:30:18 -07:00
Ryan Huffman
a463a3e608 Update viveHandsv2 to hide on equip 2016-10-07 10:30:18 -07:00
Ryan Huffman
4ba637edf1 Update tutorial to use static list of entity ids 2016-10-07 10:30:18 -07:00
Ryan Huffman
3c18d08270 Update firepit to use Local Messages 2016-10-07 10:30:18 -07:00
Ryan Huffman
7379e9a03f Update server-console content URL 2016-10-07 10:30:18 -07:00
Ryan Huffman
408cc1cd04 Update default hifi address to dev-welcome 2016-10-07 10:30:18 -07:00
Ryan Huffman
e6314a2701 Add changes to isHMDAvailable to specify hmd 2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa Add redirection to entry on first turn if you don't have Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
8c6ba204cd Update tutorial: away.js toggle, turning based on controller 2016-10-07 10:30:18 -07:00
Ryan Huffman
a062e6ab9a Revert change to make tutorial only work for Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c6eae36a7 Update tutorial progress keys 2016-10-07 10:30:18 -07:00
Ryan Huffman
f426f1cd4f Update isHandController to temporarily only return true for Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00