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

26142 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -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
ZappoMan
5459b8402c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-02 11:25:23 -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
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
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
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
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
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -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
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
ZappoMan
1e2d2a2a99 calculate the actual bounding box for the mesh parts 2015-06-01 13:31:42 -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
Stephen Birarda
293af425ac remove vhacd block from windows build guide 2015-06-01 12:49:26 -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
ea31fdcc26 hacking on transparency 2015-06-01 11:53:40 -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
samcake
b676036895 Merge pull request #5007 from SamGondelman/master 
Fixed avatar billboards not displaying
 2015-06-01 10:54:19 -07:00
Philip Rosedale
6290f8c992 Merge pull request #5013 from ericrius1/grab 
removed sounds from grab script
 2015-06-01 09:39:04 -07:00
Eric Levin
45331e5a0e removed sounds from grab script 2015-06-01 09:37:54 -07:00
Philip Rosedale
63ae711015 Merge pull request #5005 from howard-stearns/sound-parameter-tweaks 
Sound parameter tweaks
 2015-06-01 09:37:36 -07:00
ZappoMan
1b8572640b more hacking sams tweaks 2015-06-01 09:07:32 -07:00
Howard Stearns
6a57d52b22 Merge branch 'master' of https://github.com/highfidelity/hifi into sound-parameter-tweaks 2015-06-01 09:07:20 -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
Brad Hefta-Gaub
c002a0f990 Merge pull request #5011 from samcake/daft 
TEAM TEACHING: Adding the update mechanism for the Item's payload of the scene
 2015-05-31 20:46:56 -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
Philip Rosedale
396a20c72d Merge pull request #5006 from ericrius1/brownianFun 
added brownianFun script to apply random forces to balls in a pen
 2015-05-30 15:25:38 -07:00