Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 10:41:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26077 commits 72 branches 59 tags 1.2 GiB
Commit graph

1078 commits

Author SHA1 Message Date
stojce
1ac583edca Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-10 22:57:55 +01:00
ZappoMan
3bf8dd87e8 Merge branch 'master' of https://github.com/worklist/hifi into more_events 2014-02-09 10:32:14 -08:00
stojce
b05967a514 Custom URL handler 2014-02-09 17:47:46 +01:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
Philip Rosedale
9655e93432 Remove re-coloring of voxels on hover or click, anticipating switch to scripted behavior 2014-02-08 19:13:43 -08:00
Stephen Birarda
455442088c Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer 2014-02-07 13:45:14 -08:00
ZappoMan
41f6650b20 implement movable independent camera with hydra 2014-02-07 01:23:30 -08:00
ZappoMan
77e7f336d5 scriptable camera 2014-02-06 20:03:57 -08:00
Stephen Birarda
97a7369c76 remove senderWithAddress from NodeList 2014-02-06 14:43:46 -08:00
Stephen Birarda
6f638fa62c have domain-server create a UUID for unidentified nodes, closes #1840 2014-02-06 10:34:34 -08:00
Stephen Birarda
f92f9ec0c2 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-06 09:28:03 -08:00
ZappoMan
f657a3efe9 remove local cache option 2014-02-05 20:02:01 -08:00
Stephen Birarda
26c961dc66 send identity packets when changes occur between keyframes 2014-02-04 14:24:13 -08:00
Andrew Meadows
a5aff81881 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 2014-01-31 17:44:13 -08:00
Andrew Meadows
ed93d8db39 Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar. 2014-01-31 17:42:48 -08:00
Stephen Birarda
217135a8d6 repairs to VoxelImporter to remove QCoreApplication warning 2014-01-31 11:00:44 -08:00
Stephen Birarda
a5b0675f24 sendPingPackets method need not be static 2014-01-31 09:58:29 -08:00
Andrew Meadows
82a4b7a4d1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 13:20:42 -08:00
Andrew Meadows
677341d207 fix for crash bug #1728. 
Moving _myAvatr to live in AvatarManager.  Application still has a
pointer to it.  Unfortunately the order of Application initialization
and destruction matters very much.
 2014-01-28 18:04:42 -08:00
Stephen Birarda
423e1598f0 use NodeSet in place of QSet<NodeType_t> where possible 2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
2aaa9ce3f6 resolve conflicts on merge with upstream master 2014-01-28 12:30:43 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
stojce
74801da07f #19491 - Implement in-app snapshots 2014-01-27 18:07:03 +01:00
Lucas Crisman
cece4add27 Merge branch 'master' of git://github.com/worklist/hifi into 19487 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-01-24 15:01:24 -03:00
Lucas Crisman
c3aa8167d6 click on stats to expand/contract them 2014-01-24 07:18:45 -03:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
Lucas Crisman
f818b07dc8 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-23 22:18:33 -03:00
AndrewMeadows
6120416cbb Merge pull request #1627 from ey6es/metavoxels 
Basic metavoxel editing interface (doesn't actually perform any edits yet).
 2014-01-23 16:37:22 -08:00
Stephen Birarda
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Stephen Birarda
ed9118fd67 more NodeList QSet changes, closes #1660 2014-01-23 15:28:46 -08:00
Stephen Birarda
c432a34cfb fix rendering of Avatars 2014-01-23 14:51:29 -08:00
Stephen Birarda
9ab1fc4c2c resolve conflicts on merge with upstream/master 2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c complete migration of Avatar list to AvatarManager 2014-01-23 14:41:11 -08:00
Stephen Birarda
a9f1984676 add an AvatarManager that will keep Avatars in Application thread 2014-01-23 11:59:24 -08:00
Andrzej Kapolka
61d97454d7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 11:54:08 -08:00
Stephen Birarda
24bed09473 DatagramProcessor need not be a pointer in Application 2014-01-23 11:13:03 -08:00
Stephen Birarda
b5a72ef669 more nodelist repairs for concurrency issues 2014-01-23 11:11:22 -08:00
Lucas Crisman
95837b89c0 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-23 15:54:14 -03:00
Andrzej Kapolka
a5b0fe38ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 10:52:03 -08:00
Stephen Birarda
7efc9e2e78 move datagram processing back to separate thread 2014-01-23 10:32:23 -08:00
Andrzej Kapolka
a3ffb1d8a3 Working on performing the actual edit. 2014-01-22 19:17:48 -08:00
Andrzej Kapolka
e552134cf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 14:19:26 -08:00
Lucas Crisman
cba616e6f2 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-22 18:36:41 -03:00
Lucas Crisman
d86aa227a4 UI stats improvements: first cut 2014-01-22 16:42:09 -03:00
Andrzej Kapolka
15021b6ebc More work on metavoxel editing (track mouse ray intersection with grid). 2014-01-22 11:11:12 -08:00
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Andrzej Kapolka
d473b002a8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 17:20:24 -08:00
Andrzej Kapolka
230b66680f More work on the editor. 2014-01-21 17:20:12 -08:00
Stephen Birarda
105fb42b34 rewrite mesh and skeleton requests from data-server 2014-01-21 16:46:04 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Brad Hefta-Gaub
03a9253748 remove usage of ParticleEditHandle from application 2014-01-21 14:07:46 -08:00
Leonardo Murillo
b2ef07f485 PR Fixes 2014-01-21 11:17:43 -06:00
Leonardo Murillo
a9c294099e Merge branch 'master' of github.com:/worklist/hifi 2014-01-21 10:00:00 -06:00
aw
0eed041deb scripts save on exit and load on entry 2014-01-20 22:58:01 -08:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08: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
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Leonardo Murillo
99275dadd4 PR Changes 2014-01-17 14:39:34 -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
Brad Hefta-Gaub
1cfbfe6611 fix 3d mode switch on/off issue 2014-01-16 14:54:08 -08: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
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
Leonardo Murillo
746b45d939 Moving ifdef to xml 2014-01-15 15:08:47 -06:00
Leonardo Murillo
049be6a569 Finishing changes 2014-01-15 12:40:40 -06:00
Brad Hefta-Gaub
7bfda0d60e removed pthread.h 2014-01-15 10:30:05 -08: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
Stephen Birarda
e76a37f48b resolve conflicts on merge with upstream master 2014-01-14 16:26:02 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
77ee27e5d7 resolve conflicts on merge with upstream master 2014-01-14 16:12:42 -08:00
Stephen Birarda
767a241105 Merge remote-tracking branch 'upstream/master' into nodelist-container 2014-01-14 16:08:58 -08:00
Stephen Birarda
4ea14a51fc remove the SerialInterface 2014-01-14 13:14:15 -08:00
Stephen Birarda
bdc31a3b48 replace the DomainChangeListener class with a signal/slot combo 2014-01-14 11:38:05 -08:00
Stephen Birarda
53d435006c more follow mode cleanup, fix silent node iterator 2014-01-14 10:07:26 -08:00
Leonardo Murillo
24bedc90a7 Resolving conflicts 2014-01-14 10:30:52 -06:00
Stephen Birarda
3ab7a6d9d5 move network packet processing to main thread 2014-01-13 17:58:48 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
2217d79200 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:57:52 -08:00
Andrzej Kapolka
9d831a2ab5 Orbit around voxel center, limit hover distance. 2014-01-13 14:43:59 -08:00
Brad Hefta-Gaub
c7ec767565 near/far apparently don't work as variables in windows 2014-01-11 22:38:08 -08:00
Brad Hefta-Gaub
b0e913bfce add Audio back to win32 2014-01-11 22:30:55 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Andrew Meadows
8799ad133e merge again after some competing pull requests were processed 2014-01-10 16:00:08 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Leonardo Murillo
1c2b27f0f4 Checkpoint 2014-01-10 15:18:24 -06:00
Leonardo Murillo
ede32cfadc Checkpoint 2014-01-10 14:08:10 -06:00
Leonardo Murillo
664a1a7677 Checkpoint 2014-01-09 20:12:39 -06:00
Brad Hefta-Gaub
6e95c52444 make local voxel cache properly switch to different cache file when switching domains 2014-01-09 14:51:04 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Leonardo Murillo
efb173e1d4 Preliminary update dialog work 2014-01-08 21:20:43 -06:00
Leonardo Murillo
d44126ac33 Get version XML and store latest version as application property 2014-01-08 08:30:50 -06:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
ZappoMan
32b2fb8f21 cleanup 2013-12-28 12:08:24 -08:00
ZappoMan
a43844447c first cut at 3D TV support 2013-12-28 10:07:33 -08:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
ZappoMan
41490991ff Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	interface/src/Application.h
 2013-12-18 15:50:03 -08:00
Stojce Slavkovski
45d926da41 CR fixes 2013-12-18 20:37:45 +01:00
ZappoMan
70e9781ad9 CR feedback new class names 2013-12-18 08:42:34 -08:00
ZappoMan
a59650beac Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 2013-12-17 19:50:39 -08:00
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57 first cut at scriptable controller 2013-12-17 15:23:09 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
ZappoMan
74d9c05c44 added particle server details to voxel stats dialog 2013-12-17 11:32:20 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
Andrzej Kapolka
6888dc4eeb Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-16 13:44:44 -08:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Philip Rosedale
1b1fdd3dc4 add menu option for sixense filter 2013-12-13 15:21:32 -08:00
Andrzej Kapolka
41c7b9ce29 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-13 15:00:05 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
Andrzej Kapolka
652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
 2013-12-12 15:36:37 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
ZappoMan
1a6f730659 add findClosestParticle() 2013-12-12 12:24:07 -08:00
ZappoMan
28c5d5b7bf removed unused variable 2013-12-12 11:01:37 -08:00
Andrzej Kapolka
5ec9017d3b More metavoxel bits. 2013-12-11 18:00:17 -08:00
ZappoMan
4acadabaa5 adding better support for ParticleEditHandle to allow access to particles after being created 2013-12-11 17:46:18 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
ZappoMan
ae1576b9f5 CR cleanup and add shootParticle() to application 2013-12-10 17:07:11 -08:00
Andrzej Kapolka
6ba750a963 More progress on generic attributes, metavoxel node management. 2013-12-10 15:44:48 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
ZappoMan
bc715085a9 Merge pull request #1304 from PhilipRosedale/master 
Voxel drumming, search function to find leaf voxel containing a point
 2013-12-04 11:28:39 -08:00
Stephen Birarda
eb316a450a Merge pull request #1298 from ZappoMan/move_hideshow_to_thread 
Move Hide/Show local voxels to a dedicated thread
 2013-12-04 11:27:14 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Stephen Birarda
8fbd1e4cfb repairs after merge with upstream master 2013-12-03 12:28:44 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Philip Rosedale
a84e97c54a Removed obsolete HandControl class, files 2013-12-03 08:29:17 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
44f92fb47c Merge pull request #1297 from PhilipRosedale/master 
Voxel editing with hands, flying by pointing hands
 2013-12-02 12:46:04 -08:00
ZappoMan
76b3bd4e6e Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing 2013-12-02 12:08:45 -08:00
Andrzej Kapolka
635eb7c52d Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-12-02 09:55:27 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
2456c26207 changed function name so less confusing 2013-12-01 20:46:42 -08:00
Philip Rosedale
ea850368de First working voxel insertion at fingertip 2013-12-01 20:16:14 -08:00
Philip Rosedale
9680941500 Add palm velocity 2013-11-29 14:50:18 -08:00
ZappoMan
7f9d0849bd added more client side voxel stats including lost packets, out of order packets, and average flight time 2013-11-27 13:37:47 -08:00
Andrzej Kapolka
fa5f8b093c Screw it; just use the standard mouse hiding. 2013-11-26 15:07:40 -08:00
Andrzej Kapolka
bdba05785e Mouse pointer fix fix. 2013-11-26 15:00:49 -08:00
Andrzej Kapolka
600b05fcc9 Oculus mouse pointer fix. 2013-11-26 14:50:43 -08:00
Andrzej Kapolka
c5406c47a6 Moved Oculus code out of Application, started on using StereoConfig to get 
actual values to replace the magic numbers.
 2013-11-26 11:59:06 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
Andrzej Kapolka
3137e9a3e6 Don't leave out the head when we draw our shadow. 2013-11-21 13:57:55 -08:00
Andrzej Kapolka
f38e74c51c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:18:56 -08:00
Andrzej Kapolka
3cf47f8d5c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:08:45 -08:00
Andrzej Kapolka
7bc65136c7 Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 11:00:09 -08:00
Andrzej Kapolka
4bcc6fdc0d More progress on shadows. 2013-11-20 18:27:59 -08:00
Andrzej Kapolka
5cc5d9bba8 Progress towards shadow maps. 2013-11-20 16:23:54 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
Andrzej Kapolka
1f2fe5ddee Rudimentary Sixense (Razer Hydra) support. 2013-11-15 18:06:32 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
ZappoMan
8de113e65c adding jurisdiction details to voxel stats dialog 2013-11-13 14:22:57 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
Andrzej Kapolka
0c8799bb3d Tweaks to voxel editing: edit from farther away, expand cubes to make sure 
they show up over voxels, initialize voxel scale with moused-over scale.
 2013-11-05 12:12:54 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
Andrzej Kapolka
b2ed29dbff Work around precision issues with multiplying matrices with high translation 
magnitudes (by using relative translation).
 2013-11-04 16:49:12 -08:00
Andrzej Kapolka
33c61937ab Remove unused parameters. 2013-11-04 11:31:05 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
ZappoMan
6fd3c9714f fixed header file merge conflict 2013-11-01 14:37:46 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
Andrzej Kapolka
fdc44f5ec4 Have the hand fall to the side when the mouse is hidden. 2013-10-31 16:06:42 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
stojce
4fe9964e5a reset view 
- reset icon
- resetView signal
 2013-10-28 18:19:31 +01:00
stojce
b09e657ecc click mirror behaviour 
- shrink function - restore mirror window view and set forward
fullscreen view
 2013-10-27 09:57:00 +01:00
stojce
f675b198cb RearView Tools 
- moved to separate class
- new icon/button for restore view
-
 2013-10-26 21:10:05 +02:00
Don Park
e44b0af9b6 make updateWindowTitle public, call it after Menu loads data into the Profile 2013-10-25 11:36:50 -07:00
Don Park
dc420beaf2 updateWindowTitle() 2013-10-25 10:09:34 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
161367c899 fix rear view mirror mode to only render self 2013-10-23 11:58:01 -07:00
Andrzej Kapolka
a568e71e37 Merge pull request #1099 from stojce/19433 
Code Review for Job #19433
 2013-10-23 10:03:36 -07:00
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
stojce
890313b8ca - fixed aspect ratio on mirror view 
- stop rendering voxel selectors on mirror view
 2013-10-21 23:55:08 +02:00
ZappoMan
023a521948 some debug timing and voxel stats display 2013-10-21 14:39:05 -07:00
stojce
b45525ae21 Mirror View initial setup 2013-10-21 08:28:38 +02:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
ZappoMan
6f9fdfba2f make mouse cursor hiding more aware of focused window and bounds 2013-10-14 11:39:48 -07:00
ZappoMan
e91127bc5c implement hide cursor on no mouse movement 2013-10-11 14:56:37 -07:00
ZappoMan
c6df36a40b Merge pull request #1047 from stojce/19434 
Code Review for Job #19434
 2013-10-11 12:52:13 -07:00
Philip Rosedale
43e01ee105 Merge pull request #1039 from birarda/data-server 
add ability to jump to a user's domain and location
 2013-10-10 15:37:21 -07:00
Stephen Birarda
9112efaa36 move username change to Login, add lastPosition and lastDomain 2013-10-09 13:00:05 -07:00
Philip Rosedale
8dc84fc841 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:44:56 -07:00
Philip Rosedale
ce2e31ddd5 reconnecting particle cloud 2013-10-08 22:21:55 -07:00
Stephen Birarda
85edb93710 add a Profile class to hold user data from data-server 2013-10-08 12:13:45 -07:00
stojce
16d10775dc #19434 restore window position on start 
- store position and size on app end
- restore position and size on app start
 2013-10-07 21:04:36 +02:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
4dec183262 Enlarge heads when they're moused over. 2013-09-26 12:07:13 -07:00
Andrzej Kapolka
63efeccb13 Renaming for clarity. 2013-09-25 17:38:37 -07:00
Freddy
36104d0b06 remove unused older voxel grab thrust 2013-09-23 23:04:27 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
LionTurtle
394e660ac3 Use WASD to move nudge guide instead of mouse. 
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
 2013-09-13 17:51:10 -07:00
LionTurtle
0251349221 Change nudge UI to be more consistent with classic editing UI. 
Add menu option for Delete and fix delete for VoxelSelectMode.
 2013-09-13 13:41:26 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07:00
LionTurtle
59943dc2e8 Merge branch 'nudge' 
Conflicts:
	interface/src/Menu.cpp
	libraries/voxels/src/VoxelTree.h
 2013-09-05 17:58:39 -07:00
LionTurtle
868ef8bec6 Add VoxelNudgeMode and preliminary UI grid for nudging. 2013-09-05 17:42:25 -07:00
Andrzej Kapolka
32af1de3ac For clarity, break the projection matrix update out of resizeGL. 2013-09-05 12:34:25 -07:00
LionTurtle
6e37bc3644 Nudge code working for nudge that is greater than or equal to leaf size. 2013-09-05 11:06:12 -07:00
Andrzej Kapolka
0a9db6a5ee Moved device-related files to "devices" folder. 2013-09-04 12:15:36 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
atlante45
1dc8d8dd0c Added LOD to preview + Shared voxelSystem for reduced memory consumption 2013-08-29 17:59:36 -07:00
Andrzej Kapolka
2cff4b6b3a "Laser pointer" for transmitter. 2013-08-22 17:09:23 -07:00
ZappoMan
69842ef82f Merge pull request #878 from LionTurtle/master 
Add MyAvatar class, subclass of Avatar class.
 2013-08-21 16:55:24 -07:00
Andrzej Kapolka
6dbaedd921 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-21 15:46:14 -07:00
Andrzej Kapolka
d63bb3afaa Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
ZappoMan
18dbfd5cc7 Merge pull request #877 from Atlante45/separate_import_with_preview 
New paste behaviour
 2013-08-21 13:44:17 -07:00
LionTurtle
1300bf7de2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
 2013-08-21 13:36:28 -07:00
LionTurtle
f4109b3fb4 Add MyAvatar subclass. For functions such as render() and simulate(), 
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
 2013-08-21 13:24:54 -07:00
atlante45
bae0f7fa1b New paste behaviour 2013-08-21 13:21:15 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
ZappoMan
d5f94d0f05 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-20 11:42:51 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
Andrzej Kapolka
2c9a8dfebc Merge branch 'master' of https://github.com/worklist/hifi into ssao 
Conflicts:
	interface/src/Application.h
 2013-08-19 10:42:12 -07:00
atlante45
6b58e1bfec merge 2013-08-16 20:24:18 -07:00
Stephen Birarda
4a13f3b75a move swatch reset to Menu 2013-08-15 15:52:47 -07:00
Stephen Birarda
0ec2b761e9 remove some extra methods after menu cleanup 2013-08-15 15:44:03 -07:00
Stephen Birarda
e18be2cb36 hook audio listening modes and complete cleanup for debug 2013-08-15 15:37:09 -07:00
Stephen Birarda
c7be2e13cd repair false coloring by distance 2013-08-15 15:12:05 -07:00
Stephen Birarda
cf5c53281b repair first couple of false colorize methods 2013-08-15 15:07:49 -07:00
atlante45
90a44acbc1 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-15 14:59:51 -07:00
Stephen Birarda
f72f9d8735 fix hook to render pipeline warnings and kill local voxels 2013-08-15 14:57:40 -07:00
Stephen Birarda
474b0465a7 hook tree stat calculation to menu 2013-08-15 14:50:12 -07:00
Stephen Birarda
eb4508aafb hook timing tests to Menu 2013-08-15 14:46:25 -07:00
Stephen Birarda
87bb260dcc hook menu to voxel cut/copy/paste operations 2013-08-15 14:42:41 -07:00
Stephen Birarda
cd000cb7c1 remove the particle system from ground plane 2013-08-15 14:37:27 -07:00
ZappoMan
209c9f93ed remove Application dependency from VoxelEditPacketSender class 2013-08-15 14:21:21 -07:00
Andrzej Kapolka
cceeb1c6ff Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-15 13:11:12 -07:00
Stephen Birarda
4903122432 fix hooks to voxel stats dialog 2013-08-15 12:38:26 -07:00
Stephen Birarda
d257b70103 fixes for new Menu class after merge with upstream/master 2013-08-15 12:29:04 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -07:00
Stephen Birarda
811fc87294 move avatar size changes to Avatar slots 2013-08-15 12:18:19 -07:00
Stephen Birarda
3a42bda0f2 repairs after merge with upstream master 2013-08-15 11:42:30 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -07:00
Stephen Birarda
a2ed48ed1d Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 11:38:33 -07:00
Stephen Birarda
bbe239694e move Avatar goHome to Avatar slot 2013-08-15 11:36:12 -07:00
Stephen Birarda
c6baa56022 update Q_OS_MAC ifdefs for Qt 5 2013-08-15 11:12:17 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -07:00
Andrzej Kapolka
94e5c8d4a1 Missed a spot in the merge. 2013-08-15 10:10:14 -07:00
Andrzej Kapolka
3ad0b8b99d Merge branch 'master' of https://github.com/worklist/hifi into ssao 
Conflicts:
	interface/src/Application.h
 2013-08-15 10:06:22 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
ZappoMan
f09dcfa4b7 Merge branch 'master' of https://github.com/worklist/hifi into voxel_sending_helper 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-08-14 13:12:23 -07:00
Andrzej Kapolka
581b60995a Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-13 14:37:10 -07:00
atlante45
c095b6b0b3 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-13 14:30:57 -07:00
Andrzej Kapolka
48bee0e52c Gonna access that vector from two threads? Need to lock it. 2013-08-13 14:29:49 -07:00
Andrzej Kapolka
01cd0d2a1f Have the glow effect add half of the original texture, too, and use it on the 
follow indicator.
 2013-08-13 14:22:29 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
Andrzej Kapolka
c1f6794295 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-13 09:49:18 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
4ea0de1637 deleting old dead code 2013-08-12 13:39:01 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
8e2fcffd5c enabled Low Res sending while moving by default 2013-08-10 11:58:25 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
atlante45
f2305fd969 Added VoxelImporter class 2013-08-09 23:11:04 -07:00
Andrzej Kapolka
1828a105d4 Basic glow effect. 2013-08-08 16:55:45 -07:00
Andrzej Kapolka
cb89f05a39 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-08 12:01:03 -07:00
ZappoMan
f4820143d7 cleanup resizeGL, and Display Frustum menus 2013-08-07 16:12:03 -07:00
ZappoMan
40025618e0 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
 2013-08-07 15:49:34 -07:00
ZappoMan
d2d8bad241 simplified frustum camera mode, fixed resizeGL in case of frustum being on 2013-08-07 14:47:36 -07:00
Andrzej Kapolka
e9b3cca3de OpenGL fields of view are vertical, not horizontal. 2013-08-07 14:26:22 -07:00
Andrzej Kapolka
597842eba2 Starting on glow effect. 2013-08-07 14:17:52 -07:00
Philip Rosedale
7583e1cd14 Merge pull request #802 from ey6es/master 
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
 2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want. 2013-08-06 16:45:15 -07:00
Andrzej Kapolka
63aeb4df75 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 16:28:14 -07:00
Philip Rosedale
426abbb55a Merge pull request #799 from ZappoMan/fun_fade 
add fade effect to voxel add and delete, fix crash with audio injector
 2013-08-06 15:09:43 -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
facc9e1ee7 add fade effect to voxel add and delete, fix crash with audio injector 2013-08-06 14:55:40 -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
Andrzej Kapolka
720ae561df Working on support for a textured face mode that doesn't rely on the video 
stream.
 2013-08-06 13:27:54 -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
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
atlante45
ddf1b06bf9 Add option to turn collisions on and off 2013-08-06 11:33:59 -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
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
atlante45
55e34558cb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-05 15:26:43 -07:00
atlante45
29062c51b2 - changed according to review comments 
- added reset scale option
 2013-08-05 15:23:40 -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
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
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
Stephen Birarda
25537f78a1 reset the song mix menu item after clip is done 2013-08-05 12:18:59 -07:00
Stephen Birarda
8704964a0f resolve conflicts on merge with upstream master 2013-08-02 17:56:19 -07:00
Stephen Birarda
d259180778 add option to audio menu to stop the mixed audio 2013-08-02 17:46:23 -07:00
Stephen Birarda
d56b715432 add menu option to mix RAW audio with microphone audio 2013-08-02 17:30:49 -07:00
atlante45
eb2a1ecedd merge 2013-08-02 15:41:32 -07:00
atlante45
2e150b97de Fixed shortcuts issues on mac 2013-08-02 15:24:09 -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
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
atlante45
b6049c9a10 Merge branch 'master' of https://github.com/worklist/hifi into pie_menu 2013-08-01 15:28:35 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -07:00
Philip Rosedale
98ec2efc01 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 14:55:33 -07:00
ZappoMan
c7e3fe5ef6 Added false colorization by voxel server source 
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
 2013-07-30 11:08:48 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
atlante45
68194f2037 Slot calling when pie menu on avatar. 2013-07-24 13:50:00 -07:00
atlante45
177471e83b First step toward follow mode 2013-07-24 11:24:28 -07:00
atlante45
fec25d374f merge 2013-07-24 10:35:57 -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
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
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
atlante45
13952a6f24 Merge with pie_menu 2013-07-21 15:22:43 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
atlante45
72774a5e20 First step toward pie menus 2013-07-19 17:01:38 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
Mark Peng
a14768bb29 Remove more unnecessary additions. 2013-07-19 01:00:55 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Mark Peng
7ee0d8da2e Render circle in 3D space for lookatIndicator. Still not normal to the screen. 2013-07-18 14:34:51 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Mark Peng
125bcc46f4 Circle drawn with camera orientation as its normal for lookatIndicator. 2013-07-17 17:27:15 -07:00
Philip Rosedale
5f51464230 Start clicking on voxels makes sound 2013-07-17 17:15:19 -07:00
Mark Peng
0bbea078b5 Merge remote-tracking branch 'upstream/master' 2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4 Rendering of indicator circle in 3D space. Spacing edits in util. 2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9 ahibfasubhdf 2013-07-17 10:01:23 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7 moved finger particles over to hand.cpp 2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0 added Import Voxels to Clipboard 2013-07-15 17:54:50 -07:00
Stephen Birarda
38d8041bfb kill local voxels when voxel rendering is turned off 2013-07-15 17:12:24 -07:00
Andrzej Kapolka
d5abb3e6eb Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:15:12 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Jeffrey Ventrella
f75ce72aca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:30:19 -07:00
Jeffrey Ventrella
7d5ade33a3 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83 Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times. 2013-07-15 13:56:37 -07:00
Andrzej Kapolka
6c587af6ac Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/avatar/Head.cpp
 2013-07-15 13:13:51 -07:00
Andrzej Kapolka
84bb2aa265 Started on C++ side of SSAO effect. 2013-07-14 18:21:18 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Jeffrey Ventrella
3649c89c12 more developing on the API for the particle system 2013-07-12 16:19:31 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
 2013-07-12 15:34:55 -07:00
atlante45
16647e3591 Resolve conflict 2013-07-12 13:27:46 -07:00
Jeffrey Ventrella
c348c5ec35 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 12:12:25 -07:00
Philip Rosedale
6609a850eb Gyros and touch look now work at same time 2013-07-11 21:34:42 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
ZappoMan
78611e30e7 make occlusion culling default 2013-07-10 17:21:40 -07:00
Jeffrey Ventrella
84a7a78b8d made a test particle system 2013-07-10 17:15:03 -07:00
ZappoMan
1831cc0de3 removed level param from recursion 2013-07-10 17:06:22 -07:00
Mark Peng
baf9edecc9 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:51:53 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
Philip Rosedale
dae79d8a55 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
Mark Peng
e4e7966075 Add print statements to debug eyecontact code in Application.cpp. 2013-07-10 11:56:16 -07:00
Mark Peng
61ad33d9d0 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446 Change LookAtPosition of Head to the eye level of another avatar, 
if looking at another avatar in Application.cpp.

Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
 2013-07-09 16:22:41 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c Modified code according to review for UI job 2013-07-09 10:25:46 +02:00
Philip Rosedale
95ac0a891f Merge 2013-07-08 16:17:51 -07:00
Stephen Birarda
c2ad02def2 Merge pull request #625 from PhilipRosedale/master 
Tuned smooth gyro look to feel better
 2013-07-08 15:55:52 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
tosh
c2e2ff0ffe changes broadcast function in Application to use a different name but the same signature as in NodeList 2013-07-05 14:16:50 +02:00
tosh
689794259d Merge branch 'master' of git://github.com/worklist/hifi into 19376 
Conflicts:
	interface/src/Application.cpp
 2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542 Properly make the goHome() function in slot group 2013-07-03 23:43:53 -07:00
ZappoMan
c0d14d2bd4 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-03 15:36:41 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
ZappoMan
1e19748a1a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-02 15:52:49 -07:00
atlante45
b062295ecb Merge with master 2013-07-02 16:22:39 +02:00
tosh
f3ab3b6c83 prevents voxel data from being sent or received (read: requested) when voxel rendering is disabled 
also adds a menu option under "Tools" to enable/disable the Oscilloscope
 2013-07-02 12:41:34 +02:00
Philip Rosedale
e7113d26f8 Add field of view as an option in preferences 2013-07-01 23:00:39 -07:00
atlante45
45e13fda15 More UI improvements 2013-07-01 16:34:43 +02:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
Philip Rosedale
d464ae4158 Merge pull request #578 from birarda/fervor 
add an autoupdater for release OS X builds
 2013-06-30 23:25:42 -07:00
tosh
f1e5a56347 adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars 2013-06-30 17:08:01 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
ZappoMan
73ad854235 latest version of quadtree coverage map 2013-06-28 22:05:32 -07:00
Mark Peng
53543c26fe Added menu toggle for displaying ping 2013-06-28 16:02:49 -07:00
Mark Peng
0aa3227228 Merge remote-tracking branch 'upstream/master' 2013-06-28 15:26:34 -07:00
Mark Peng
293031de6f ping reporter added to interface take 3 2013-06-28 13:03:30 -07:00
Mark Peng
ee005f19d9 ping reporter added to interface take 2 2013-06-28 11:17:52 -07:00
Mark Peng
c5fe8b078e ping reporter added to interface 2013-06-28 11:07:01 -07:00
Stephen Birarda
800bfd097b alphabetize some includes in Application header 2013-06-26 10:35:17 -07:00
atlante45
52d62185ee Merge branch 'master' of https://github.com/worklist/hifi into 19368 2013-06-25 00:24:54 +02:00
atlante45
d6c70ea6ca #19368 - Improve editing/building workflow in Interface 2013-06-25 00:24:21 +02:00
tosh
7690ace2c3 Merge branch 'master' of git://github.com/worklist/hifi into 19377 
Conflicts:
	interface/src/Audio.cpp
 2013-06-22 05:35:31 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02:00
Andrzej Kapolka
ef7c6ebdc6 Basic blinking. 2013-06-21 18:11:31 -07:00
birarda
bd0d820fc7 Merge pull request #556 from PhilipRosedale/master 
Dynamic jitter buffer for less stuttering, fixes to stereo
 2013-06-21 14:29:45 -07:00
Andrzej Kapolka
483407a3f2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:09:38 -07:00
Eric Johnston
6825274b65 Re-issue of change which adds two-finger touch look to avatar. 
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
 2013-06-21 13:43:23 -07:00
Andrzej Kapolka
00eba63e4e Added various options to test for voxel avatars, manual third person mode 
(also, cleaned up the camera switching a little).
 2013-06-21 11:33:38 -07:00
Andrzej Kapolka
b0dd5223e1 Avatar head roll/lean based on webcam data. 2013-06-20 14:20:03 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Philip Rosedale
3304f0eb2e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183 More audio tweaks 2013-06-19 16:02:56 -07:00
Andrzej Kapolka
68371f8c3f Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-19 11:04:12 -07:00
ZappoMan
8331fc1acb removed some old debug code 2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF) 2013-06-17 18:30:02 -07:00
Andrzej Kapolka
a771f53df3 Read the webcam frames in a separate thread, since the call blocks. 2013-06-17 18:07:53 -07:00
Andrzej Kapolka
ec495e14d3 Missed these guys. 2013-06-17 13:29:24 -07:00
ZappoMan
40c2cf2d44 removed some dead code 2013-06-13 13:31:26 -07:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -07:00
Philip Rosedale
b85f91a7d4 fixes per code review 2013-06-13 12:05:06 -07:00
ZappoMan
72b2845178 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 09:40:45 -07:00
ZappoMan
0f234d739e remove Camera menu from frustum debugging, because its obsolete and only causes problems 2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb removed grab voxel rendering 2013-06-12 16:36:55 -07:00
Philip Rosedale
311b09eee0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 14:30:48 -07:00
Andrzej Kapolka
178996bb8b Make sure first person mode and mirror mode are mutually exclusive. 2013-06-12 13:30:41 -07:00
Philip Rosedale
ad58d0aa23 Adding voxel thrust on grabbing/dragging to move avatar 2013-06-11 21:19:58 -07:00
ZappoMan
ac7fbc6320 added occlusion tests to debug menu 2013-06-11 13:29:01 -07:00
ZappoMan
ab365202c8 added some debugging routines to visualize occlusion 2013-06-11 12:36:15 -07:00
Philip Rosedale
fb97d3e04b Merge pull request #520 from tschw/19367 
Code Review for Job #19367
 2013-06-10 08:04:16 -07:00
atlante45
c96e01ef51 Fixed merge conflict 2013-06-09 23:15:49 +02:00
ZappoMan
b60df9ce89 Merge pull request #512 from ey6es/gyroquat 
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
 2013-06-08 21:36:07 -07:00
tosh
d39b25a17b adds menu option to set whether ground plane gets rendered 2013-06-08 02:31:23 +02:00
ZappoMan
46c66c39e5 implement keyhole frustum 2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2 19369 - Added "Use Gravity" option 2013-06-08 02:05:54 +02:00
Andrzej Kapolka
ac2b7d7f48 Fix for initial camera transition. 2013-06-07 15:20:26 -07:00
Andrzej Kapolka
75c89f2c22 OK, I found the problem: duplication of state for the "autosave" option. 
Let's just use the QAction, as does everything else.
 2013-06-07 13:42:49 -07:00
ZappoMan
887e3428c2 cleaned up menus slightly 2013-06-07 09:39:24 -07:00
Philip Rosedale
dd0fa021a0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-07 09:19:54 -07:00
Andrzej Kapolka
e0e94481c9 Add pitch/yaw scale preference to control degree of view rotation. 2013-06-06 17:53:00 -07:00
Philip Rosedale
b5e63fb446 Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp 2013-06-06 17:52:19 -07:00
Philip Rosedale
97be04716e Added render menu choice to switch between voxel and ball avatar rendering. 2013-06-05 17:24:53 -07:00
Philip Rosedale
29c4374dc0 Merge fixes for brad, reversed pitch direction to correct mouse look 2013-06-05 09:59:39 -07:00
Philip Rosedale
8719b9f9d4 merge fix 2013-06-04 21:26:53 -07:00
ZappoMan
b75bd80de7 fix build busters 2013-06-04 17:54:48 -07:00
Philip Rosedale
4db6e9074e merge conflict fix 2013-06-04 17:11:33 -07:00
atlante45
d539ea283e Merge 19358 with upstream Master 2013-06-05 01:43:47 +02:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
Andrzej Kapolka
bc8eadd526 More work on voxeltars; separated default pose from bind pose. 2013-06-04 10:22:58 -07:00
atlante45
c199190666 Fixes asked by ZappoMan on QSettings' commit. 2013-06-04 19:00:38 +02:00
Philip Rosedale
60100fd473 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 09:09:39 -07:00
ZappoMan
ce499f925a add cut voxels 2013-06-04 09:02:34 -07:00
ZappoMan
435791f28c CR feedback 2013-06-04 01:02:10 -07:00
Philip Rosedale
da343215ce Rename serialPort to serialHeadSensor, added passing of lean to eyeOffset 2013-06-03 17:25:20 -07:00
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
atlante45
dccc44a6f5 Added settings management using QSettings 2013-06-02 14:58:51 +02:00
Andrzej Kapolka
e4bc7af6b4 Working on avatar voxels. 2013-05-31 14:52:29 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
ZappoMan
b0397e8eb9 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-30 21:41:55 -07:00
ZappoMan
bc5af6e399 Merge pull request #438 from Geenz/19308 
#19308 - Store menu settings in the avatar data file
 2013-05-30 16:51:02 -07:00
Geenz
fefa74135c Moved to function overloads instead of unique function names. 2013-05-30 19:47:25 -04:00
Andrzej Kapolka
bcd3833898 Align chat with full camera rotation (not just yaw). 2013-05-30 13:46:53 -07:00
Geenz
f0d7b47c37 Merge branch 'master' of https://github.com/worklist/hifi into 19308 2013-05-29 19:47:54 -04:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
Geenz
c33d2ee25e Coding standard cleanup based upon ZappoMan's suggestions. 2013-05-29 16:46:47 -04:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
Stephen Birarda
b6a0662c98 inline the shouldEchoAudio 2013-05-29 11:47:02 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -07:00
ZappoMan
d1d2e75143 first cut at export and import of voxels 2013-05-28 19:00:02 -07:00
Geenz
5efda079c9 Store settings in an ordered map to allow for runtime getting and setting of settings. Read the setting file on startup, then write on shut down. 2013-05-27 18:48:05 -04:00
Geenz
94a07b92a7 Documentation for #19308. 2013-05-27 15:54:32 -04:00
Geenz
17a5e6a700 First round of settings serialization. Setup an API to load and save different settings to the avatar data file. 
Initial serialized settings:
Gyro look
Mouse look
Transmitter drives
Voxel rendering
Voxel textures
Star rendering
Atmosphere rendering
Avatar rendering
Oculus rift mode
Render stats
Frame stats
Look at vectors
Logging
Frustum debugging
View frustum offset
Camera frustum
 2013-05-27 12:37:42 -04:00
Stephen Birarda
d12bc85376 go directly into oculus mode when the oculus is connected 2013-05-24 14:05:22 -07:00
Andrzej Kapolka
add84b2f39 Hide the cursor when in fullscreen Oculus mode. 2013-05-23 17:58:04 -07:00
Philip Rosedale
37cb914891 You can reset start location with 'G' 2013-05-23 15:02:32 -07:00
Philip Rosedale
32d2418b7a Added display head mouse option (default off) and all camera modes follow head gyros the same way. 2013-05-23 12:33:26 -07:00
Jeffrey Ventrella
8b49cfbf93 added back transitions to first person 2013-05-22 17:24:46 -07:00
Jeffrey Ventrella
7cae808d29 Merge remote-tracking branch 'upstream/master' 2013-05-22 14:42:25 -07:00
Jeffrey Ventrella
83e2bf2534 added menu option for setting display of lookat vectors 2013-05-22 14:42:03 -07:00
Philip Rosedale
f8c39a8617 Merge pull request #382 from ey6es/master 
Support for multiple environments, each with their own gravity (and currently, collision spheres).
 2013-05-22 14:04:28 -07:00
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
ZappoMan
6f0035b297 Merge pull request #365 from PhilipRosedale/master 
Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)
 2013-05-21 13:45:15 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
Philip Rosedale
3539ec858e Added hand movement and body motion to transmitter. Feel much better - like dancing. 2013-05-20 23:22:28 -07:00
Philip Rosedale
7728a54d26 Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter 2013-05-20 19:00:49 -07:00
Andrzej Kapolka
8c71741843 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 15:13:36 -07:00
Andrzej Kapolka
616285f4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:13:53 -07:00
Andrzej Kapolka
3f0fd2f976 Added toggle for voxel textures; they may be slowing some machines down. 2013-05-20 12:13:23 -07:00
Jeffrey Ventrella
677f0b5d2e Merge remote-tracking branch 'upstream/master' 2013-05-20 12:13:21 -07:00
Jeffrey Ventrella
f09cbca00b cleanup 2013-05-20 12:12:46 -07:00
Andrzej Kapolka
85dc14bb94 Drag support for adding/removing (as well as coloring) voxels. I had to 
ensure that the "last" voxel edited was the one under the cursor after the
operation, not the one operated on.
 2013-05-20 12:01:33 -07:00
Philip Rosedale
956ffe223f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 11:56:47 -07:00
Philip Rosedale
50ee9b9ee4 Added options menu choice for 'MouseLook', defaults off 2013-05-20 11:50:04 -07:00
Jeffrey Ventrella
aa9783a88d Merge remote-tracking branch 'upstream/master' 2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
7f0d2e572e some preliminary work on avatarRenderer 2013-05-20 07:38:00 -07:00
Andrzej Kapolka
dd3e8d524a Support for eye offset position/orientation in camera/frustum. 2013-05-19 18:37:21 -07:00
Philip Rosedale
29889725ef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 21:17:34 -06:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
Andrzej Kapolka
4292cd9ab3 Moved voxel options into their own menu, switched destructive flag to check 
Qt action.
 2013-05-15 12:05:32 -07:00
Andrzej Kapolka
0ce9e42085 Support dragging when in coloring mode. I tried it in add/delete mode, too, 
but it felt messy.
 2013-05-15 11:48:23 -07:00
Andrzej Kapolka
6317404249 When in add mode and there's no voxel under the cursor, place the mouse voxel 
a fixed distance away.
 2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51 Turned the voxel edit commands into menu options for better visibility. 2013-05-15 10:40:41 -07:00
Philip Rosedale
73c793c0a1 Added optional millisecond onscreen frame timer for easier latency timing with high-speed camera 2013-05-15 09:37:36 -07:00
Philip Rosedale
62a97f23bf Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 15:11:04 -07:00
Philip Rosedale
b30f7b02bd Removed mouse shift prototype. 2013-05-14 15:10:44 -07:00
Andrzej Kapolka
8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-14 14:44:22 -07:00
ZappoMan
8dc61d89fc Added support for "destructive" vs "non-destructive" voxel create 
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
 2013-05-14 14:19:31 -07:00
Andrzej Kapolka
4eced82cf4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-14 13:51:27 -07:00
Andrzej Kapolka
9033152401 Color selection for painting. 2013-05-14 13:49:24 -07:00
ZappoMan
43e190fe3c switched Want Delta menu to use new Qt menus 2013-05-14 12:19:23 -07:00
Andrzej Kapolka
537686d541 Allow changing the edit voxel size using the mouse wheel. 2013-05-14 11:06:03 -07:00
Andrzej Kapolka
096421347e Missed some comments in transferring from main.cpp to Application.h; trying to 
preserve original formatting.
 2013-05-14 10:45:54 -07:00
Andrzej Kapolka
31b94203ff Disable the menu shortcuts for "regular" keys when the chat entry is showing. 2013-05-14 00:24:53 -07:00
Andrzej Kapolka
1e99389a4b Various fixes, removed the bulk of main.cpp. 2013-05-13 23:15:45 -07:00
Andrzej Kapolka
75eee4bcbd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-13 21:23:00 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Stephen Birarda
b6925edbe8 add a PairingHandler to send pair requests to the pairing server 2013-05-13 17:34:34 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00