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

2838 commits

Author SHA1 Message Date
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
ZappoMan
ce937247d1 added back getUprightEyeLevelPosition() 2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33 fixed compiler warnings 2013-08-02 18:33:41 -07:00
Mark Peng
5ef965018c Fix bug where the lookatIndicator would draw and no longer update. 2013-08-02 18:13:49 -07:00
Mark Peng
da31cd441e Merge remote-tracking branch 'upstream/master' 2013-08-02 18:08:28 -07:00
Mark Peng
26d6e826c5 Merge remote-tracking branch 'upstream/master' 2013-08-02 18:03:34 -07:00
Mark Peng
71a919f226 Switch back to avatar.getEyePosition() rather than 
avatar.getHead().getEyePosition() because of mysterious lag.
 2013-08-02 18:02:37 -07:00
atlante45
ff27ee1c53 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 18:00:42 -07:00
atlante45
be83bf5635 Fixed fucked up merge 2013-08-02 17:57:53 -07:00
Stephen Birarda
8704964a0f resolve conflicts on merge with upstream master 2013-08-02 17:56:19 -07:00
Stephen Birarda
222a46189f some comments and _songFileBytes reset 2013-08-02 17:50:08 -07:00
Stephen Birarda
d259180778 add option to audio menu to stop the mixed audio 2013-08-02 17:46:23 -07:00
atlante45
84eae284ea Changed shifted and meta variable name 2013-08-02 17:44:21 -07:00
Mark Peng
ff67367221 Remove extra parenthesis. 2013-08-02 17:42:12 -07:00
Mark Peng
e0b7773521 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/Head.cpp
 2013-08-02 17:35:29 -07:00
atlante45
466d50ea4b Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 17:30:59 -07:00
Stephen Birarda
d56b715432 add menu option to mix RAW audio with microphone audio 2013-08-02 17:30:49 -07:00
Mark Peng
d7cd88a9a7 Fix camera positioning so that it is in between avatar's eyes. Plus 
some code clean up.
 2013-08-02 17:30:26 -07:00
Philip Rosedale
1309e72553 Merge pull request #758 from Ventrella/particles 
Added avatar nose
 2013-08-02 17:26:10 -07:00
atlante45
bceb416d8a merge 2013-08-02 17:18:35 -07:00
atlante45
d765b58551 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 17:17:35 -07:00
atlante45
e9a53ed9b4 Changed avatar resizing shortcuts to plus and minus. 2013-08-02 17:14:57 -07:00
Andrzej Kapolka
4a122c6dca Merge pull request #761 from ey6es/pointy 
Adjusted bitrate for full frame video, fix for underflow errors.
 2013-08-02 17:05:00 -07:00
Stephen Birarda
447e332b6f Merge pull request #760 from Atlante45/fix_key_press_event 
Fix key press event
 2013-08-02 16:45:25 -07:00
Philip Rosedale
936209fd31 When no hovered voxel, lookAt vectors point to distant horizon 2013-08-02 16:37:49 -07:00
atlante45
8c112cbec3 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 16:37:18 -07:00
atlante45
1b4cdc003d Fix shortcuts : done 2013-08-02 16:36:53 -07:00
Philip Rosedale
639b6be01a Merge branch 'master' of https://github.com/worklist/hifi into Remove-body 2013-08-02 16:08:16 -07:00
Jeffrey Ventrella
d87b4a8e1e Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 16:08:01 -07:00
Jeffrey Ventrella
95f15fceb5 added avatar nose 2013-08-02 16:07:33 -07:00
Philip Rosedale
8aa8b5dbfe Marker lines all the way out to 128Meters 2013-08-02 16:03:34 -07:00
Philip Rosedale
b9a8d6080e Render world box goes out to edge of world. 2013-08-02 15:43:37 -07:00
atlante45
eb2a1ecedd merge 2013-08-02 15:41:32 -07:00
atlante45
2e150b97de Fixed shortcuts issues on mac 2013-08-02 15:24:09 -07:00
Andrzej Kapolka
574752c774 Use saturate_cast when converting from YV12 to RGB to prevent overflow errors. 2013-08-02 14:58:59 -07:00
ZappoMan
db55160f9a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 14:40:39 -07:00
Andrzej Kapolka
5df4fc95f1 Up the bitrate for full frame video to 4x. 2013-08-02 14:21:21 -07:00
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00
Jeffrey Ventrella
17f1c82e6f cleanup 2013-08-02 14:12:32 -07:00
Andrzej Kapolka
8de709a2c6 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 14:09:27 -07:00
Jeffrey Ventrella
f80a9fdf31 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 14:09:22 -07:00
Jeffrey Ventrella
90502a3ce5 removed rendering of finger root positions 2013-08-02 14:08:56 -07:00
ZappoMan
55f7028726 Merge pull request #744 from PhilipRosedale/master 
Smoother movement, rotation, less distracting collision noises.  Play sound on click voxel
 2013-08-02 14:03:51 -07:00
Jeffrey Ventrella
29c5511a54 test 2013-08-02 13:49:50 -07:00
Jeffrey Ventrella
28dd38c013 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 13:36:01 -07:00
Jeffrey Ventrella
a9ec94de49 fixed a problem with emitters not being coordinated with Leap fingers 2013-08-02 13:35:35 -07:00
ZappoMan
4c15964cdc Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 11:44:09 -07:00
Andrzej Kapolka
def4318817 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 11:12:59 -07:00
Andrzej Kapolka
61da1826c7 Reduce bitrate for full frame mode. 2013-08-02 11:12:41 -07:00