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

1797 commits

Author SHA1 Message Date
Lucas Crisman
a94fbe3ff5 voxels stats fixes 2014-01-22 17:42:34 -03:00
Stephen Birarda
a9ce6c7467 use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID send 2014-01-22 12:00:26 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Lucas Crisman
d86aa227a4 UI stats improvements: first cut 2014-01-22 16:42:09 -03:00
Brad Hefta-Gaub
aacad00791 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 11:16:21 -08:00
Andrzej Kapolka
15021b6ebc More work on metavoxel editing (track mouse ray intersection with grid). 2014-01-22 11:11:12 -08:00
stojce
7b1e64593c Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-22 18:41:00 +01:00
Stephen Birarda
6b44172467 hook the user's avatar object into the Interface ScriptEngine 2014-01-22 09:13:25 -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
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
03a9253748 remove usage of ParticleEditHandle from application 2014-01-21 14:07:46 -08:00
stojce
19c4b2b2ec Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-21 22:51:32 +01:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Stephen Birarda
e08f4d2eba more DataServerClient API tweaks 2014-01-21 13:13:57 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
Leonardo Murillo
a4c057b01f PR fix 2014-01-21 11:27:03 -06:00
Leonardo Murillo
18a6d74165 removing comment 2014-01-21 11:24:23 -06:00
Leonardo Murillo
b2ef07f485 PR Fixes 2014-01-21 11:17:43 -06:00
Leonardo Murillo
cc147bc8bf PR fixes 2014-01-21 10:39:29 -06:00
Leonardo Murillo
b972d4260c PR Fixes 2014-01-21 10:31:16 -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
Brad Hefta-Gaub
b4b3720fcf move creatorTokenID management into Particle static members 2014-01-20 12:56:35 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
Leonardo Murillo
3036142a38 Removing comments 2014-01-20 11:55:10 -06:00
Leonardo Murillo
04970be8a2 Removing comments 2014-01-20 11:52:26 -06:00
Leonardo Murillo
825c64e1d0 Anything obviously wrong? 2014-01-20 10:57:10 -06:00
stojce
daffadbac4 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-19 13:59:20 +01: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
865045aae7 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 19:24:54 -06:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Leonardo Murillo
91defcfd03 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 16:28:30 -06:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
Leonardo Murillo
a13d7b084f Removing comment 2014-01-17 14:39:48 -06:00
Leonardo Murillo
99275dadd4 PR Changes 2014-01-17 14:39:34 -06:00
Leonardo Murillo
ff6a9b2052 PR fix 2014-01-17 14:05:38 -06:00
Leonardo Murillo
a4efe55bbf changing dev version 2014-01-17 14:02:57 -06:00
Atlante45
08de50f578 Fixed mouseVoxel getting resized all the time when flying over smaller voxel 2014-01-17 20:36:43 +01: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
stojce
36d21e812d Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-17 19:46:02 +01:00
Andrzej Kapolka
0e7692dfea When the mouse is hidden, just look straight forward. 2014-01-16 16:59:50 -08:00
stojce
669ab213ef fixing merge 2014-01-17 00:08:25 +01:00
Brad Hefta-Gaub
1cfbfe6611 fix 3d mode switch on/off issue 2014-01-16 14:54:08 -08:00
Andrzej Kapolka
813c31050a Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:54:55 -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
Brad Hefta-Gaub
76d5ef5bc6 removed dead code 2014-01-16 12:54:28 -08:00
Brad Hefta-Gaub
f97ab1dafe fixes leak of GenericThread and also fixes crash in octree servers on client disconnect 2014-01-16 12:53:32 -08:00
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Andrzej Kapolka
2c7b6b9696 Skeleton removal checkpoint; compiles, but there are a few bits missing. 2014-01-15 15:14:50 -08:00
Leonardo Murillo
746b45d939 Moving ifdef to xml 2014-01-15 15:08:47 -06:00
Leonardo Murillo
9df1517f02 Merge branch 'master' of github.com:/worklist/hifi 2014-01-15 15:02:22 -06:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
f1e98720d0 added option to disable local cache file 2014-01-15 12:29:54 -08:00
Brad Hefta-Gaub
477840904b Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 12:09:26 -08:00
Leonardo Murillo
1b687848d1 Unneeded include 2014-01-15 12:47:19 -06:00
Leonardo Murillo
f187ac0f98 Removing comment 2014-01-15 12:44:22 -06:00
Leonardo Murillo
dd2392f74b Finishing changes 2014-01-15 12:40:56 -06:00
Leonardo Murillo
049be6a569 Finishing changes 2014-01-15 12:40:40 -06:00
Brad Hefta-Gaub
135cafb665 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-15 10:21:40 -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
Lucas Crisman
73dfc5dd58 Merge branch 'master' of git://github.com/worklist/hifi into 19485 2014-01-15 14:50:59 -03:00
Lucas Crisman
24103740da equal sign shortcut for Reset Avatar Size on Application keyPress Event 2014-01-15 14:50:25 -03: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
Brad Hefta-Gaub
eb55dd26e5 added glewInit 2014-01-14 19:18:01 -08: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
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
4ea14a51fc remove the SerialInterface 2014-01-14 13:14:15 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
bdc31a3b48 replace the DomainChangeListener class with a signal/slot combo 2014-01-14 11:38:05 -08:00
Stephen Birarda
57f977668f replace the Node mutex with a QMutex 2014-01-14 10:15:31 -08:00
Stephen Birarda
53d435006c more follow mode cleanup, fix silent node iterator 2014-01-14 10:07:26 -08:00
Stephen Birarda
cbcdeb570b pull all available datagrams in Application processDatagrams 2014-01-14 10:01:11 -08:00
Leonardo Murillo
4a4b483532 Resolving conflicts 2014-01-14 10:31:47 -06: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
3af4703230 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-13 15:58:28 -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
Brad Hefta-Gaub
e60446a632 more windows build work 2014-01-13 15:57:31 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Andrzej Kapolka
f21436a29e Fix (hopefully) for warning on Windows build. 2014-01-13 15:02:46 -08:00
Andrzej Kapolka
9d831a2ab5 Orbit around voxel center, limit hover distance. 2014-01-13 14:43:59 -08:00
Andrzej Kapolka
7abb7d9ccd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:03:08 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Andrzej Kapolka
2d5df38907 Persist the user orientation as well as the position, show up a couple meters 
in front of (and facing) target.  Closes #1367.
 2014-01-13 13:51:51 -08:00
Stephen Birarda
3f2c6504a6 fix for avatar scale bug, closes #1506 2014-01-13 12:27:47 -08:00
Leonardo Murillo
ca16acef6b Checkpoint 2014-01-13 07:37:47 -06:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
d92d043e8f more windows build fixes 2014-01-12 22:52:06 -08:00
Brad Hefta-Gaub
08bb783777 more windows build work 2014-01-12 14:49:15 -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
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
da2f814b7a Merge branch 'master' of github.com:/worklist/hifi 2014-01-10 14:08:22 -06:00
Leonardo Murillo
ede32cfadc Checkpoint 2014-01-10 14:08:10 -06:00
Brad Hefta-Gaub
50fa6be829 Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache 2014-01-09 19:41:15 -08:00
Leonardo Murillo
eb52ded4ad Styling + others 2014-01-09 20:34:02 -06:00
Leonardo Murillo
664a1a7677 Checkpoint 2014-01-09 20:12:39 -06:00
Brad Hefta-Gaub
5b14a4eed3 removed dead code 2014-01-09 14:52:40 -08: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
Leonardo Murillo
9dd37344b8 checkpoint 2014-01-09 16:14:51 -06: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
Stephen Birarda
9eb31b48cc remove the Leap integration 2014-01-06 11:09:59 -08:00
Leonardo Murillo
314c4ffcfa Using applicationVersion() instead of const wherever version is specified 2014-01-06 09:24:29 -06:00
Leonardo Murillo
ba79b1b329 Using BUILD_VERSION to setApplicationVersion 2014-01-06 09:18:10 -06:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Andrzej Kapolka
2b15fdf78f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 17:49:34 -08:00
Andrzej Kapolka
aa9fc290a5 Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior. 2014-01-03 16:46:11 -08:00
Philip Rosedale
2cf5efc4a8 Merge pull request #1449 from PhilipRosedale/mirror 
Mirror
 2014-01-03 15:25:28 -08:00
Philip Rosedale
65340f1667 Tweaked mirror distances 2014-01-03 14:33:54 -08:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
Stojce Slavkovski
31fa8ad1fb Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 21:06:28 +01:00
Andrew Meadows
68c09c5b74 Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430 2014-01-02 11:59:57 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
Stojce Slavkovski
cd4fcb993f removed unused 'LogDisplay' class 2013-12-29 23:52:26 +01:00
ZappoMan
6f2a1b9802 cleanup 2013-12-28 12:51:50 -08: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
840d1a33ef Reveal log file 
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
 2013-12-23 21:23:47 +01:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Stephen Birarda
3f4b4178ff remove the test injector code from Application 2013-12-19 15:25:39 -08:00
Stephen Birarda
7ed609633a complete the test injector stub 2013-12-19 15:23:31 -08:00
Stephen Birarda
0eb22fdc60 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 15:17:10 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Philip Rosedale
38b59f96d3 Merge pull request #1412 from ZappoMan/bugfixes 
Implement support for adjusting particles to clock skew
 2013-12-19 15:01:01 -08:00
Leonardo Murillo
44a24496cc Missing line feed 2013-12-19 16:31:38 -06:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -08:00
ZappoMan
72649f1ac9 adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
ZappoMan
bfbaf265dd first cut at added clockSkew support to nodes and PING/PING_REPLY 2013-12-19 13:14:14 -08: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
Stojce Slavkovski
397eb13680 removed legacy resources path locator 2013-12-18 08:05:34 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01: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
Stojce Slavkovski
4509b8dbe5 don't cut long lines 2013-12-17 23:16:16 +01: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
Stojce Slavkovski
3e1c857a2e Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 22:11:29 +01:00
ZappoMan
74d9c05c44 added particle server details to voxel stats dialog 2013-12-17 11:32:20 -08:00
Stojce Slavkovski
365d1eea10 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Menu.h
 2013-12-17 20:15:40 +01:00
ZappoMan
e969331f5c implement catching of particles 2013-12-16 20:29:28 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Stojce Slavkovski
cc6f7ed4cc display all log data on load 2013-12-17 03:07:57 +01:00
Philip Rosedale
03869e81fd Merge pull request #1380 from birarda/qt-for-portaudio 
move from 44.1 to 48 on audio
 2013-12-16 17:58:41 -08:00
Stephen Birarda
bb93c64d8d some initial audio stat render fixes 2013-12-16 16:21:50 -08:00
Stojce Slavkovski
5a27ded669 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Application.cpp
 2013-12-16 22:57:47 +01:00
Andrzej Kapolka
6888dc4eeb Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-16 13:44:44 -08:00
Stojce Slavkovski
e788d746d4 added dialog for log data 
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
 2013-12-16 22:43:17 +01: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
Leonardo Murillo
4f1ff5b566 Using QStandardPaths for cache directory 2013-12-16 13:55:04 -06:00
ZappoMan
32c2aef29b temp remove debug verbosity 2013-12-16 11:36:19 -08:00
Leonardo Murillo
5ac125fdd8 Typo fix 2013-12-16 13:32:12 -06:00
Leonardo Murillo
06d14436bd Printing build version on title 2013-12-16 13:29:17 -06:00
ZappoMan
f9b7c23857 correct handleing of app shutdown and scripting enging termination 2013-12-16 11:26:30 -08:00
ZappoMan
af52be7860 tweaks to script engine shutdown behavior 2013-12-16 09:32:01 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
Leonardo Murillo
3ca9cde500 Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
ZappoMan
a220804fb0 properly connect signals and slots to shut down script properly, fix null termination in script file load 2013-12-14 14:23:33 -08:00
ZappoMan
dacaade9ed first cut at client scripts working 2013-12-14 13:54:25 -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
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
ZappoMan
08591481a6 added shadows to particles 2013-12-12 15:44:06 -08:00
Andrzej Kapolka
4a7efa5ef9 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 15:36:48 -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
d3197ef8f9 fix crash, and remove gravity while in hand 2013-12-12 13:54:36 -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
28c5d5b7bf removed unused variable 2013-12-12 11:01:37 -08:00
ZappoMan
5ec8de1bf3 have ParticleEditHandle update local tree as well 2013-12-12 10:41:55 -08:00
ZappoMan
5d9b7c7f75 change toy ball to use ParicleEditHandle class 2013-12-12 10:26:55 -08:00
ZappoMan
82b5c53551 Merge branch 'master' of https://github.com/worklist/hifi into edit_particles 2013-12-11 18:01:45 -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
Philip Rosedale
2d72bea27a cleanup test toy ball throwing code 2013-12-11 17:35:02 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
Philip Rosedale
bad5d82ceb Merge branch 'master' of https://github.com/worklist/hifi into XBOX_controller 2013-12-11 12:40:06 -08:00
ZappoMan
dd85f145d2 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-11 10:43:33 -08:00
Andrzej Kapolka
8ba2cf9a8b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-11 10:30:30 -08:00
ZappoMan
03e892d4fd make shootParticle() work better 2013-12-10 17:42:55 -08:00
ZappoMan
ae1576b9f5 CR cleanup and add shootParticle() to application 2013-12-10 17:07:11 -08:00
Philip Rosedale
132b313c9c remove voxel glow on local add 2013-12-10 17:00:53 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
ZappoMan
8bbdae0e64 fix extra debugging 2013-12-10 15:50:39 -08:00
Andrzej Kapolka
6ba750a963 More progress on generic attributes, metavoxel node management. 2013-12-10 15:44:48 -08:00
ZappoMan
cde7eb1f30 removed some dead code 2013-12-10 15:36:49 -08:00
ZappoMan
a8fff62832 removed some dead code 2013-12-10 15:36:07 -08:00
Philip Rosedale
0f0ee07f8c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-10 14:06:11 -08:00
Andrzej Kapolka
f268797bde Merge branch 'master' of https://github.com/worklist/hifi 2013-12-09 16:00:00 -08:00
Andrzej Kapolka
569425df88 Merge pull request #1348 from PhilipRosedale/narcissus 
Improved full screen mirror view to allow leaning
 2013-12-09 15:42:06 -08:00
ZappoMan
68a51f5205 added update to particle 2013-12-09 15:34:52 -08:00
Philip Rosedale
83a1654d9c making toy ball 2013-12-09 15:12:28 -08:00
ZappoMan
d0944b0278 make particles spheres for now 2013-12-09 14:06:45 -08:00
Andrzej Kapolka
8f633f87e9 Fix for seg fault on Linux exit. 2013-12-09 13:32:02 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
Philip Rosedale
9616268da7 Improved full screen mirror view to allow leaning 2013-12-09 13:02:18 -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
Andrzej Kapolka
85f7995700 Don't apply ambient occlusion to avatars (just voxels). 2013-12-09 11:00:35 -08:00
Philip Rosedale
3bd8c53115 Fix to get other avatar’s model data 2013-12-07 11:36:51 -08:00
ZappoMan
91d6ef633d Merge pull request #1340 from PhilipRosedale/remove_avatar_balls 
Remove avatar balls
 2013-12-06 17:11:53 -08:00
Andrzej Kapolka
65c21105ae Merge pull request #1339 from PhilipRosedale/remove_avatar_touch 
Removed _avatarTouch class
 2013-12-06 17:11:41 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master 
some NodeList cleanup
 2013-12-06 15:59:33 -08:00
Philip Rosedale
0fcc2d8634 Removed _avatarTouch class 2013-12-06 15:11:01 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Stephen Birarda
6bbd944b6a wait for audio thread to quit on application exit 2013-12-05 10:21:30 -08:00
ZappoMan
821b490ff1 added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:17 -08:00
Stephen Birarda
0e3cb11863 use invokeMethod for Audio reset 2013-12-04 16:58:21 -08:00
Stephen Birarda
277aa9dd89 handle conflicts on merge with upstream master 2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138 re-enable rendering and fix sampling algorithim 2013-12-04 13:55:27 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -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
Philip Rosedale
423b2e8e0f Highlight voxel being touched 2013-12-03 16:52:38 -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
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -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
Philip Rosedale
14129cd86d Merge pull request #1295 from ZappoMan/compressed_packets 
Major improvements to Voxel Packet "packing" and compression
 2013-11-29 10:06:36 -08:00
Andrzej Kapolka
e84f5a59aa Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-11-27 16:17:30 -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
b294b328dd Only render ball avatars when "avatars as balls" is checked. 2013-11-27 12:56:31 -08:00
ZappoMan
3a16a4935d added additional flight time debugging 2013-11-26 22:43:49 -08:00
ZappoMan
2ce9937126 major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:27:08 -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
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
ZappoMan
a60cf0f34e fix issue with copy 2013-11-25 15:52:30 -08:00
ZappoMan
63a82af449 allow client to set voxels MaxPPS in Preferences 2013-11-25 15:13:31 -08:00
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -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
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
Andrzej Kapolka
91b38313be Treat pitchFromTouch more like yawFromTouch, persist mouse pitch. 2013-11-22 11:28:33 -08:00
Andrzej Kapolka
b04a249079 Make this a constant. 2013-11-21 14:24:30 -08:00
Andrzej Kapolka
88a84c733e Stretch out shadow volume to encompass all avatars. 2013-11-21 14:14:09 -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
f0e5872b89 Lighten the shadows, remove some debug code. 2013-11-21 12:29:22 -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
dcc926a0db Working on the "real" shadow volume. 2013-11-20 20:36:54 -08:00
Andrzej Kapolka
758246309a Use compare mode. 2013-11-20 20:06:22 -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
4e952b0f99 Clamp pitch from touch when adjusting it. 2013-11-19 16:40:29 -08:00
Andrzej Kapolka
38c2abd6d8 First stab at Leap driving. 2013-11-19 15:10:02 -08:00
Andrzej Kapolka
1f2fe5ddee Rudimentary Sixense (Razer Hydra) support. 2013-11-15 18:06:32 -08:00
Andrzej Kapolka
7249e5293c Added a slider in the preferences to control the amount of Faceshift eye 
deflection.
 2013-11-15 10:17:52 -08:00
Andrzej Kapolka
c358b9f0fd Don't track the mouse in mirror mode. 2013-11-14 10:19:35 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
ZappoMan
b6bc3cb166 handle changes in server list properly 2013-11-13 15:56:03 -08:00
Andrzej Kapolka
df30e3c851 As a hack, when we have an FBX face/body, position the camera to point at the 
origin and reposition the models based on the relative eye positions.  Fixes
the jitteriness in rear mirror mode.
 2013-11-12 12:28:07 -08:00
Philip Rosedale
2991c8af61 screen does not flash when voxels are clicked 2013-11-08 14:34:22 -08:00
Philip Rosedale
f3b6e21a6d Voxel click to fly is now an option in the Tools Menu 2013-11-08 14:34:15 -08:00
ZappoMan
1587cf0bbe some comment cleanup 2013-11-07 17:17:34 -08:00
ZappoMan
2c4ab63d2b tweaks to placement and wording of voxel stats 2013-11-07 17:11:35 -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
ZappoMan
64d5ccf91e add menu option for voxel server fade in/out and dont remove local voxels when server shuts down 2013-11-07 14:10:09 -08:00
Andrzej Kapolka
add8ccc877 Lower the deflection amount. 2013-11-05 14:31:41 -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
843e9da873 merge conflict fix 2013-11-05 10:47:05 -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
361f1f6adf Don't override the lookat positions we receive for others. 2013-11-04 14:07:05 -08:00
Andrzej Kapolka
490194c747 Rescale eye positions to compensate for growing heads. 2013-11-04 13:53:39 -08:00
Andrzej Kapolka
33c61937ab Remove unused parameters. 2013-11-04 11:31:05 -08:00
Andrzej Kapolka
65907a75a3 Merge branch 'master' of https://github.com/worklist/hifi into 321contact 
Conflicts:
	interface/src/Application.cpp
 2013-11-04 10:40:02 -08:00
ZappoMan
9bd27e2b2a fix stutter on rotating 2013-11-03 21:11:08 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
Andrzej Kapolka
def3707041 I don't think Faceshift's gaze data is actually head-relative. 2013-11-01 18:28:35 -07:00
Andrzej Kapolka
a7683fa07f More tweaks to eye offsets. 2013-11-01 18:15:43 -07:00
Andrzej Kapolka
e4bf5358eb Attempt to use Faceshift eye data to deflect the default eye behavior. 2013-11-01 17:58:41 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
ZappoMan
848e78aded CR feedback 2013-10-31 13:58:12 -07:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
ZappoMan
db08b20405 added more logging 2013-10-31 12:36:48 -07:00
ZappoMan
42b44064d3 CR feedback 2013-10-31 12:19:18 -07:00
ZappoMan
af1047f5e0 fix to how voxel servers are queried when they have no known jurisdiction 2013-10-31 12:06:18 -07:00
ZappoMan
256428c6ae CR feedback 2013-10-30 16:55:39 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
ZappoMan
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
d1fbe242ab Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:27:50 -07:00
Andrzej Kapolka
719a014118 Merge pull request #1149 from ey6es/master 
This should fix Stephen's crash on init.
 2013-10-30 12:27:17 -07:00
Andrzej Kapolka
d820611618 Looks like setCentralWidget is ending up calling the init functions in newer 
versions of Qt.  Initialize the network access manager before that happens.
 2013-10-30 12:25:43 -07:00
ZappoMan
375ef34bd5 Merge pull request #1141 from stojce/19447 
Code Review for Job #19447
 2013-10-30 12:23:32 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Stephen Birarda
f6c265dcf3 remove the ground plane 2013-10-29 15:22:04 -07:00
stojce
a14242632a Rear view zoom level 
new zoom icons
save and restore state from settings
display zoomed out rear view when selected
 2013-10-29 20:51:14 +01:00
Andrzej Kapolka
4771982c30 Merge pull request #1131 from stojce/19443 
Code Review for Job #19443
 2013-10-28 17:04:36 -07:00
Andrzej Kapolka
6d8f8dc8ed Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-28 15:59:42 -07:00
Andrzej Kapolka
6e76179ca3 Place hand based on mouse position, but make sure we don't point above the 
shoulders.
 2013-10-28 15:59:04 -07:00
ZappoMan
1c2e5eecd6 send VOXEL_QUERY to out of view voxel servers with PPS of 0 2013-10-28 12:07:02 -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
Stephen Birarda
99ee614d04 Merge pull request #1126 from donpdonp/19444 
19444 manage the window title, watch for username changes
 2013-10-25 13:59:38 -07:00
Don Park
248f59325c update the window title when the domain changes or the username changes 2013-10-25 11:05:50 -07:00
Andrzej Kapolka
b6f2498364 Pull the mirror camera back and narrow its field of view to reduce distortion. 
Also, have it point at the avatar's eyes like the full screen mirror.
 2013-10-25 11:04:34 -07:00
Don Park
dc420beaf2 updateWindowTitle() 2013-10-25 10:09:34 -07:00
Philip Rosedale
6957d990e2 Merge pull request #1120 from ZappoMan/rate_control 
Only send PACKET_TYPE_VOXEL_QUERY messages to voxel servers that are in view.
 2013-10-24 22:17:41 -07:00
ZappoMan
660edddf66 only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view 2013-10-24 18:38:33 -07:00
ZappoMan
37584244e6 only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view 2013-10-24 18:37:31 -07:00
Philip Rosedale
bf07ffd714 Merge pull request #1118 from ZappoMan/rate_control 
add basic rate control, evenly divide packets per second between all connected voxel servers
 2013-10-24 18:08:33 -07:00
ZappoMan
76fb3c18a2 add basic rate control, evenly divide packets per second between all connected voxel servers 2013-10-24 17:35:30 -07:00
Andrzej Kapolka
4f3bacdd4c Use calculated eye position here. 2013-10-24 16:16:45 -07:00
Andrzej Kapolka
5f696bd72e Need to set lookat position to camera position before simulating in mirror 
mode.
 2013-10-24 16:06:44 -07:00
Andrzej Kapolka
8b6174f1fe Merge branch 'master' of https://github.com/worklist/hifi 2013-10-24 15:30:11 -07:00
Andrzej Kapolka
145e9337a2 Let's try actually using the average eye position as the camera location for 
first person and mirror mode.
 2013-10-24 15:20:46 -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
3efc277aae wrap more displaySide() items for not rendering when in mini rear view mode 2013-10-23 14:19:25 -07:00
ZappoMan
d31c3854ad fix merge issue 2013-10-23 12:06:11 -07:00
ZappoMan
ea844634a6 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 11:59:47 -07:00
ZappoMan
55294e1de7 Merge pull request #1103 from ey6es/master 
As a temporary measure, restore the full screen mirror as a menu option.
 2013-10-23 11:59:39 -07:00
ZappoMan
46eadb5fb7 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 11:58:47 -07:00
ZappoMan
161367c899 fix rear view mirror mode to only render self 2013-10-23 11:58:01 -07:00
Andrzej Kapolka
183a866e9e Remove code that will be added back in fullscreen mirror request. 2013-10-23 11:44:28 -07:00
Andrzej Kapolka
71b4b8fe46 Use lowercase h to toggle full screen mirror, capital H for inset. 2013-10-23 10:54:39 -07:00
Andrzej Kapolka
adc79be81c Add back the full screen mode as a menu option, temporarily. 2013-10-23 10:30:42 -07:00
Andrzej Kapolka
cf78e21ea4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/Application.cpp
 2013-10-23 10:06:56 -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
Andrzej Kapolka
251b80b514 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-23 10:03:22 -07:00
ZappoMan
306b23d489 make Fast Voxel Pipeline the default behavior 2013-10-23 05:58:47 -07:00
stojce
9382268ee3 CR fixes 2013-10-23 09:30:26 +02:00
Andrzej Kapolka
247dfd3750 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-22 17:27:14 -07:00
stojce
b728689c6d more camera fixes 2013-10-22 22:18:56 +02:00
stojce
1cea3b403b Fixed camera view options 
- fixed camera lens angle
- xamera distance
 2013-10-22 22:02:17 +02:00
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07: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
Andrzej Kapolka
7e174093e4 Factoring the FBX model code out to a shared base class. 2013-10-18 17:26:03 -07:00
Andrzej Kapolka
591cf98821 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-18 14:30:50 -07:00
Lord Waymaster
25d5b38f5f Starfield modification to randomly generate stars 
Starfield now generates stars at startup rather than load them from the
server - approx. 50msec to load 50,000 stars.

STAR_COLORIZATION const in Generator.cpp is used to defined how
colorful the stars should be.

STARFIELD_NUM_STARS and STARFIELD_SEED sets the number of stars and the
random number seed used to generate the starfield.
 2013-10-17 23:24:03 -07:00
Andrzej Kapolka
778e432cc4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-17 17:33:03 -07:00
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
ZappoMan
001418649f show total memory usage for voxels 2013-10-17 17:08:46 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Philip Rosedale
c48856df52 Merge pull request #1075 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-17 14:26:40 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
PhilipRosedale
9643c1262c Fix mute button, visualize gaze direction when showing headMouse 2013-10-17 11:03:12 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
Philip Rosedale
746bce8626 All onscreen text, overlay OFF when stats are off 2013-10-15 11:01:22 -07:00
ZappoMan
924053f2ec added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment 2013-10-14 15:10:56 -07:00
ZappoMan
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
ZappoMan
6f9fdfba2f make mouse cursor hiding more aware of focused window and bounds 2013-10-14 11:39:48 -07:00
Philip Rosedale
b071776c22 Merge pull request #1051 from ZappoMan/keep_local_voxels 
Clean up some crashes in client side handling of voxels
 2013-10-11 17:15:41 -07:00
Philip Rosedale
3cd4415e6d Merge pull request #1052 from ZappoMan/hide_cursor 
implement hide cursor on no mouse movement
 2013-10-11 17:14:29 -07:00
Stephen Birarda
6369e9959f change goToUser shortcut to @ 2013-10-11 15:25:17 -07:00