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

48994 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
David Kelly
97a5c0ef4b Merge pull request #9200 from zfox23/fix_bubble_audio_bug 
Fix audio injector bug after space bubble changes
 2016-12-13 14:23:01 -08:00
Zach Fox
2c97d7f9c2 Merge pull request #9199 from jazmincano/jazmin_bubble_improvements 
Bubble visualization improvements
 2016-12-13 13:21:11 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
Faye Li
8fcc42e537 overriding colors at tablet buttons instantiation 2016-12-13 12:34:38 -08:00
Faye Li
dc72a0fd2f tablet mic mute and unmute icons 2016-12-13 12:18:19 -08:00
Jazmin
b7b4c685e7 Fixed typo 2016-12-13 11:48:06 -08:00
samcake
f8f4ddb16a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 11:47:41 -08:00
Jazmin
4effdd0394 Update Bubble model in script 2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e Delete old bubble model 2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b Add new bubble model 2016-12-13 11:45:50 -08:00
Jazmin
d9fbde2f66 Update bubble height 
This height allows my friends to stay in my view comfortably, even when the space bubble is on.  Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.
 2016-12-13 11:43:09 -08:00
Zach Pomerantz
9a37ccbf3c chmod -x to render-utils src 2016-12-13 14:36:41 -05:00
Seth Alves
f905acf010 Merge pull request #9143 from huffman/fix/bow 
Add marketplace bow to repo, plus a few fixes
 2016-12-13 07:06:27 -08:00
samcake
d4f4bd4519 Debugginfg the bad tiles lighting 2016-12-12 18:02:14 -08:00
Clément Brisset
050c0fe14a Merge pull request #9188 from kencooke/audio-wav-parser 
Fix and improve the WAV file loader
 2016-12-12 17:51:20 -08:00
Brad Hefta-Gaub
1d07711937 CR feedback 2016-12-12 17:36:01 -08:00
Brad Hefta-Gaub
37a4253d20 Merge pull request #9192 from sethalves/es-leak 
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
 2016-12-12 17:16:00 -08:00
Stephen Birarda
b4f43e01b1 Merge pull request #9189 from huffman/feat/help-touch 
Add support for oculus touch in help menu
 2016-12-12 16:48:00 -08:00
Ryan Huffman
7c441ac3ee Remove advanced controls from oculus help image 2016-12-12 16:45:52 -08:00
Seth Alves
16128f5087 Merge pull request #9191 from druiz17/homeButton 
Home button prototype
 2016-12-12 16:27:06 -08:00
Seth Alves
9e572d7ad0 Merge pull request #9194 from sethalves/tablet-ui 
Tablet ui
 2016-12-12 16:25:53 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
samcake
9155f11b3d Merge pull request #9190 from jherico/test_mode 
Add test mode to interface
 2016-12-12 15:37:05 -08:00
Dante Ruiz
cc0e25720e mimimize the git diffs 2016-12-12 23:29:11 +00:00
Philip Rosedale
9370c8af6b Added ability to rescale avatar 2016-12-12 15:26:53 -08:00
Dante Ruiz
6a8465a6ca removed more whitespace 2016-12-12 23:26:06 +00:00
Chris Collins
4ce1bb3abc Merge pull request #9172 from thoys/avatarFinderBeacon 
avatarFinderBeacon.js -- Find other avatars more easily
 2016-12-12 15:25:36 -08:00
Dante Ruiz
92993202a4 removed double variable definition 2016-12-12 23:24:56 +00:00
Dante Ruiz
ccecce77de removed unneeded whitespace 2016-12-12 23:21:14 +00:00
Dante Ruiz
737f11fb7a merge fix 2016-12-12 23:03:38 +00:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Dante Ruiz
1b7c89c41d home button working 2016-12-12 14:34:42 -08:00
Ryan Huffman
3e5d67f28b Update oculus help image to swap menu buttons 2016-12-12 14:23:29 -08:00
Ryan Huffman
47c2af975b Remove extraneous logging from help.html 2016-12-12 14:22:59 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce Add support for oculus touch in help menu 2016-12-12 13:44:09 -08:00
Clément Brisset
84bf93b0fc Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll 
Restores "Select Audio DLL at runtime"
 2016-12-12 13:38:34 -08:00
Stephen Birarda
dddb4c5412 Merge pull request #9175 from birarda/signup-from-interface 
add account sign up to Interface
 2016-12-12 13:21:21 -08:00
Stephen Birarda
5111256a9e resize the sign up dialog when showing errors 2016-12-12 13:04:14 -08:00
Brad Hefta-Gaub
1b047d6901 fix cmake snafu 2016-12-12 11:39:10 -08:00
David Kelly
8719d36cd9 Merge pull request #9125 from kencooke/audio-ambisonics 
First-order Ambisonic renderer
 2016-12-12 11:36:12 -08:00
Stephen Birarda
a0663bdf31 fix resizing of LoginDialog and friends 2016-12-12 11:32:19 -08:00
Philip Rosedale
a142c830fa Merge branch 'master' of git://github.com/highfidelity/hifi into rescale 2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09 Both grip buttons enable rescale for a held object 2016-12-12 09:39:32 -08:00
Brad Hefta-Gaub
87e8b6bfeb only consider standard poses written if the pose was valid 2016-12-12 09:23:01 -08:00
Brad Hefta-Gaub
b57c1fe198 remove debug spam 2016-12-12 08:48:24 -08:00
Brad Hefta-Gaub
d51b408c12 more work on hand tracking 2016-12-12 08:46:21 -08:00