ZappoMan
|
d2deef97cc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-04 09:24:37 -07:00 |
|
Brad Hefta-Gaub
|
50f44c801a
|
Merge pull request #5045 from Atlante45/fix_world_box
Team Teaching - Temporary fix for models index offset
|
2015-06-04 09:16:31 -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 |
|
Atlante45
|
31d257db09
|
Temporary fix for models index offset
|
2015-06-04 17:58: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 |
|
Atlante45
|
e421485908
|
Add glLineWidth to Batch/GLBackend
|
2015-06-04 10:54:13 +02:00 |
|
ZappoMan
|
54c4cb829a
|
fixed the shrunken avatar part bug
|
2015-06-03 21:49:48 -07:00 |
|
ZappoMan
|
042384c5e2
|
light rendering as payload
|
2015-06-03 20:46:47 -07:00 |
|
Brad Davis
|
a12fd5c3d0
|
Merge pull request #5023 from AndrewMeadows/bispinor
fix crash in ~OffscreenGlCanvas on linux shutdown
|
2015-06-03 17:21:39 -07:00 |
|
ZappoMan
|
c6fb22b915
|
make sure all entities are rendering in pipeline part 1
|
2015-06-03 17:16:45 -07:00 |
|
ZappoMan
|
7fde574a2a
|
make model overlays acutally use sub mesh payload items
|
2015-06-03 16:33:58 -07:00 |
|
Sam Gateau
|
730d455095
|
adding a debug tool
|
2015-06-03 11:35:37 -07:00 |
|
Sam Gateau
|
b339aa683a
|
adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items
|
2015-06-03 11:25: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
|
9e7f60e6a3
|
add more guards against out of bounds
|
2015-06-02 22:17:39 -07:00 |
|
ZappoMan
|
a7feca0727
|
more work on making avatar models (face included) use render payloads
|
2015-06-02 22:10:00 -07:00 |
|
ZappoMan
|
647d132d57
|
store part boxes in model space and translate to world space on request
|
2015-06-02 21:50:33 -07:00 |
|
ZappoMan
|
c9c434bc8c
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
|
2015-06-02 21:04:33 -07:00 |
|
ZappoMan
|
adcb62eb18
|
more hacking and cleanup
|
2015-06-02 21:03:34 -07:00 |
|
Sam Gateau
|
8bf08b34d7
|
Trying to get Ubuntu to build... again
|
2015-06-02 19:37:54 -07:00 |
|
Sam Gateau
|
eea7ddf491
|
Trying to get Ubuntu to build
|
2015-06-02 19:27:32 -07:00 |
|
Sam Gateau
|
640071dd35
|
Avoiding any setVIewTransform in payloadREnder and introducing monitoring values
|
2015-06-02 18:23:53 -07:00 |
|
ZappoMan
|
4ce27f1483
|
first cut at rendering avatars as individual model items
|
2015-06-02 16:54:47 -07:00 |
|
Sam Gateau
|
903837ab4f
|
exposing some controls on the engine to js for debugging
|
2015-06-02 15:57:37 -07:00 |
|
Sam Gateau
|
3c7eb4de6d
|
merging with upstream
|
2015-06-02 14:48:53 -07:00 |
|
Andrew Meadows
|
9e0c2a3c6c
|
fix crash in ~OffscreenGlCanvas on linux shutdown
|
2015-06-02 14:36:34 -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 |
|
Brad Hefta-Gaub
|
507158e510
|
Merge pull request #5021 from Atlante45/lod
Team Teaching - LOD shouldRender in render engine
|
2015-06-02 12:21:25 -07:00 |
|
Sam Gateau
|
901717fb2c
|
trying to fix the issues of model disappearing
|
2015-06-02 11:52:22 -07:00 |
|
ZappoMan
|
5459b8402c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-02 11:25:23 -07:00 |
|
Sam Gateau
|
ef2d8a0dbe
|
tuesday morning rendering poor performances networking issue
|
2015-06-02 10:58:56 -07:00 |
|
Atlante45
|
d431a1b522
|
Remove comment
|
2015-06-02 19:28:05 +02:00 |
|
Atlante45
|
6d234a20ad
|
Hack for unknown pipelines
|
2015-06-02 19:07:57 +02:00 |
|
Seth Alves
|
11eb073bcf
|
fix comment
|
2015-06-02 10:04:39 -07:00 |
|
Seth Alves
|
d201f7791e
|
oops
|
2015-06-02 10:01:43 -07:00 |
|
Seth Alves
|
20d3814c1b
|
code review
|
2015-06-02 10:00:07 -07:00 |
|
Eric Levin
|
e7c5a24e3d
|
fixed packet number increment logic
|
2015-06-02 09:38:45 -07:00 |
|
Atlante45
|
ad3cea9907
|
Disable entity debub
|
2015-06-02 18:23:37 +02:00 |
|
Howard Stearns
|
0837c016c5
|
Update constant to use AudioConstants.h
|
2015-06-02 09:18:45 -07:00 |
|
Atlante45
|
9d4ded1fb3
|
Add shouldRender functor to render args
|
2015-06-02 16:09:05 +02:00 |
|