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

15778 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
72500630b0 Basic splatting. 2014-08-20 19:26:06 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Andrzej Kapolka
7cf7f188f8 Yet more texture bits. 2014-08-19 18:55:18 -07:00
Andrzej Kapolka
540d074270 More texture bits. 2014-08-19 17:20:14 -07:00
Andrzej Kapolka
3136e4df76 More texture progress. 2014-08-19 15:28:15 -07:00
Andrzej Kapolka
a9c4ce2a6a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-19 14:21:42 -07:00
Andrzej Kapolka
e854656a7f Rather than using a boolean to indicate "colorness," use a different class. 
More texture bits.
 2014-08-19 14:20:47 -07:00
Clément Brisset
8de49c9a87 Merge pull request #3299 from ctrlaltdavid/19840 
Ignore empty "embedded" textures
 2014-08-19 10:36:17 -07:00
David Rowe
1a80bd98f0 Ignore empty "embedded" textures 
Blender 2.71 exporter "embeds" external textures as empty binary blobs
 2014-08-19 10:25:18 -07:00
Philip Rosedale
f2069ba7d7 Merge pull request #3297 from Atlante45/record_feature 
couple fixes
 2014-08-18 21:29:05 -07:00
Atlante45
29830916ba Fix bug introduced in CR 2014-08-18 21:06:32 -07:00
Atlante45
45ccb01297 Update options position and orientation correctly in the AudioInjector 2014-08-18 21:05:03 -07:00
Andrzej Kapolka
23a4c21ce1 Only allow heightfield brushes on heightfield attributes. 2014-08-18 18:29:19 -07:00
Andrzej Kapolka
5b8ff07449 Working on heightfield textures. 2014-08-18 18:21:48 -07:00
AndrewMeadows
22f8f7779e Merge pull request #3296 from Atlante45/record_feature 
Record feature
 2014-08-18 16:42:26 -07:00
Atlante45
c113dd350e Moved members to MyAvatar 2014-08-18 16:25:38 -07:00
Andrzej Kapolka
c2a5c33b7b Added ability to encode subdivisions relative to ancestor (not currently using 
for heightfields, since absolute lossy encoding is more efficient).
 2014-08-18 16:07:15 -07:00
Atlante45
698699dea8 CR 2014-08-18 15:56:27 -07:00
Atlante45
6d567e67a9 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 15:41:19 -07:00
Clément Brisset
bec149ebb9 Merge pull request #3295 from AndrewMeadows/ragdoll 
Ragdoll Part 11: ragdoll collisions move avatar
 2014-08-18 15:38:25 -07:00
AndrewMeadows
86aa9a1dcf Merge pull request #3289 from ctrlaltdavid/19840 
Code Review for Job #19840
 2014-08-18 15:05:26 -07:00
Clément Brisset
a6f0c9bb01 Merge pull request #3288 from nivardus/19616 
Code Review for Job #19616
 2014-08-18 14:44:29 -07:00
Atlante45
1d30b52ec2 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 14:23:40 -07:00
Atlante45
52640c8482 Various tweaks and code cleanup 2014-08-18 14:23:29 -07:00
Andrew Meadows
b2d3830057 merge upstream/master into andrew/ragdoll 2014-08-18 12:56:11 -07:00
Andrew Meadows
c2f4648ad7 Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll 2014-08-18 12:55:10 -07:00
Andrew Meadows
543bf5224c add VerletPoint::shift() 2014-08-18 12:54:26 -07:00
Andrew Meadows
aa1a7307cc use Ragdoll::_accumulatedMovement to move MyAvatar 2014-08-18 12:53:34 -07:00
Andrew Meadows
7e7978de1a compute and store Ragdoll::_accumulatedMovement 2014-08-18 12:53:04 -07:00
Andrew Meadows
3e2095332f make SkeletonRagdoll::updateMuscles() protected 2014-08-18 12:50:07 -07:00
Andrew Meadows
fe5f9f8fe5 use relative mass when enforcing ContactPoint 2014-08-18 12:49:47 -07:00
Andrew Meadows
54851c5ced add Ragdoll::_accumulatedMovement 2014-08-18 12:49:12 -07:00
Clément Brisset
ddc67a8edb Merge pull request #3285 from AndrewMeadows/ragdoll 
Cleanup of Ragdoll API
 2014-08-18 12:36:27 -07:00
Atlante45
acb55ce65e Switched audio play back to AudioInjector out of Audio 2014-08-18 12:31:44 -07:00
Atlante45
2eb1321cc2 Sound and AudioInjector tweaks 2014-08-18 12:28:44 -07:00
Andrzej Kapolka
b7bdaae691 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-18 11:40:16 -07:00
Andrew Meadows
77047b0130 no NULL check on delete SkeletonModel::_ragdoll 2014-08-18 11:25:51 -07:00
AndrewMeadows
4b7208ac53 Merge pull request #3280 from huffman/19907 
Code Review for Job #19907
 2014-08-18 10:20:01 -07:00
AndrewMeadows
7d508eab1b Merge pull request #3294 from ZappoMan/improvedJitterTests 
improved use of MovingMinMaxAvg<> for better performance
 2014-08-18 09:25:05 -07:00
ZappoMan
be94f98a91 fix warning 2014-08-17 14:10:42 -07:00
ZappoMan
cac4e5ba6c improved use of MovingMinMaxAvg<> for better performance, added execution timing stats 2014-08-17 14:08:07 -07:00
Atlante45
47685b0e88 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-17 12:56:19 -07:00
Andrzej Kapolka
a83ff45335 Working on custom encodings for subdivisions. 2014-08-15 18:09:58 -07:00
Philip Rosedale
5ca28901bd Merge pull request #3293 from ey6es/metavoxels 
Support for shadows on heightmaps.
 2014-08-15 17:37:58 -07:00
Andrzej Kapolka
a2ec9898ad Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-15 16:34:25 -07:00
Andrzej Kapolka
668f6d3cfd Support for shadows on heightmaps. 2014-08-15 16:13:47 -07:00
AndrewMeadows
e2251852c3 Merge pull request #3291 from birarda/mixer-analytics 
perfom packet verification on same thread as NodeList hash
 2014-08-15 14:24:40 -07:00
AndrewMeadows
adef45538c Merge pull request #3292 from Atlante45/fix_for_custom_URL_schemes 
Fix for custom URL schemes
 2014-08-15 14:22:49 -07:00
Atlante45
6592a6dca2 Fix for custom URL schemes 2014-08-15 10:28:22 -07:00
Stephen Birarda
2e6350832c perfom packet verification on same thread as NodeList hash 2014-08-15 09:35:03 -07:00