Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 15:14:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5264 commits 71 branches 56 tags 1.2 GiB
Commit graph

5264 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
179c2324f8 Merge pull request #798 from ZappoMan/multiple_voxel_servers 
fixed packets per second command line with new frame rate
 2013-08-06 15:07:52 -07:00
ZappoMan
634b69b545 Merge pull request #797 from machinelevel/dev4 
Rave demo changes per Ryan's request: Darken the world when you're in ra...
 2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa Merge pull request #796 from PhilipRosedale/touchLook 
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
 2013-08-06 14:59:28 -07:00
ZappoMan
19941a4a63 fixed packets per second command line with new frame rate 2013-08-06 14:51:46 -07:00
Philip Rosedale
4c9467a806 Merge pull request #794 from ZappoMan/multiple_voxel_servers 
Visualization for Voxel Server Add/Kill
 2013-08-06 14:44:42 -07:00
Eric Johnston
2e5dade413 Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. 
Also fixed a warning in AvatarData.cpp initialization
 2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 13:49:42 -07:00
ZappoMan
c93c6687bf fix build buster 2013-08-06 13:48:30 -07:00
ZappoMan
fb2a1cce50 Merge pull request #795 from machinelevel/dev4 
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
 2013-08-06 13:45:42 -07:00
Eric Johnston
9a4a0e2819 Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face. 2013-08-06 12:44:29 -07:00
Philip Rosedale
ebd5c4832a Merge branch 'master' of https://github.com/worklist/hifi into touchLook 2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506 Tuned gyro look, added better preferences 2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f Merge pull request #792 from Atlante45/turn_off_collisions 
Add option to turn collisions on and off
 2013-08-06 12:27:27 -07:00
Philip Rosedale
bb15eb664c Merge pull request #793 from machinelevel/dev4 
Rave glove: Fix initialization issues and activate mode switch.
 2013-08-06 12:15:01 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
Eric Johnston
ab31c3f82d Rave glove: Fix initialization issues and activate mode switch. 
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
 2013-08-06 11:59:58 -07:00
atlante45
ddf1b06bf9 Add option to turn collisions on and off 2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator 2013-08-06 11:07:58 -07:00
atlante45
97239968a5 Corrected wrong argument in sizeof 2013-08-06 11:05:00 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
13408b607e Merge pull request #790 from PhilipRosedale/touchLook 
Touch-driven pitch happens immediately even when wearing gyros
 2013-08-06 10:39:57 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Stephen Birarda
8e32a7d9a8 Merge pull request #789 from machinelevel/dev4 
Fixed per github feedback.
 2013-08-06 10:31:42 -07:00
Eric Johnston
fc23eaa825 Fixed per github feedback. 
Also, to prevent a repeat of yesterday's crash trouble, disabled the mode switch, so that those working on the rave mode can enable it locally for testing.
 2013-08-06 10:28:31 -07:00
Stephen Birarda
3310273664 Merge pull request #788 from machinelevel/dev4 
Rave glove fixes: removed double-stored glove mode members …
 2013-08-06 10:26:11 -07:00
Philip Rosedale
58cb852597 Touch-driven pitch happens immediately even when wearing gyros 2013-08-06 10:06:40 -07:00
Eric Johnston
16aae5993a Rave glove fixes: removed double-stored glove mode members 
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
 2013-08-06 07:33:18 -07:00
Eric Johnston
b97ceed071 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-08-06 07:06:51 -07:00
Eric Johnston
5b1976250d Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-08-06 06:52:17 -07:00
Philip Rosedale
e5de67152e Merge pull request #786 from Ventrella/particles 
Added member variables to Hand.cpp to manage rave glove mode switching
 2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c Merge pull request #787 from machinelevel/dev4 
Rave glove demo: network-glove fixes
 2013-08-05 18:58:04 -07:00
Jeffrey Ventrella
f9f925b70b removed printf 2013-08-05 17:30:04 -07:00
Eric Johnston
d85ce81313 Rave glove demo: network-glove fixes 
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
 2013-08-05 17:27:42 -07:00
Jeffrey Ventrella
cba42808c1 fixed initial rave glove mode 2013-08-05 17:24:31 -07:00
Jeffrey Ventrella
4ceba28632 working with Eric to fix transmission of hand data 2013-08-05 17:00:50 -07:00
ZappoMan
b016c08578 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	libraries/avatars/src/HandData.h
 2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats 2013-08-05 16:51:01 -07:00
Jeffrey Ventrella
2dbd0f7f31 Merge branch 'master' of https://github.com/worklist/hifi into particles 2013-08-05 16:31:49 -07:00
ZappoMan
01ba5ee81a adding jurisdiction to scene stats to implement add/drop effect, added command line to voxel server to not send environments 2013-08-05 16:30:08 -07:00
Jeffrey Ventrella
f51db292a4 ya 2013-08-05 16:26:32 -07:00
ZappoMan
cc8c92c4e0 Merge pull request #785 from machinelevel/dev4 
Disable hand receive logic to keep team from crashing while a bug is bei...
 2013-08-05 16:05:06 -07:00
Eric Johnston
39f9729acb Warning fix: virtual method needs virtual destructor 2013-08-05 16:03:17 -07:00
Eric Johnston
14e470133c More cleanup after crash tracing 2013-08-05 16:02:09 -07:00
Eric Johnston
858738a10a Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled 2013-08-05 15:56:49 -07:00
Eric Johnston
002a62d31e Disable hand receive logic to keep team from crashing while a bug is being tracked. 2013-08-05 15:46:12 -07:00
ZappoMan
07a61a3c8e Merge pull request #782 from Atlante45/master 
few fixes on rescaling and following
 2013-08-05 15:44:15 -07:00
Andrzej Kapolka
f010b8775b Merge pull request #784 from ey6es/master 
Fix for ground rendering (on OS X): enable GL_NORMALIZE, which overrides RESCALE_NORMALS.
 2013-08-05 15:28:16 -07:00
atlante45
55e34558cb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48 Normalize when we render the ground. This shouldn't be necessary, but it 
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand.  We'll have to look at that more closely later
on.
 2013-08-05 15:24:21 -07:00