Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 23:13:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5200 commits 71 branches 56 tags 1.2 GiB
Commit graph

5200 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
7021d3c6a5 Merge pull request #777 from Ventrella/particles 
Added BendyLine
 2013-08-05 14:55:26 -07:00
ZappoMan
7ccab1a32c Merge pull request #783 from LionTurtle/master 
Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
 2013-08-05 14:53:27 -07:00
Mark Peng
1790b0595c Render other avatar's lookat to point at my camera if the other avatar 
is looking at my head.
 2013-08-05 14:26:39 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
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
fe877b0ec8 Merge pull request #779 from birarda/rave-audio 
fix resetting of song mix menu item after import is done
 2013-08-05 12:27:47 -07:00
Stephen Birarda
25537f78a1 reset the song mix menu item after clip is done 2013-08-05 12:18:59 -07:00
Philip Rosedale
461bf002cf Merge pull request #776 from ey6es/pointy 
Render a green plane with fog, per Grayson's request.
 2013-08-05 12:09:32 -07:00
Jeffrey Ventrella
405cb516f6 removed 3 magic numbers in particle system 2013-08-05 12:05:15 -07:00
Andrzej Kapolka
c5e673a1e7 Merge pull request #778 from ey6es/master 
Fix for GCC warning.  Someone in Java mode?
 2013-08-05 11:59:35 -07:00
Andrzej Kapolka
2722cfa5ac Fix for GCC warning. #import? 2013-08-05 11:58:09 -07:00
Jeffrey Ventrella
ace133a62e Merge branch 'master' of https://github.com/worklist/hifi into particles 2013-08-05 11:49:42 -07:00
Andrzej Kapolka
e8365c6b04 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-05 11:42:17 -07:00
Andrzej Kapolka
03de2f3ea7 Render a green plane with fog, per Grayson's request. 2013-08-05 11:41:42 -07:00
Jeffrey Ventrella
e2ba8e22d5 added BendyLine 2013-08-05 11:35:02 -07:00
Jeffrey Ventrella
7693165578 merge 2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
6e69c4fbbb improved particle rainbow color cycle mode 2013-08-05 11:28:10 -07:00
Stephen Birarda
1876cd4f44 Merge pull request #775 from ZappoMan/multiple_voxel_servers 
added more color groups for false colorization from source
 2013-08-05 11:24:09 -07:00
ZappoMan
92f6fe6bd8 CR feedback 2013-08-05 11:14:30 -07:00
ZappoMan
bdabe709af added more color groups for false colorization from source 2013-08-05 11:11:10 -07:00
Mark Peng
ea0fa8e5c7 Merge remote-tracking branch 'upstream/master' 2013-08-05 11:03:01 -07:00
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