Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 18:47:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17202 commits 76 branches 59 tags 1.2 GiB
Commit graph

17202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
AndrewMeadows
76f78e77d1 Merge pull request #3461 from PhilipRosedale/master 
final tweaks to movement script
 2014-09-19 09:23:14 -07:00
Philip Rosedale
6c808f2979 final tweaks to movement script 2014-09-19 09:22:27 -07:00
AndrewMeadows
2a5ec89e3b Merge pull request #3460 from PhilipRosedale/master 
Added JS support for neck position for headMove script
 2014-09-19 09:04:12 -07:00
Philip Rosedale
c6d6c347cd head move using neck measurement for movement rather than head. 2014-09-19 08:48:55 -07:00
ZappoMan
99cc02cc4f Merge branch 'master' of https://github.com/highfidelity/hifi into perListenerSourcePairMixerData 2014-09-18 17:44:04 -07:00
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -07:00
Stephen Birarda
e09eef98f2 add option to add javascript objects to a DataWebDialog 2014-09-18 17:17:33 -07:00
Craig Hansen-Sturm
255d9346bb Merge pull request #3459 from Atlante45/JS_hook_for_recordings 
Added JS hooks for new Player options
 2014-09-18 17:13:07 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
ZappoMan
7fc7eeb0a1 Merge branch 'master' of https://github.com/highfidelity/hifi into perListenerSourcePairMixerData 2014-09-18 17:05:48 -07:00
Atlante45
3ba178022e Added new options to ControlledAC.js 2014-09-18 17:02:11 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Clément Brisset
36c6099864 Merge pull request #3457 from chansensturm/audio-noise 
Set default for head-penumbra filter to off
 2014-09-18 16:46:15 -07:00
Craig Hansen-Sturm
a66b6e7237 Merge pull request #3458 from Atlante45/editVoxel_fix 
Fixes 0 makes a voxel when tool off
 2014-09-18 16:38:54 -07:00
Atlante45
b58c5f75dd Fixes 0 makes a voxel when tool off 2014-09-18 16:24:23 -07:00
Andrzej Kapolka
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00
Craig Hansen-Sturm
8e6d5da8fd disable positional filter by default 2014-09-18 16:05:15 -07:00
Craig Hansen-Sturm
8a8095566b Merge pull request #3456 from Atlante45/rec_file_format_tweaks 
Fix LookAtPosition
 2014-09-18 15:32:38 -07:00
Atlante45
29ff8c09d9 Fix LookAtPosition 2014-09-18 15:23:58 -07:00
ZappoMan
6f73da7d44 CR feedback 2014-09-18 15:19:03 -07:00
Andrzej Kapolka
cb1af4499a Merge pull request #3455 from ey6es/master 
Tiny tweak to weight loading: only replace lowest weight if the new weig...
 2014-09-18 15:05:30 -07:00
ZappoMan
bd23b8b8b9 completely remove _penumbraFilter from AudioMixer class 2014-09-18 15:01:06 -07:00
ZappoMan
864c1c88a7 fix the filter with delay and add per listener source pair data 2014-09-18 14:58:44 -07:00
Philip Rosedale
d3cc22b39d Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 14:51:19 -07:00
Craig Hansen-Sturm
2383379a35 default sine gain set to -6db 2014-09-18 13:52:53 -07:00
Brad Hefta-Gaub
a5ea0479c1 Merge pull request #3450 from birarda/master 
handle hifi urls emitted from DataWebDialog in Application
 2014-09-18 13:36:37 -07:00
Stephen Birarda
9f3d908d9f fix typo in comment 2014-09-18 13:32:01 -07:00
Brad Hefta-Gaub
c48b3ae51e Merge pull request #3451 from birarda/fix-ssl-handshake-race 
make sure the OAuthWebViewHandler is ready before the NodeList might need it
 2014-09-18 13:29:54 -07:00
Andrzej Kapolka
5c22fe7bd1 Translucency tweak. 2014-09-18 13:27:15 -07:00
Andrzej Kapolka
fb7e633cac Post-merge fixes. 2014-09-18 13:17:23 -07:00
Stephen Birarda
b63ef1f7fe Merge pull request #3453 from birarda/clement-recording-changes 
Rec file format tweaks (on behalf of @Atlante45)
 2014-09-18 13:14:09 -07:00
Craig Hansen-Sturm
256bd627fa clamp to 0.0f when within EPSILON neighborhood of 0.0f 2014-09-18 13:12:53 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
Andrzej Kapolka
37eb40122c Tiny tweak to weight loading: only replace lowest weight if the new weight is 
greater.
 2014-09-18 13:05:57 -07:00
David Rowe
ff8ea46e26 Hide menu bar when fullscreen in Rift VR display mode 2014-09-18 11:34:48 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
75ecdd2f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 11:27:33 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
Philip Rosedale
2d8eb114bc Merge pull request #3448 from AndrewMeadows/ragdoll 
Support avatar motorVelocity in various frames
 2014-09-18 10:45:13 -07:00
Atlante45
72d8522adc Fixed typo + removed MesageBoxes 2014-09-18 10:45:12 -07:00
Craig Hansen-Sturm
1eab983ee0 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-18 10:39:03 -07:00
Stephen Birarda
84f3e99354 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 10:38:50 -07:00
Atlante45
397be962f4 CR fixes 2014-09-18 10:37:36 -07:00