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