Ryan Huffman
|
9814d11bea
|
Fix model entities correctly updating payloads when url changes
|
2015-06-05 08:45:31 -07:00 |
|
Ryan Huffman
|
a62b55fcb2
|
Update entity payload items to correctly hide when not visible
|
2015-06-04 13:25:40 -07:00 |
|
Clément Brisset
|
7ffe7b31a6
|
Merge pull request #5041 from ZappoMan/team-teaching-all-entities
TEAM TEACHING - overlays and entities, fix to shrunken avatars
|
2015-06-04 18:00:44 +02:00 |
|
ZappoMan
|
c4756f4816
|
remove dead code
|
2015-06-04 08:49:26 -07:00 |
|
ZappoMan
|
4b389793ad
|
CR feedback
|
2015-06-04 08:42:10 -07:00 |
|
Atlante45
|
ab9cfac672
|
Restore line width
|
2015-06-04 11:35:41 +02:00 |
|
Atlante45
|
78e9c5870b
|
Line updateGeometry in render
|
2015-06-04 10:56:48 +02:00 |
|
Atlante45
|
504be28143
|
Remove unused variables
|
2015-06-04 10:55:51 +02:00 |
|
Atlante45
|
166eff7df1
|
Fix line entity rendering
|
2015-06-04 10:54:57 +02:00 |
|
ZappoMan
|
042384c5e2
|
light rendering as payload
|
2015-06-03 20:46:47 -07:00 |
|
ZappoMan
|
c6fb22b915
|
make sure all entities are rendering in pipeline part 1
|
2015-06-03 17:16:45 -07:00 |
|
ZappoMan
|
7c40b666e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
|
2015-06-03 09:52:40 -07:00 |
|
ZappoMan
|
a7feca0727
|
more work on making avatar models (face included) use render payloads
|
2015-06-02 22:10:00 -07:00 |
|
Sam Gateau
|
3c7eb4de6d
|
merging with upstream
|
2015-06-02 14:48:53 -07:00 |
|
Andrew Meadows
|
2702e07863
|
Merge pull request #5015 from sethalves/polyvox
PolyVox improvements -- depends on #5008
|
2015-06-02 14:34:49 -07:00 |
|
Sam Gateau
|
453fa87654
|
making sure the proj and view matrix are correctly assigned
|
2015-06-02 14:31:40 -07:00 |
|
Brad Hefta-Gaub
|
2a8e758559
|
Merge pull request #5010 from ericrius1/lineEntity
Modified the line entity to take two new properties: lineWidth and linePoints
|
2015-06-02 14:25:44 -07:00 |
|
Eric Levin
|
7527efc2d6
|
removed unsuded variable
|
2015-06-02 13:58:09 -07:00 |
|
Eric Levin
|
a98baef736
|
another code cleanup
|
2015-06-02 13:56:18 -07:00 |
|
Eric Levin
|
55ffb7f1c0
|
code style changes
|
2015-06-02 12:51:45 -07:00 |
|
ZappoMan
|
5459b8402c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-02 11:25:23 -07:00 |
|
Seth Alves
|
20d3814c1b
|
code review
|
2015-06-02 10:00:07 -07:00 |
|
Howard Stearns
|
0837c016c5
|
Update constant to use AudioConstants.h
|
2015-06-02 09:18:45 -07:00 |
|
Howard Stearns
|
622a1e3068
|
Pitch-shift collision sounds, and make entities-renderer depend on soxr.
|
2015-06-01 21:19:42 -07:00 |
|
ZappoMan
|
037246ee3c
|
implement meta item for model entities
|
2015-06-01 15:58:43 -07:00 |
|
ZappoMan
|
d4af454834
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-01 14:42:35 -07:00 |
|
Seth Alves
|
ea3f002a65
|
ifdef out debug pritns
|
2015-06-01 14:38:07 -07:00 |
|
Seth Alves
|
d1bb6473d9
|
more work on edge handling and resizing
|
2015-06-01 13:57:28 -07:00 |
|
samcake
|
98c0cd7d23
|
Merge pull request #5009 from ZappoMan/team-teaching-scene-api
TEAM TEACHING - hacking on rendering mesh parts
|
2015-06-01 12:24:27 -07:00 |
|
Seth Alves
|
43a1519e29
|
better handling of changes to the size of voxel space. limit each dimension to 32
|
2015-06-01 12:01:45 -07:00 |
|
Eric Levin
|
5cce4edec8
|
fix merge conflicts attemp 1
|
2015-06-01 11:18:33 -07:00 |
|
ZappoMan
|
4b46fc3ad9
|
cleanup Model::renderPart()
|
2015-06-01 11:11:27 -07:00 |
|
Seth Alves
|
175926736d
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-06-01 09:59:01 -07:00 |
|
Eric Levin
|
7b08537574
|
code standards fixes
|
2015-06-01 09:51:24 -07:00 |
|
Eric Levin
|
8a191a661d
|
adding flag for points changed
|
2015-06-01 09:35:32 -07:00 |
|
ZappoMan
|
1b8572640b
|
more hacking sams tweaks
|
2015-06-01 09:07:32 -07:00 |
|
Seth Alves
|
00af0a4376
|
trying to make thing behave when voxel-space is resized
|
2015-06-01 07:15:37 -07:00 |
|
Sam Gateau
|
83c4a52454
|
Cleaning for PR
|
2015-05-31 19:34:03 -07:00 |
|
Sam Gateau
|
33d397a440
|
A fist update solution for the item
|
2015-05-31 19:10:37 -07:00 |
|
Eric Levin
|
9641b11086
|
array of points takes absolute positions now, so script writer has an easier time
|
2015-05-31 14:59:09 -07:00 |
|
Eric Levin
|
115bf3dd25
|
cleaned up logging and testing code.
|
2015-05-31 14:52:44 -07:00 |
|
Seth Alves
|
cfeab893e7
|
fix voxelToLocalMatrix
|
2015-05-31 09:28:33 -07:00 |
|
Seth Alves
|
b9202ebfb6
|
added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look
|
2015-05-31 09:14:59 -07:00 |
|
Seth Alves
|
a3589788df
|
allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items.
|
2015-05-30 18:33:35 -07:00 |
|
Seth Alves
|
c5a0dd72ec
|
keep track of number of non-zero voxels, use this information when deciding on shape-type
|
2015-05-30 18:13:57 -07:00 |
|
Seth Alves
|
fe59f8846f
|
recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape
|
2015-05-30 16:43:11 -07:00 |
|
ZappoMan
|
a0683b2847
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
|
2015-05-29 21:57:47 -07:00 |
|
ZappoMan
|
0124f98340
|
more hacking on rendering model parts
|
2015-05-29 21:56:24 -07:00 |
|
Seth Alves
|
96a40bd673
|
basic collisions with cubic polyvoxes
|
2015-05-29 18:50:26 -07:00 |
|
Eric Levin
|
7d5dd278a1
|
adding unpacking
|
2015-05-29 16:54:40 -07:00 |
|