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

4859 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeffrey Ventrella
8cecd67731 cleanup 2013-07-26 12:46:27 -07:00
Jeffrey Ventrella
ad00747c29 cleanup 2013-07-26 12:44:17 -07:00
Jeffrey Ventrella
13207c3b4c Merge remote-tracking branch 'upstream/master' into particles 2013-07-26 12:39:25 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
Stephen Birarda
718fa291cf Merge pull request #724 from ZappoMan/bug_fixes 
fix voxel-server crash
 2013-07-25 13:15:47 -07:00
Stephen Birarda
d444e4860b Merge pull request #722 from ZappoMan/unlimited_avatars 
split multiple avatars into multiple packets if needed
 2013-07-25 13:15:29 -07:00
ZappoMan
919f2a4a93 fix voxel-server crash 2013-07-25 12:56:00 -07:00
ZappoMan
212fddbd34 CR feedback 2013-07-25 12:29:17 -07:00
Jeffrey Ventrella
1d5bf20b80 clean up 2013-07-24 17:03:35 -07:00
Jeffrey Ventrella
5e2dcfee53 cleaned up some magic numbers 2013-07-24 16:52:37 -07:00
Jeffrey Ventrella
aee29a0ab1 cleaning up the particle system more 2013-07-24 16:37:13 -07:00
ZappoMan
c8bde7146e Merge branch 'master' of https://github.com/worklist/hifi into unlimited_avatars 2013-07-24 13:42:03 -07:00
Jeffrey Ventrella
288a218ae2 Merge remote-tracking branch 'upstream/master' into particles 2013-07-24 12:41:32 -07:00
Jeffrey Ventrella
2f28f3ea4b made some extra checks for bogus data coming in, and added more particle effects to rave glove hand 2013-07-24 12:41:01 -07:00
ZappoMan
bacb4f96e3 added notes 2013-07-24 09:59:51 -07:00
ZappoMan
31a1e3e7b5 Merge pull request #720 from LionTurtle/master 
Fix eyePosition so that lookatVectors point directly to eyes,
 2013-07-24 01:19:49 -07:00
ZappoMan
b2b67d2b3d split multiple avatars into multiple packets if needed 2013-07-24 01:18:54 -07:00
Mark Peng
7177b71bc7 Replace var in renderLookatIndicator with const IDENTITY_UP 2013-07-24 00:19:25 -07:00
Jeffrey Ventrella
f85690c1c4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-23 20:46:34 -07:00
Jeffrey Ventrella
903a248061 cleaned up some code and added asserts to help track down a crash 2013-07-23 20:46:09 -07:00
Stephen Birarda
adf3f29c29 Merge pull request #721 from ZappoMan/audio_select 
Implement Audio Source Selection
 2013-07-23 20:31:22 -07:00
ZappoMan
e7fb392f38 Merge branch 'master' of https://github.com/worklist/hifi into audio_select 2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350 dry up code 2013-07-23 20:08:57 -07:00
ZappoMan
9507cd8955 switched to vector 2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e more removing of SourceID from classes 2013-07-23 19:21:43 -07:00
ZappoMan
686bd6c5d1 removed _sourceID, using getNodeID() feature of Node class 2013-07-23 19:06:47 -07:00
ZappoMan
927b0b6708 style fixes 2013-07-23 18:31:57 -07:00
ZappoMan
13ba913fab made listen mode a typedef 2013-07-23 18:28:30 -07:00
ZappoMan
a12ebc63c3 made listen mode a typedef 2013-07-23 18:26:10 -07:00
Stephen Birarda
fb05726323 Merge pull request #718 from ZappoMan/voxel_stats 
Sends Voxel Stats from server to client
 2013-07-23 18:16:57 -07:00
Jeffrey Ventrella
062ee657ca added extra mode and started prototyping "ribbon" effect 2013-07-23 14:41:52 -07:00
ZappoMan
229d16b9c7 added local mode to injector 2013-07-22 23:06:08 -07:00
ZappoMan
c969570e8c working on selected audio 2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f LookatIndicator now scales with the avatar's scale. 2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226 Fix eyePosition so that lookatVectors point directly to eyes, 
even when looking at someone from above.
 2013-07-22 16:46:06 -07:00
ZappoMan
d5e62b0f5a CR feedback 2013-07-22 14:18:16 -07:00
ZappoMan
f4749aa916 CR feedback 2013-07-22 14:17:18 -07:00
ZappoMan
86aeaf175c CR feedback 2013-07-22 14:15:10 -07:00
ZappoMan
60750d1d80 CR feedback 2013-07-22 14:13:10 -07:00
ZappoMan
8186145d35 CR feedback 2013-07-22 14:09:29 -07:00
ZappoMan
70516c8cb4 CR feedback 2013-07-22 14:08:48 -07:00
Jeffrey Ventrella
90bc3e9a37 um, ok whatever 2013-07-22 14:08:41 -07:00
Jeffrey Ventrella
9f99bff791 Merge remote-tracking branch 'upstream/master' into particles 2013-07-22 14:08:19 -07:00
Jeffrey Ventrella
fdebe166ba fixed it so both leap hands produce particles 2013-07-22 14:07:51 -07:00
ZappoMan
d3c46cce8f CR feedback 2013-07-22 14:01:47 -07:00
ZappoMan
307cfcc7a2 CR feedback 2013-07-22 13:58:15 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
Stephen Birarda
4ce2a8a675 Merge pull request #719 from machinelevel/dev4 
Minor tweaks to Rave Glove mode, per Ryan's testing
 2013-07-22 13:50:48 -07:00
Jeffrey Ventrella
8a55db53ce merge 2013-07-22 10:42:18 -07:00
Jeffrey Ventrella
5f0d52ce89 uh, whatever 2013-07-22 10:35:02 -07:00