Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 16:39:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

16974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
b8f49dc6ef fix vertical jitter (for real this time) 2014-09-17 21:56:38 -07:00
Andrzej Kapolka
30b36f1db4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-17 17:58:15 -07:00
Andrew Meadows
613b270d24 headMove.js using experimental avatar motor 2014-09-17 17:57:50 -07:00
Andrzej Kapolka
e0a56b4a95 Rejiggered the blender handling: allow up to N blenders active at once so 
that with small numbers of avatars, the blenders can stack for lower latency.
 2014-09-17 17:57:08 -07:00
Andrew Meadows
8359e672bb merge upstream/master into andrew/ragdoll 2014-09-17 17:56:35 -07:00
Andrew Meadows
cefe8e0268 scripted motor params are now Q_PROPERTIES 2014-09-17 17:55:10 -07:00
Philip Rosedale
fe9ae5bc69 Merge pull request #3442 from Atlante45/script_engine_fix 
Fix timer bug with script engine
 2014-09-17 17:10:53 -07:00
Philip Rosedale
8d2a2be392 Merge pull request #3440 from ey6es/master 
Fix for eyes on skeleton (e.g., Mixamo) models.
 2014-09-17 17:08:02 -07:00
Atlante45
d27134a7ac Added getters for the different Player options 2014-09-17 17:06:47 -07:00
Atlante45
66a3683482 Fix timer bug with script engine 
Occurs when Script.clearInterval() called inside
Script.setInterval callback
 2014-09-17 16:48:46 -07:00
Andrew Meadows
21a17823d4 Fix for vertical jitter when walking on floor 2014-09-17 16:26:07 -07:00
Atlante45
34c16b8a74 Convert .rec to new format if necessary 2014-09-17 16:25:48 -07:00
Atlante45
6e55c66d09 Fix radix bug 2014-09-17 16:24:54 -07:00
Stephen Birarda
9ee063bdc1 remove the access token from API urls and put in Authorization header 2014-09-17 16:00:20 -07:00
Andrzej Kapolka
4a2e68fea4 Fix for eyes on skeleton (e.g., Mixamo) models. 2014-09-17 15:36:22 -07:00
Brad Hefta-Gaub
fd321a5ed1 Merge pull request #3439 from birarda/master 
upload a snapshot for location on location creation, cleanup interface start errors
 2014-09-17 14:52:04 -07:00
Brad Hefta-Gaub
cf135c300c Merge pull request #3436 from ey6es/master 
Fix for shirts on avatars created with new version of Fuse.
 2014-09-17 14:51:54 -07:00
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
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