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

332 commits

Author SHA1 Message Date
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Dimitar Dobrev
52c8ccb698 Added a define to ensure the build works without qxmpp. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
fe2f9f5253 Prevented empty time stamps - when less then a minute has passed - from 
appearing.
 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
858e9fa7df Ensured sent chat messages are always wholly visible. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
ed90e45c96 Ensured messages are always aligned at the top to user names, and users 
onine are deleted.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
60bf473be7 Improved the adherence to code conventions after a code review. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
acb2793053 Ensured messages are sent to the group chat rather than to individual 
users.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
9eb217794c Added time stamps to the chat. Enabled translations. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
437cadf360 Added a basic version of the chat window. 2014-03-12 01:24:30 +02:00
ZappoMan
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
Stephen Birarda
1ef780c6cb make headers coding standard compliant 2014-03-06 16:24:58 -08:00
Stephen Birarda
7ef882c525 make sure InterfaceConfig is included before Qt headers 2014-03-06 16:14:18 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
1bcb595f57 add missing interface config includes for windows 2014-03-06 13:52:06 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Stephen Birarda
b670859aaa reference SharedUtil from LogDialog as a library header 2014-03-06 12:46:06 -08:00
Andrzej Kapolka
23556f0cf7 Fix for merging after streaming, added ability to "set" a spanner's attributes 
in the actual metavoxel data.
 2014-03-06 12:38:11 -08:00
Stephen Birarda
e7b166a304 Revert "include InterfaceConfig before Application to fix win build" 
This reverts commit dde2b199c9.
 2014-03-06 12:35:20 -08:00
Stephen Birarda
dde2b199c9 include InterfaceConfig before Application to fix win build 2014-03-06 12:14:14 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Andrzej Kapolka
7a182ed659 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 13:10:23 -08:00
Atlante45
66b0590509 Review fixes 2014-03-04 10:48:53 -08:00
Atlante45
bb3c8f2a7a Removed ClipboardOverlay 2014-03-03 17:54:58 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
Andrzej Kapolka
c1a89517a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-28 18:11:46 -08:00
Atlante45
4bcb43f7dd Added an overlay system for local trees 2014-02-28 15:10:53 -08:00
Philip Rosedale
bae16e24e8 new audio buffer display text, cleanup drawText() 2014-02-27 23:17:39 -08:00
Andrzej Kapolka
1dfb72173d Hide metavoxel editing bits when mouse is hidden. 2014-02-26 16:44:00 -08:00
Andrzej Kapolka
92ab3cd09a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-25 11:21:35 -08:00
Andrzej Kapolka
718439014a Compute the mesh extents for geometry and use them to set the spanner bounds. 2014-02-24 17:28:11 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
Atlante45
e66ec6b702 Final fix for clipboard preview 2014-02-21 15:47:40 -08:00
Atlante45
e8c9dc50d0 Hack to get preview working 2014-02-21 15:23:28 -08:00
Atlante45
fc7692417f Fix is3D not set to true 2014-02-21 15:15:16 -08:00
Andrzej Kapolka
b408e31d91 More work on spanners. 2014-02-20 17:18:15 -08:00
Atlante45
989a76fe6e Hooked up Clipboard preview 2014-02-20 16:56:40 -08:00
Andrzej Kapolka
25ae81e2de More work on spanners. 2014-02-19 15:25:21 -08:00
Stephen Birarda
0b4021ea43 switch to ini settings file by default for Interface, closes #2029 2014-02-19 13:17:53 -08:00
Stephen Birarda
78c246f1ba repair to saveSnapshot call from interface 2014-02-19 13:08:57 -08:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Andrzej Kapolka
4e7a7892ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 12:06:55 -08:00
Andrzej Kapolka
0138ecb3b2 Layout tweaks. 2014-02-19 11:35:45 -08:00
Andrzej Kapolka
3c4d2aa199 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 10:29:57 -08:00
Andrew Meadows
4010f3ab3f Remove Avatar::_head, use AvatarData::_headData 2014-02-18 17:41:46 -08:00
Andrzej Kapolka
55e2ebd92f More spanner bits. 2014-02-18 13:58:44 -08:00
stojce
7621d70c24 use base class - replaced MyAvatar with Avatar 2014-02-18 08:11:59 +01:00
Andrzej Kapolka
5513524705 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-17 21:48:37 -08:00
Andrzej Kapolka
494685140b Various bits of work on spanners. 2014-02-17 21:44:32 -08:00
stojce
6c2f3b687e removed unnecessary references 2014-02-18 01:50:55 +01:00
stojce
0df0c23c32 Windows build fix (3) 2014-02-17 21:14:28 +01:00
stojce
677e6f5ce9 windows build fix (2) 2014-02-17 20:19:35 +01:00
stojce
2ba7426757 windows build fix 2014-02-17 19:25:53 +01:00
stojce
13485065a5 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-17 18:59:44 +01:00
ZappoMan
dd0909659a Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-16 19:20:06 -08:00
ZappoMan
d101f19e40 removed bounds properties from Overlay so it only lives in Overlay2D 2014-02-16 13:39:01 -08:00
ZappoMan
78f4df912d added 3D line overlay support 2014-02-16 13:25:49 -08:00
ZappoMan
7c350b3acb add 3D sphere overlay support 2014-02-16 12:30:15 -08:00
ZappoMan
5abf908874 added 3D cube overlay support 2014-02-16 11:36:06 -08:00
ZappoMan
cb1c659e2e fix windows 2014-02-15 21:25:20 -08:00
ZappoMan
ef11865d24 implement text overlay support 2014-02-15 21:13:44 -08:00
ZappoMan
0a9f9a7c7a fix windows build 2014-02-15 19:20:08 -08:00
ZappoMan
37bb85fca6 tweaks to overlays 2014-02-15 19:15:30 -08:00
ZappoMan
f7f695d145 add support for detecting clicked on overlays 2014-02-15 17:45:42 -08:00
ZappoMan
1ddd856ca8 removed getProperties() which was not implemented 2014-02-15 16:31:09 -08:00
ZappoMan
f6adce255d more work on image overlays 2014-02-15 16:26:34 -08:00
Andrzej Kapolka
3e40927d3a More work on spanning objects. 2014-02-14 18:01:48 -08:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
ZappoMan
20a6f4eea9 first cut at auto-LOD adjustment 2014-02-12 21:22:21 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -08:00
Andrzej Kapolka
5b207e4f8e Work on creating new attributes. 2014-02-12 17:10:32 -08:00
Andrzej Kapolka
d6d95a586d Working on deleting attributes. 2014-02-12 14:16:14 -08:00
stojce
0244ead5df fixed glm::quat initialization 2014-02-12 21:06:30 +01:00
ZappoMan
8e3e7c1537 first experimental cut at overlay image 2014-02-11 17:18:24 -08:00
stojce
68584c654b Allow drag-and-drop of snapshots into Interface 2014-02-12 02:12:52 +01:00
Stephen Birarda
05f086ae74 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-07 13:48:28 -08:00
Stephen Birarda
3ad8e7260e fix an accidental DOS and remove getNodeActiveSocketOrPing API 2014-02-07 13:42:52 -08:00
Stephen Birarda
b988308a8d leverage writeDatagram helper in NodeList, ping if no active socket 2014-02-07 09:49:54 -08:00
Andrzej Kapolka
7dfb83b6cc Fix for obtaining values from editor. 2014-02-03 14:35:29 -08:00
Andrzej Kapolka
a7ebcf5a96 Layout fix. 2014-01-30 11:24:24 -08:00
Andrzej Kapolka
8df4e884e4 Fix box color on hovering. 2014-01-30 11:15:03 -08:00
Andrzej Kapolka
64df9718f2 Working on object attributes. 2014-01-29 16:36:44 -08:00
Andrzej Kapolka
e99b7ea92c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-01-29 13:34:19 -08:00
Andrzej Kapolka
4c70af51e8 Expand data automatically to encompass edits. 2014-01-29 13:30:54 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Andrzej Kapolka
674bc70223 Offset adjustment. 2014-01-28 15:50:13 -08:00
Andrzej Kapolka
f435f61467 Start the grid position off roughly at our feet. 2014-01-28 15:46:02 -08:00
Andrew Meadows
1cc992a7f8 import --> include 2014-01-28 14:18:21 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Andrzej Kapolka
1e4bfffdd8 Retain a shared node pointer, use the active socket. Fixed a compile warning. 2014-01-27 16:41:25 -08:00
Andrzej Kapolka
fbcd4cf363 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-27 15:50:45 -08:00
Andrzej Kapolka
d5695395c4 Basic editing with delta streaming up and running. 2014-01-27 15:49:50 -08:00
stojce
c82a8a152e Set JPG quality to 100 2014-01-27 20:59:46 +01:00
stojce
40ea552981 filename format changes 
- new wav file
- changed filename format
 2014-01-27 20:35:06 +01:00
stojce
74801da07f #19491 - Implement in-app snapshots 2014-01-27 18:07:03 +01:00
Andrzej Kapolka
1ef6f5f7b3 MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2. 2014-01-26 13:23:10 -08:00
Andrzej Kapolka
f61648c848 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-24 16:04:05 -08:00
Andrzej Kapolka
7f20750e80 Working on sending edits. 2014-01-24 16:03:25 -08:00
Brad Hefta-Gaub
692358bf6e fix windows builds 2014-01-24 09:51:17 -08:00
Andrzej Kapolka
f73f16b0fb Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 18:12:52 -08:00
Andrzej Kapolka
c4254cd423 Fix OS X warning. 2014-01-23 18:08:45 -08:00
Andrzej Kapolka
4414c91f1e Working on streaming edits. 2014-01-23 18:05:04 -08:00
Andrzej Kapolka
4e3988f843 Have the drag-out box show up in the selected color. 2014-01-23 11:20:07 -08:00
Andrzej Kapolka
a3ffb1d8a3 Working on performing the actual edit. 2014-01-22 19:17:48 -08:00
Andrzej Kapolka
4c07d61257 Get value from editor. 2014-01-22 16:34:48 -08:00
Andrzej Kapolka
ff4795d9a5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-22 15:59:02 -08:00
Andrzej Kapolka
ba8791274f Remove test script for now, working on actual edits. 2014-01-22 15:58:41 -08:00
ZappoMan
29ce6db285 Merge pull request #1628 from birarda/dialog-fix 
updates to UpdateDialog ui loading
 2014-01-22 15:31:28 -08:00
Andrzej Kapolka
e545cfe406 Fix for planes not at the origin. 2014-01-22 14:33:47 -08:00
Stephen Birarda
a0b859a8e3 remove unneeded includes in UpdateDialog 2014-01-22 14:19:57 -08:00
Stephen Birarda
d2e02c15d8 repair the UpdateDialog so it is a QDialog with no child QWidget 2014-01-22 14:17:56 -08:00
Andrzej Kapolka
f2cfd868a6 MetavoxelEditorDialog -> MetavoxelEditor. 2014-01-22 13:57:59 -08:00
Andrzej Kapolka
064f0cd3ab Basic drag-out behavior for metavoxel editing. 2014-01-22 13:55:14 -08:00
Stephen Birarda
fb0f28cd7c fix LogDialog deadlock by removing unneeded mutex, closes #1624 2014-01-22 13:46:37 -08:00
Andrzej Kapolka
15021b6ebc More work on metavoxel editing (track mouse ray intersection with grid). 2014-01-22 11:11:12 -08:00
Andrzej Kapolka
0a3d6ae5e0 More work on metavoxel editing (grid, etc.) 2014-01-21 19:31:56 -08:00
Andrzej Kapolka
230b66680f More work on the editor. 2014-01-21 17:20:12 -08:00
Andrzej Kapolka
5b4447d0b9 More work on metavoxel editing. 2014-01-21 16:17:31 -08:00
Andrzej Kapolka
d9589cd898 Starting on metavoxel editor dialog. 2014-01-21 11:43:15 -08:00
Leonardo Murillo
b2ef07f485 PR Fixes 2014-01-21 11:17:43 -06:00
Leonardo Murillo
b972d4260c PR Fixes 2014-01-21 10:31:16 -06:00
Leonardo Murillo
f6bc7a2c4b I think last fixes 2014-01-20 11:51:17 -06:00
Leonardo Murillo
3d5d02d5b0 Some more changes 2014-01-18 20:33:29 -06:00
Leonardo Murillo
7748002db7 More PR related changes 2014-01-18 20:27:56 -06:00
Leonardo Murillo
cd9f2fd240 Pull Request fixes 2014-01-18 20:17:47 -06:00
Leonardo Murillo
9582fadef4 Last changes 2014-01-17 13:44:03 -06:00
Leonardo Murillo
93e4dc7d5a PR Changes 2014-01-17 13:35:49 -06:00
Leonardo Murillo
82ecc9cc36 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 13:06:59 -06:00
Leonardo Murillo
b8aaf4e813 CR fixes 2014-01-17 13:06:54 -06:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Leonardo Murillo
f975c8ff69 Removing unneeded vars 2014-01-15 12:45:26 -06:00
Leonardo Murillo
049be6a569 Finishing changes 2014-01-15 12:40:40 -06:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Leonardo Murillo
80946b10b3 Merge 2014-01-14 22:12:37 -06:00
Leonardo Murillo
f9bb98680d Using Qt Designer .ui file instead of manually coding dialog 2014-01-14 21:57:28 -06:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Leonardo Murillo
1c2b27f0f4 Checkpoint 2014-01-10 15:18:24 -06:00
Leonardo Murillo
da2f814b7a Merge branch 'master' of github.com:/worklist/hifi 2014-01-10 14:08:22 -06:00