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 |
|