Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 06:16:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26245 commits 74 branches 59 tags 1.2 GiB
Commit graph

12190 commits

Author SHA1 Message Date
Ryan Huffman
d6878c20b5 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 12:03:44 -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
Ryan Huffman
8864a1f298 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 09:38:17 -07:00
Brad Hefta-Gaub
8b120ea8cd Merge pull request #5029 from huffman/avatar-batches 
Team Teaching - Avatar batches
 2015-06-03 09:06:10 -07:00
Ryan Huffman
b8f3c42712 Update renderWorldBox to use batches 2015-06-03 09:03:04 -07:00
ZappoMan
2a2be789e4 remove direct call to head/face render since it's a payload item 2015-06-02 22:21:17 -07:00
ZappoMan
ff54334fe1 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:53 -07:00
ZappoMan
a7feca0727 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:00 -07:00
Ryan Huffman
847eccca84 Remove gl polygon offset calls 2015-06-02 22:02:50 -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
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Ryan Huffman
c4dbf6dae8 Update Avatar rendering to use batches 2015-06-02 17:06:41 -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
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
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
David Rowe
fb379f6c00 Fix crash when setting avatar body with Preferences dialog closed 2015-06-02 08:37:45 -07: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
David Rowe
7d12482a49 Untabify 2015-06-01 13:54:14 -07:00
David Rowe
9c52c79fe1 Combine icon and input areas into a single SVG 2015-06-01 13:29:36 -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
David Rowe
b166e24ff5 Fix initial fade-in 2015-06-01 11:06:33 -07:00
ZappoMan
1b8572640b more hacking sams tweaks 2015-06-01 09:07:32 -07:00
David Rowe
9a8bb67f37 Tidy address bar dialog code 2015-06-01 09:01:11 -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
David Rowe
05e251eba4 Add icon to address bar dialog 2015-06-01 09:01:10 -07:00
David Rowe
881941b64d Restyle address bar dialog 
Made the dialog a stand-alone QML file that doesn't inherit from other
dialog QML files so that don't need to rework all dialogs right now.
 2015-06-01 09:01:09 -07:00
David Rowe
a43593c3b2 Dialog opacity transition tidying 2015-06-01 09:01:08 -07:00
David Rowe
2a931119bd Replace expand/collapse dialog animation with fade in/out 2015-06-01 09:01:08 -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