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

49797 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
4b3a5171d3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-05 15:43:46 -08:00
Seth Alves
2bff5582bc Merge pull request #9321 from hyperlogic/tablet-ui 
Made back button entity collisionless
 2017-01-05 15:43:14 -08:00
Seth Alves
ce4dabfcf4 Merge pull request #9320 from sethalves/tablet-ui 
Tablet ui
 2017-01-05 15:43:00 -08:00
David Kelly
1f3c2bb271 Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL 2017-01-05 16:35:47 -07:00
Anthony J. Thibault
baf2fce2c3 Made back button entity collisionless 2017-01-05 15:33:21 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
Seth Alves
2ba8a536a4 Merge pull request #9316 from hyperlogic/tablet-ui 
Added local only spatialized button click sounds to tablet
 2017-01-05 15:25:24 -08:00
Anthony J. Thibault
f63ee4ffe0 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:06:35 -08:00
Anthony J. Thibault
70078b0e78 Fix for linux build 2017-01-05 15:04:16 -08:00
howard-stearns
ef02c84759 further simplification of letterbox, and use for selection failures 2017-01-05 14:46:32 -08:00
Seth Alves
bacaadc7ca Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-05 14:35:14 -08:00
Seth Alves
195b92d05d lasers on webpage work again 2017-01-05 14:35:02 -08:00
howard-stearns
0cdeac8736 abstract out letterbox message 2017-01-05 14:32:31 -08:00
Seth Alves
907ffd7e98 Merge pull request #9317 from druiz17/tabletBug 
Fixed interface crashing when bring up tablet
 2017-01-05 14:26:00 -08:00
David Kelly
ef92a091b2 node overlay model now an asset 2017-01-05 15:19:09 -07:00
David Kelly
c95e880677 scale offsets to avatar height 2017-01-05 15:04:40 -07:00
Brad Hefta-Gaub
86c0d76955 Merge pull request #9314 from jherico/present_priority 
Use a higher thread priority for Oculus present
 2017-01-05 14:02:50 -08:00
howard-stearns
c4c1ea9578 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 14:02:44 -08:00
Howard Stearns
64a706f9e2 Merge pull request #9315 from zfox23/FixModJSAfterPAL 
Allow for compatibility with old mod.js script after PAL changes
 2017-01-05 14:00:41 -08:00
Dante Ruiz
879fb93def bug fixed 2017-01-05 22:00:09 +00:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Anthony J. Thibault
7198cd13b5 added button click wav 2017-01-05 13:56:04 -08:00
Anthony J. Thibault
85de0d3bbf Added local only spatialized button click sounds to tablet 2017-01-05 13:54:06 -08:00
Philip Rosedale
9bd858c1ab no log spam 2017-01-05 13:49:38 -08:00
Philip Rosedale
07ecf60485 remove sit when close 2017-01-05 13:48:31 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
Howard Stearns
28326ff47a Merge pull request #9306 from zfox23/PALVisualUpdates 
Fix PAL scrollbar; add helper popup to ADMIN tab
 2017-01-05 13:29:21 -08:00
Zach Fox
2f503d0bcc Allow for compatibility with old mod.js script 2017-01-05 13:25:27 -08:00
David Kelly
2949560e90 Corrected lame math error 
so we are centered now, and put the overlay up a bit higher.  Still need
to make that scale properly with avatar size.
 2017-01-05 14:22:35 -07:00
Philip Rosedale
65b9aaed1b one more try 2017-01-05 13:13:50 -08:00
Philip Rosedale
a689d52004 wrap far trigger too with seated check 2017-01-05 13:08:50 -08:00
Philip Rosedale
0ad9a8625b Added far trigger 2017-01-05 12:58:26 -08:00
Seth Alves
5e9c37777c Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers 2017-01-05 12:50:07 -08:00
Seth Alves
52ef22770b make showing of stylus be proximity based rather than raypick based 2017-01-05 12:49:50 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub
cb69e70781 fix competition between seek mouse and lasers 2017-01-05 11:31:50 -08:00
Brad Davis
9bf4804d3d Use a higher thread priority for Oculus present 2017-01-05 11:04:50 -08:00
David Kelly
75aa32ac6a remove some debugging crap 2017-01-05 12:01:55 -07:00
David Kelly
d5e6afa15a slightly further forward, a little bigger 2017-01-05 11:54:50 -07:00
Anthony Thibault
c972e9ac51 Merge pull request #9301 from fayeli/tablet-button-states 
Tablet Button Active State's Text and Icon
 2017-01-05 10:00:10 -08:00
Zach Fox
b5713656be Minor language changes on Admin help text 2017-01-05 09:27:12 -08:00
David Kelly
f1d6335a24 First stab at making PAL avatar highlighting a bit prettier 
Working around rendering issues with model-based overlays and the
drawInFront, we use 2 overlays.  One is the model, another is
a sphere with drawInFront on.  Still need to dial in colors and sizes
but this should be close enough for iteration.
 2017-01-05 10:18:58 -07:00
Brad Hefta-Gaub
825fc1cfa1 Merge pull request #9309 from kencooke/audio-hdr-volume 
High Dynamic Range Audio injectors
 2017-01-05 08:10:54 -08:00
Brad Hefta-Gaub
e78582ebae Merge pull request #9285 from PhilipRosedale/springAway 
script to push things with your hands
 2017-01-05 08:02:10 -08:00
Philip Rosedale
88429c4033 wrong file 2017-01-04 23:51:05 -08:00
Philip Rosedale
3fd255a7a7 Merge branch 'master' of https://github.com/highfidelity/hifi into chair 2017-01-04 23:49:07 -08:00
Philip Rosedale
ba43a18529 simple chair entity script 2017-01-04 23:48:24 -08:00
Howard Stearns
12fffe8530 messages 2017-01-04 20:37:56 -08:00
Ken Cooke
719c89e800 Shared implementation of fastLog2f() and fastExp2f() moved to AudioHelpers.h 2017-01-04 20:06:46 -08:00
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -08:00