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

1121 commits

Author SHA1 Message Date
Stephen Birarda
72b53ea089 add Q_PROPERTY for handPosition 2013-08-07 10:41:32 -07:00
Stephen Birarda
c0793146bd Avatar instance in JS should be referenced as Avatar 2013-08-07 10:41:17 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
ZappoMan
24ec0b0ddc fixed packet header bug in createVoxelEditMessage() 2013-08-06 19:15:05 -07:00
ZappoMan
ecaaa60c75 Merge pull request #801 from ZappoMan/fun_fade 
fixed crash
 2013-08-06 16:27:21 -07:00
ZappoMan
23461c2e95 fixed crash 2013-08-06 16:26:48 -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
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
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -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
Stephen Birarda
d0330b0a28 include QVariantMap in AvatarData, map values to floats for glm::vec3 2013-08-06 11:56:54 -07:00
Stephen Birarda
b0783e4cce add Q_PROPERTY macro for position QVariantMap 2013-08-06 11:25:29 -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
Stephen Birarda
f3d6f1edd8 add Q_PROPERTY hooks for yaw, pitch, roll, chatMessage 2013-08-06 11:04:13 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -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
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
Stephen Birarda
d3b2ba1070 fix QtCore includes in voxels library 2013-08-05 17:40:01 -07:00
Stephen Birarda
d1aad8c387 fix sleep interval in Agent.cpp so it isn't 0 2013-08-05 17:39:23 -07:00
Stephen Birarda
7f8411b40d Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-05 17:22:00 -07:00
Stephen Birarda
51f978196b add back node type unassigned, fix sending of script URL 2013-08-05 17:21:06 -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
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
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
1c8c41463a fix compiler warning 2013-08-05 15:02:03 -07:00
ZappoMan
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -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
ZappoMan
14b7f58fef Kills local voxels if voxel server is removed from NodeList 
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
  voxel server is killed
 2013-08-05 13:47:18 -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
Andrzej Kapolka
2722cfa5ac Fix for GCC warning. #import? 2013-08-05 11:58:09 -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
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
ZappoMan
06e249b872 added command line options for jurisdiction settings 2013-08-02 15:38:43 -07:00
ZappoMan
db55160f9a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 14:40:39 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00