Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 23:33:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26257 commits 71 branches 56 tags 1.2 GiB
Commit graph

26257 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
f70ff2291b Merge pull request #5035 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-03 13:09:34 -07:00
ZappoMan
6ba8d7e46b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-03 13:00:30 -07:00
Brad Hefta-Gaub
136336b652 Merge pull request #5031 from huffman/world-box-batch 
Team teaching - render world box using batches
 2015-06-03 12:43:52 -07:00
Ryan Huffman
d6878c20b5 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 12:03:44 -07:00
Ryan Huffman
27707c8933 Merge pull request #5034 from samcake/daft 
TEAM-TEACHING: Adding a debug tool
 2015-06-03 11:49:56 -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
Clément Brisset
f553243bb8 Merge pull request #5032 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - merge from master
 2015-06-03 19:47:40 +02: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
Andrew Meadows
b0fdb0413c Merge pull request #5024 from ctrlaltdavid/20561 
CR for #20561 - Fix address bar dialog text
 2015-06-03 09:33:29 -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
samcake
d4fddad176 Merge pull request #5030 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - rendering avatar models as payload parts
 2015-06-03 00:27:09 -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
9e7f60e6a3 add more guards against out of bounds 2015-06-02 22:17:39 -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
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
Brad Hefta-Gaub
446235026b Merge pull request #5028 from samcake/punk 
TEAM-TEACHING: Try to move the rendering pipeline to the REnderDeferredTask
 2015-06-02 20:45: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
Brad Hefta-Gaub
66aa7c1adf Merge pull request #5026 from sethalves/polyvox 
icon for create-polyvox button
 2015-06-02 18:43:27 -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
David Rowe
878227ab8b Increase address bar dialog size 
Including font size, just for this dialog.
 2015-06-02 16:33:09 -07:00
Seth Alves
a85a0b863d icon for create-polyvox button 2015-06-02 16:25:38 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
David Rowe
ec1cb72dd5 Rework QML font sizing to be more consistent across platforms 2015-06-02 14:49:33 -07:00
David Rowe
a8a3c677ad Darken address bar hint text so that it's better visible on the DK2 2015-06-02 14:49:32 -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
Brad Hefta-Gaub
2892b2bc8d Merge pull request #5020 from ctrlaltdavid/20559 
DO NOT MERGE - QA for #20559 - Fix crash when setting avatar body with Preferences dialog closed
 2015-06-02 12:37:29 -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
Brad Hefta-Gaub
8cfb3de62c Merge pull request #5022 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-06-02 12:19:08 -07:00
Sam Gateau
901717fb2c trying to fix the issues of model disappearing 2015-06-02 11:52:22 -07:00