Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 21:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17059 commits 25 branches 0 tags 1.1 GiB
Commit graph

17059 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
48e45265a3 only add a directory to the filesystem watcher if not empty 2014-09-17 14:43:48 -07:00
Stephen Birarda
abafaffe44 fix a missed Model->Entity rename that caused slot error 2014-09-17 14:43:48 -07:00
Stephen Birarda
8dddbb9d4b make snapshots uploaded for locations temp files that will be cleared 2014-09-17 14:43:48 -07:00
Stephen Birarda
e7b9e2b060 have LocationManager upload snapshot after location creation 2014-09-17 14:43:48 -07:00
Stephen Birarda
7848c63fae handle name location shortcut explicitly to work around bug 2014-09-17 14:43:48 -07:00
Brad Hefta-Gaub
c248e1807f Merge pull request #3434 from birarda/master 
have domain server confirm access token is present before IP update
 2014-09-17 14:40:22 -07:00
Brad Hefta-Gaub
28d8645c20 Merge pull request #3437 from Atlante45/fix_attachments_scale_to_fit_crash 
Fixes crash in Model::scaleToFit()
 2014-09-17 14:38:41 -07:00
Andrzej Kapolka
a3c107545e Allow rendering eye vectors even if there's no head model. 2014-09-17 14:35:34 -07:00
Ryan Huffman
b55a5acdd3 Update style of running scripts widget 2014-09-17 14:27:11 -07:00
Ryan Huffman
0efce7c8ee Add hotkey to reload all scripts 2014-09-17 13:50:57 -07:00
Andrzej Kapolka
ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-09-17 13:50:13 -07:00
Philip Rosedale
dd82d45c1d Merge branch 'master' of https://github.com/worklist/hifi 2014-09-17 13:44:32 -07:00
Atlante45
3751e05ce3 Fixes crash in Model::scaleToFit() 2014-09-17 13:37:16 -07:00
Andrzej Kapolka
22342e45bc Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-17 13:27:45 -07:00
Andrzej Kapolka
801630e19c Normalize vertex weights if they don't add up to one; replace lowest weight 
if we can't find an empty slot.
 2014-09-17 13:26:57 -07:00
Craig Hansen-Sturm
efe853649d Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-17 13:03:36 -07:00
Craig Hansen-Sturm
cc7cc151c4 Merge pull request #3435 from ZappoMan/fixRotatedStatic 
more work toward fixing the static - still not fully fixed
 2014-09-17 13:00:45 -07:00
ZappoMan
ab447e20ee move filter to single instance in mixer, and do filtering on pre-mix buffer not the mixed buffer 2014-09-17 12:48:47 -07:00
Atlante45
aeba8a9dab Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-17 10:25:47 -07:00
Stephen Birarda
cc79254a41 have domain server make sure access token is present before IP update 2014-09-17 09:40:48 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
ZappoMan
c30ef9c331 Revert "flip default for enable filter to be disable filter to work around settings bug" 
This reverts commit 2a9d8d9238.
 2014-09-17 08:52:23 -07:00
ZappoMan
e3f573d05b Merge branch 'master' of https://github.com/highfidelity/hifi into fixRotatedStatic 2014-09-17 08:52:00 -07:00
AndrewMeadows
27c7b55237 Merge pull request #3430 from ey6es/master 
Read and apply material opacity settings.
 2014-09-17 08:51:12 -07:00
Stephen Birarda
4d4c7482b3 Merge pull request #3433 from birarda/master 
fix presentation of checkboxes who default to true
 2014-09-17 08:46:36 -07:00
Stephen Birarda
f1458dec3f fix presentation of checkboxes who default to true 2014-09-17 08:46:08 -07:00
ZappoMan
2a9d8d9238 flip default for enable filter to be disable filter to work around settings bug 2014-09-17 07:04:16 -07:00
Craig Hansen-Sturm
fe7f7cd303 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-16 21:43:12 -07:00
Craig Hansen-Sturm
e8f5c46589 Merge pull request #3431 from ZappoMan/fixRotatedStatic 
clean up the weak side/delay code to be more readable.
 2014-09-16 21:42:26 -07:00
ZappoMan
9494af6153 fix static when rotating away from source 2014-09-16 20:40:09 -07:00
Andrzej Kapolka
213b4e6ee6 Removed testing code. 2014-09-16 17:53:40 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
Philip Rosedale
152d391a05 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-16 17:34:55 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Atlante45
c699726ae8 Fixed URLs not read properly 2014-09-16 16:32:14 -07:00
Atlante45
81fc0d3696 Added options to use recording context 2014-09-16 14:50:20 -07:00
Atlante45
f649cd1a6e Changed how looping occurs in recordings 2014-09-16 14:49:47 -07:00
Atlante45
42857bce33 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-16 14:01:06 -07:00
Atlante45
96995e3aed Enforce checksums equality 2014-09-16 13:59:30 -07:00
Atlante45
1c5c9cb31b Fix bug adding first samples twice 2014-09-16 13:57:46 -07:00
Craig Hansen-Sturm
9da6312498 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
 2014-09-16 13:55:02 -07:00
Craig Hansen-Sturm
7b3f61ddc2 Merge pull request #3428 from ZappoMan/sendPositonOrientationInSilentPackets 
Send positon orientation in silent packets
 2014-09-16 13:39:06 -07:00
Philip Rosedale
55611bdd55 Merge pull request #3427 from birarda/master 
add ability for domain server to update IP address in data server
 2014-09-16 13:32:14 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00
ZappoMan
b50c2a37c2 Merge branch 'master' of https://github.com/highfidelity/hifi into sendPositonOrientationInSilentPackets 2014-09-16 13:11:00 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Atlante45
72481999df Compute actual checksum 2014-09-16 12:46:42 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Atlante45
8573130f07 Write correct Offset ad Length of the data 2014-09-16 12:34:22 -07:00
Atlante45
59637390a2 Add global timestamp to recordings 2014-09-16 12:26:55 -07:00