Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:24:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5163 commits 25 branches 0 tags 1.1 GiB
Commit graph

5163 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
bba8cf86cc correct reference to ASSIGNMENT_SERVER_PORT 2013-08-05 10:52:53 -07:00
Stephen Birarda
45d84add05 cleanup from code review comments 2013-08-05 10:37:23 -07:00
Stephen Birarda
d51e0b59bd change DATA_SEND_INTERVAL_MSECS to DATA_SEND_INTERVAL_USECS 2013-08-05 10:30:56 -07:00
Stephen Birarda
1f8031770b fix quoted includes in AudioInjector.cpp 2013-08-05 10:28:12 -07:00
Stephen Birarda
553c8088dd fix include from AudioInjector.h 2013-08-05 10:27:06 -07:00
Stephen Birarda
cddbf85172 don't include AudioInjector in Agent class 2013-08-05 10:13:25 -07:00
Stephen Birarda
0120ac2d0f remove an extra debug 2013-08-05 10:09:00 -07:00
Stephen Birarda
8f876b91ae changes for stub pull request of assignee work 2013-08-05 10:06:50 -07:00
Stephen Birarda
72f76ee0b8 cleanup assignment server to prepare for stub pull 2013-08-05 10:00:00 -07:00
Stephen Birarda
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
ZappoMan
a6c2683b1a Merge pull request #768 from ZappoMan/bug_fixes 
added back getUprightEyeLevelPosition() - stabilizes view
 2013-08-02 18:52:18 -07:00
ZappoMan
ce937247d1 added back getUprightEyeLevelPosition() 2013-08-02 18:47:21 -07:00
ZappoMan
b998d6b14f Merge pull request #767 from ZappoMan/master 
fixed compiler warnings
 2013-08-02 18:34:21 -07:00
ZappoMan
fd81053e33 fixed compiler warnings 2013-08-02 18:33:41 -07:00
ZappoMan
f7bf016fb7 Merge pull request #766 from LionTurtle/master 
Fix bug where the lookatIndicator would draw and no longer update.
 2013-08-02 18:24:28 -07:00
ZappoMan
48342bb5fd Merge pull request #765 from LionTurtle/master 
Fix camera positioning so that it is in between avatar's eyes. Plus some code clean up.
 2013-08-02 18:13:51 -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
Stephen Birarda
dbc1152fba Merge pull request #764 from Atlante45/fix_key_press_event 
Fix key press event
 2013-08-02 18:06:39 -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
ZappoMan
bd8da76413 Merge pull request #763 from birarda/rave-audio 
add a menu option to mix RAW audio file with microphone audio
 2013-08-02 17:59:50 -07:00
Stephen Birarda
8889ce34a6 Merge pull request #756 from ZappoMan/multiple_voxel_servers 
command line options for jurisdictions
 2013-08-02 17:58:45 -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
ZappoMan
64b5cc276a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 16:58:46 -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
35a3fd5f11 Merge pull request #759 from PhilipRosedale/Remove-body 
Fix lookAt vectors bug and render own lookAt vectors
 2013-08-02 16:39:59 -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
6f42bfbba0 Merge pull request #757 from PhilipRosedale/Remove-body 
Render world lines out to 128M, fix crash bug with delete voxel
 2013-08-02 16:14:17 -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