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

26239 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
8b120ea8cd Merge pull request #5029 from huffman/avatar-batches 
Team Teaching - Avatar batches
 2015-06-03 09:06:10 -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
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
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
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
Stephen Birarda
c90114e1ef Update BUILD_OSX.md 2015-06-02 10:49:45 -07:00
Atlante45
d431a1b522 Remove comment 2015-06-02 19:28:05 +02:00
Atlante45
c012a581a6 Set shouldRender method 2015-06-02 19:26:39 +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
Philip Rosedale
faf9120b10 Merge pull request #5019 from howard-stearns/pitch-shifted-collision-sounds 
Pitch shifted collision sounds
 2015-06-02 09:38:13 -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
David Rowe
fb379f6c00 Fix crash when setting avatar body with Preferences dialog closed 2015-06-02 08:37:45 -07:00
Atlante45
9d4ded1fb3 Add shouldRender functor to render args 2015-06-02 16:09:05 +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
Howard Stearns
622a1e3068 Pitch-shift collision sounds, and make entities-renderer depend on soxr. 2015-06-01 21:19:42 -07:00
Howard Stearns
9b8be4ed2a Merge branch 'master' of https://github.com/highfidelity/hifi into sound-parameter-tweaks 2015-06-01 20:56:03 -07:00