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
ZappoMan
e91127bc5c
implement hide cursor on no mouse movement
2013-10-11 14:56:37 -07:00
ZappoMan
f2ef80b704
Merge pull request #1049 from stojce/19426
...
Code Review for Job #19426
2013-10-11 12:54:13 -07:00
ZappoMan
c6df36a40b
Merge pull request #1047 from stojce/19434
...
Code Review for Job #19434
2013-10-11 12:52:13 -07:00
ZappoMan
dfe23c9342
merge cleanup
2013-10-11 12:49:50 -07:00
