Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 19:27:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26374 commits 75 branches 59 tags 1.2 GiB
Commit graph

26374 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Howard Stearns
8e6a20ec42 Merge branch 'master' of https://github.com/highfidelity/hifi into pitch-shifted-collision-sounds 2015-06-02 09:38:54 -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
Howard Stearns
67c0a8354a Merge branch 'master' of https://github.com/highfidelity/hifi into pitch-shifted-collision-sounds 2015-06-02 09:36:56 -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
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
samcake
f8042e299e Merge pull request #5018 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - implement meta item for model entities
 2015-06-01 17:29:57 -07:00
ZappoMan
037246ee3c implement meta item for model entities 2015-06-01 15:58:43 -07:00
Eric Levin
f51ad6b8da merged master 2015-06-01 15:39:05 -07:00
Eric Levin
785144404c changed entity packet type version number 2015-06-01 15:37:29 -07:00
Eric Levin
83bf4241e4 resolved merge conflicts... but now lines not flying across clients 2015-06-01 15:16:08 -07:00
Brad Hefta-Gaub
733261e84c Merge pull request #5016 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-06-01 15:12:50 -07:00
Seth Alves
ef5fa48c2a Merge pull request #5017 from birarda/master 
update polyvox for xcode C++11 build
 2015-06-01 15:06:51 -07:00
Stephen Birarda
94131908fb update polyvox for xcode C++11 build 2015-06-01 14:53:11 -07:00
Andrew Meadows
cc9ae81c75 group Entity property settings together 2015-06-01 14:47:14 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Seth Alves
ea3f002a65 ifdef out debug pritns 2015-06-01 14:38:07 -07:00
ZappoMan
accc0093a0 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:27:23 -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
Andrew Meadows
fa491a5c4f fix theoretical crash bug in editEntity() 2015-06-01 13:59:56 -07:00
Seth Alves
d1bb6473d9 more work on edge handling and resizing 2015-06-01 13:57:28 -07:00
Sam Gateau
1b22f1f147 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 13:56:13 -07:00