Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 22:54:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45448 commits 25 branches 0 tags 1.1 GiB
Commit graph

45448 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
a1dc9beddb Merge pull request #8348 from ZappoMan/beltAndSuspenders 
implement codec renegotiation in client
 2016-08-03 21:22:28 -07:00
Chris Collins
2473bbf1db Merge pull request #8313 from imgntn/tweak_lazers 
Tweak Teleport + Hand Lasers
 2016-08-03 16:40:28 -07:00
Seth Alves
7740420b96 Merge pull request #8361 from hyperlogic/bug-fix/avatar-debug-draw 
Bug fix for avatar debug marker rendering.
 2016-08-03 16:07:49 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
Philip Rosedale
f0c944b0c3 Merge pull request #8350 from sethalves/ignore-touch 
if the oculus HMD isn't on someone's head, don't take input from the controllers
 2016-08-03 15:21:43 -07:00
Philip Rosedale
98e40d54e1 Merge pull request #8355 from SamGondelman/touchDeadZone 
Added dead zones to Hydra and Oculus Touch joysticks
 2016-08-03 15:17:15 -07:00
James B. Pollack
e012d3cebb Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers 2016-08-03 15:00:05 -07:00
James B. Pollack
7a41ed25db Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-03 14:59:51 -07:00
Seth Alves
707fa2cafe Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch 2016-08-03 14:51:28 -07:00
Brad Hefta-Gaub
eb230071a0 Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders 2016-08-03 11:53:28 -07:00
SamGondelman
458e43fadc added dead zones to hydras, style fixes 2016-08-03 10:18:57 -07:00
Seth Alves
9962d47173 Merge pull request #8326 from birarda/kick 
kick
 2016-08-03 09:21:09 -07:00
Brad Hefta-Gaub
754eae98c2 Merge pull request #8353 from birarda/fake-atp-url 
fix for disabled physics with unloadable entity
 2016-08-03 09:10:41 -07:00
Brad Hefta-Gaub
70cb3d3393 Merge pull request #8354 from AlexanderOtavka/remove-web-debug 
Remove url change debug info for WebView
 2016-08-03 09:10:10 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
James B. Pollack
5ad5899140 revert pointer changes 2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056 cleanup dead code 2016-08-02 21:26:04 -07:00
Chris Collins
b2a354ddb9 Merge pull request #8331 from huffman/feat/progress-updates 
progress.js updates
 2016-08-02 21:10:54 -07:00
Seth Alves
8f76c43bc1 if call to ovr_GetSessionStatus fails, also don't take input from controllers 2016-08-02 19:49:58 -07:00
Seth Alves
ed4b3cde6b Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch 2016-08-02 19:44:28 -07:00
James B. Pollack
9d56c697e7 no delay! 2016-08-02 19:02:20 -07:00
James B. Pollack
364eb992fb no teleport while moving 2016-08-02 18:53:36 -07:00
James B. Pollack
88ebeaa4cb start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck 2016-08-02 18:46:47 -07:00
Brad Hefta-Gaub
193f0bbb99 Merge pull request #8345 from ctrlaltdavid/web-window-signals 
add OverlayWebWindow resized, moved, and closed signals
 2016-08-02 18:41:49 -07:00
Brad Hefta-Gaub
0d1034914d Merge pull request #8352 from AlexanderOtavka/fix-confirm 
Fix confirm dialog
 2016-08-02 18:41:08 -07:00
SamGondelman
1ce7623f41 added deadzones to oculus touch movements 2016-08-02 18:19:58 -07:00
Seth Alves
8c43c12249 clear pose before short-circuiting update 2016-08-02 16:49:24 -07:00
Zander Otavka
3c30743d0d Remove url change debug info for WebView 2016-08-02 16:48:39 -07:00
Ryan Huffman
adbd9ff854 Add constants for progress bar offset 2016-08-02 16:34:57 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
Ryan Huffman
1f2e34d59b Remove 3d overlay from progress.js 2016-08-02 16:29:40 -07:00
Ryan Huffman
79a243b171 Clean up progress.js 2016-08-02 16:19:38 -07:00
Zander Otavka
38ba54e481 Fix confirm dialog 2016-08-02 16:04:54 -07:00
James B. Pollack
8541d4bd41 small change to protect 2016-08-02 15:41:28 -07:00
James B. Pollack
d00c1f62fc fixes 2016-08-02 15:40:19 -07:00
Seth Alves
03a47af628 if the HMD isn't on someone's head, don't take input from the controllers 2016-08-02 15:38:04 -07:00
Brad Hefta-Gaub
ca3a194454 implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream 2016-08-02 15:30:03 -07:00
James B. Pollack
f6984aaff8 clear timeout one more place 2016-08-02 14:42:21 -07:00
Stephen Birarda
a1220b87f1 set key ID for verified user in right place 2016-08-02 14:35:51 -07:00
Stephen Birarda
6196f5e86f switch back to SVGs, remove triggered for controller pose 2016-08-02 14:35:51 -07:00
Stephen Birarda
fa9199c419 use float for clicked value in mod.js 2016-08-02 14:35:51 -07:00
Stephen Birarda
f02f619597 use boolean from RTClick and LTClick 2016-08-02 14:35:51 -07:00
Stephen Birarda
760223a550 check for existing public key with lowercase username 2016-08-02 14:35:51 -07:00
Stephen Birarda
6e50e11002 replace ignore in default scripts with mod 2016-08-02 14:35:51 -07:00
Stephen Birarda
6d38301a3a rename ignore script to mod.js 2016-08-02 14:35:51 -07:00
Stephen Birarda
6051fcd8f9 use click instead of trigger, change targets to PNG 2016-08-02 14:35:51 -07:00
Stephen Birarda
7d9937e412 handle overlay change if permissions change 2016-08-02 14:35:51 -07:00
Stephen Birarda
a15aef34df modify ignore script to handle kicking 2016-08-02 14:35:51 -07:00
Stephen Birarda
5eb890e4f5 add a simple IP address sanitizer for DS settings save 2016-08-02 14:35:51 -07:00
Stephen Birarda
4cdc98287b add canKick to USI, revert constants to production 2016-08-02 14:35:51 -07:00