Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 02:25:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5229 commits 76 branches 59 tags 1.2 GiB
Commit graph

5229 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
035f1c81b9 Merge pull request #770 from ZappoMan/tile_import 
made import work better when tile locations not included in file name
 2013-08-05 10:56:53 -07:00
ZappoMan
1c45845842 Merge pull request #772 from birarda/assignee 
initial stub of assignment work
 2013-08-05 10:56:31 -07:00
ZappoMan
d348359901 Merge pull request #774 from Atlante45/master 
Fix pie menu appearing in selection mode
 2013-08-05 10:55:16 -07:00
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
atlante45
1ee870be38 Fix pie menu appearing in selection mode 2013-08-05 10:35:10 -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
ZappoMan
cc9e4eaf45 CR feedback 2013-08-05 10:24:52 -07:00
Andrzej Kapolka
6d4591274c Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-05 10:20:45 -07:00
Stephen Birarda
fdd0e25a60 Merge pull request #771 from ZappoMan/bugfixes 
fixed disappearing voxel bug
 2013-08-05 10:15:56 -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
edfd5cd543 fixed disappearing voxel bug 2013-08-05 09:45:00 -07:00
Mark Peng
8480bf5268 Merge remote-tracking branch 'upstream/master' 2013-08-03 13:41:59 -07:00
ZappoMan
abc8bc332c made import work better when tile locations not included in file name 2013-08-02 20:12:13 -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
Mark Peng
761172450e Merge remote-tracking branch 'upstream/master' 2013-08-02 18:18:12 -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
Andrzej Kapolka
5f40923db2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 18:00:42 -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
Andrzej Kapolka
90b19049da Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 17:26:35 -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