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
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
Sam Gateau
453fa87654
making sure the proj and view matrix are correctly assigned
2015-06-02 14:31:40 -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
c012a581a6
Set shouldRender method
2015-06-02 19:26:39 +02:00
Philip Rosedale
90dd730a25
Merge pull request #4940 from ctrlaltdavid/20544
...
CR for 20544 - Make eyelids follow iris as head tilts
2015-06-01 23:36:07 -07:00
Sam Gateau
cd7914ad9d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715
Trying to transfer the rnedering from displaySide to RenderDeferredTask
2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
Stephen Birarda
12bcbbf338
Merge pull request #5012 from ctrlaltdavid/20555
...
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
2015-06-01 17:08:00 -04:00
samcake
50f3d2d12b
Merge pull request #5014 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - report correct part bounds
2015-06-01 13:55:55 -07:00
ZappoMan
750d9c0616
poor mans version of mesh part bounds
2015-06-01 12:53:09 -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
ZappoMan
4b46fc3ad9
cleanup Model::renderPart()
2015-06-01 11:11:27 -07:00
ZappoMan
1b8572640b
more hacking sams tweaks
2015-06-01 09:07:32 -07:00
David Rowe
e41b4c1b7b
Add new address bar dialog error message
...
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
2015-06-01 09:01:11 -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
Sam Gateau
ddec8fd26f
Trying to find a good solution for update message & data
2015-05-30 13:57:05 -07:00
Sam Gondelman
c19115a485
actually fixed billboard
2015-05-29 16:53:01 -07:00
Sam Gondelman
4c83c6918d
fixed avatar billboards not displaying
2015-05-29 16:44:16 -07:00
Sam Gateau
7bde81e95f
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72
Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme
2015-05-29 15:44:14 -07:00
samcake
f8a90684ce
Merge pull request #5000 from huffman/scene-overlay
...
Team Teaching - Move overlay rendering to Scene pipeline
2015-05-29 15:31:46 -07:00
Ryan Huffman
b37a023041
Remove all overlays from Scene on desctruction
2015-05-29 14:55:53 -07:00
Ryan Huffman
3f5b115c67
Move _overlays after scene in Application so it destructs first
2015-05-29 14:55:32 -07:00
Ryan Huffman
667dccbb87
Add Item::INVALID_ITEM_ID and use in overlays
2015-05-29 13:43:49 -07:00
Sam Gateau
eef8077417
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-29 13:20:43 -07:00
Atlante45
d8168811b3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:22 +02:00
Seth Alves
b0f6826d17
Merge pull request #4995 from birarda/domain-dtls
...
speed up initial connection to domains
2015-05-29 10:50:01 -07:00
Howard Stearns
8e245ec4c2
getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step.
...
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
2015-05-29 09:59:21 -07:00
Ryan Huffman
b4806f5aac
Fix render::PendingChanges using render::Scene::PendingChanges
2015-05-29 09:40:52 -07:00
Ryan Huffman
0e5cf273ab
Fix AABox bounds handling in Overlays
2015-05-29 09:40:23 -07:00
Ryan Huffman
b21d0a3a53
Remove Overlays::renderWorld from Application
2015-05-29 09:40:03 -07:00
Ryan Huffman
2222468e89
Remove Overlays::renderWorld
2015-05-29 08:53:40 -07:00
Ryan Huffman
874f722504
Remove unused Avatar::Pointer typedef
2015-05-29 08:51:37 -07:00
Ryan Huffman
1089490658
Move overlay rendering to Scene
2015-05-29 08:51:25 -07:00
Sam Gateau
dd9cafcd09
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4
reinserting culling, lod and depth sort to the rendering
2015-05-28 18:01:31 -07:00
Stephen Birarda
5749fefcd5
have show DS connect refresh existing dialog
2015-05-28 17:07:57 -07:00
Stephen Birarda
7f86ca3f10
refresh the network dialog if it is already up
2015-05-28 17:07:20 -07:00
Brad Hefta-Gaub
1c3398f27e
Merge pull request #4991 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc
Undo the merge with the broken master checking. What could go wrong?
2015-05-28 13:48:27 -07:00
