Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 06:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44214 commits 25 branches 0 tags 1.1 GiB
Commit graph

44214 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
0565d3aea1 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-08 14:59:58 -07:00
Seth Alves
a312218722 back out some changes 2016-06-08 14:07:16 -07:00
Brad Hefta-Gaub
4e418f328f Merge pull request #7924 from imgntn/moreshelfstuff 
[Home] Add More Content
 2016-06-08 13:53:26 -07:00
Seth Alves
d7fc789ea7 try harder to not do simple-simulation on things that have an avatar ancestor 2016-06-08 13:47:52 -07:00
James B. Pollack
65e2cdbbf3 clear dead code 2016-06-08 13:44:53 -07:00
Brad Hefta-Gaub
0df72548f8 Merge pull request #8024 from kencooke/audio-src-avx2 
AVX2 optimized audio resampler
 2016-06-08 12:43:52 -07:00
Seth Alves
a1766539f4 don't do simple simulation on children of avatars 2016-06-08 12:17:07 -07:00
Seth Alves
201d7a7d3b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 12:11:08 -07:00
Seth Alves
5cbaf05e45 also zero angular velocity for child of avatar 2016-06-08 11:55:17 -07:00
howard-stearns
3138c4041b Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-08 11:54:00 -07:00
Seth Alves
1b4b38c85b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 11:28:49 -07:00
Howard Stearns
b21fbe5d99 Merge pull request #8037 from howard-stearns/button-content 
new hmd button content and initial positions
 2016-06-08 11:28:26 -07:00
Howard Stearns
7588579ec3 Merge pull request #8026 from jherico/steamvr_keyboard 
SteamVR keyboard functionality
 2016-06-08 11:21:07 -07:00
howard-stearns
f8353fb082 New button content and initial positions. 2016-06-08 11:11:18 -07:00
howard-stearns
bd24a07750 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-08 10:50:03 -07:00
Brad Davis
40778d7f29 Allow env disabling of the keyboard. Show keyboard after short delay to avoid flickers 2016-06-08 10:41:19 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Seth Alves
8085266c1d cause names in permissions tables to be alpha-sorted 2016-06-08 10:36:44 -07:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Howard Stearns
8bf6ed8b7a Merge pull request #8025 from hyperlogic/feature/vive-ui-equip-hotspot 
Render equip hotspot when trigger is squeezed
 2016-06-08 09:42:33 -07:00
Brad Hefta-Gaub
d0e946c907 Merge pull request #8034 from ctrlaltdavid/20953 
fix colors of buttons in Asset Browser dialog
 2016-06-08 07:47:34 -07:00
Brad Davis
79c68b2ecb Working on positioning of the keyboard 2016-06-07 21:52:22 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Hefta-Gaub
338557358d Merge pull request #8035 from Atlante45/master 
Fix OS X warning
 2016-06-07 18:17:58 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
SamGondelman
2c1d20bd1a removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks 2016-06-07 17:12:24 -07:00
Brad Hefta-Gaub
9a0076d4f1 Merge pull request #8028 from ctrlaltdavid/20949 
add "Load Defaults" button to Running Scripts dialog
 2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9 Merge pull request #8029 from SamGondelman/constantTurn 
Fixed constant turn of 22.5 degrees in comfort mode
 2016-06-07 17:09:07 -07:00
Anthony J. Thibault
30d8ae36e8 Added MyAvatar.characterControllerEnabled property 2016-06-07 16:55:32 -07:00
Atlante45
71fb0e665f Fix OSX warning 2016-06-07 16:46:32 -07:00
Brad Davis
29d9f51b58 Adding missed file 2016-06-07 16:46:17 -07:00
Seth Alves
7696ead012 look for standard permissions in standard table rather than in user table 2016-06-07 16:38:52 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
David Rowe
a87483dfff Fix colors of buttons in Asset Browser dialog 2016-06-08 10:55:14 +12:00
Brad Davis
ba61491ee6 PR feedback 2016-06-07 15:33:00 -07:00
SamGondelman
545dda0a98 whoops 2016-06-07 15:15:42 -07:00
SamGondelman
5daccba235 xbox controller works on restart 2016-06-07 15:14:08 -07:00
Seth Alves
3bfcc865bd Merge branch 'permissions-grid-ui' of github.com:sethalves/hifi into permissions-grid 2016-06-07 14:43:42 -07:00
Seth Alves
a1051da484 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-07 14:43:35 -07:00
James B. Pollack
c545f53c75 target script attached in reset spawner 2016-06-07 14:43:23 -07:00
David Rowe
f3f04fba97 Fix IE displaying checkboxes too large 2016-06-08 09:41:31 +12:00
James B. Pollack
6573b3c71e remove bricabrac from dressing room shelves for now 2016-06-07 14:37:19 -07:00
David Rowe
801981816b Add permissions tool-tips 2016-06-08 09:11:37 +12:00
Brad Davis
b9ee0c087e Add a constant hud toggle button to the UI 2016-06-07 13:45:23 -07:00
James B. Pollack
9f4289ae1b add down velocity to shelfy things 2016-06-07 13:31:42 -07:00
SamGondelman
2e71a63574 cr fixes 2016-06-07 13:28:10 -07:00
SamGondelman
ff2405437b can set strength to 0 2016-06-07 12:19:38 -07:00