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

8548 commits

Author SHA1 Message Date
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
ZappoMan
de968ba4f6 fix the issue with moving entities not being simulated makes motion smoother 2014-08-28 16:44:52 -07:00
ZappoMan
c66ef90ca0 fix Model mew/delete and thread issues 2014-08-28 16:27:46 -07:00
Stephen Birarda
29ed1b3fcd Merge pull request #3331 from ctrlaltdavid/19961 
Code Review for Job #19961
 2014-08-28 14:30:01 -07:00
David Rowe
1d3a176f5f Rename method 2014-08-28 13:53:47 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
David Rowe
85e9f8064a Simplify to use bool instead of storing domain name 2014-08-28 12:21:55 -07:00
David Rowe
46c1a9d59a Make login dialog automatically show only once per domain visit 2014-08-28 11:25:13 -07:00
Stephen Birarda
cc2a35c2a8 handle not found errors returned for addresses from data-web 2014-08-28 10:54:05 -07:00
Atlante45
2448229b46 fix for crash in Audio 2014-08-27 16:03:53 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
ZappoMan
ed6363ca02 fixed bug in processing of entity erase messages 2014-08-27 14:21:06 -07:00
ZappoMan
5c2b674a0d verify delete behavior actually frees memory associated with EntityItems 2014-08-27 12:07:11 -07:00
ZappoMan
30e00bbd69 final pass on entities import/export/overlays working as well as production 2014-08-27 11:34:50 -07:00
Brad Hefta-Gaub
e8c3125985 Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer 
Merge of Yixin's PR #3281 to head
 2014-08-27 11:14:52 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
ZappoMan
b14158385c first cut at getting pastEntities() working 2014-08-26 16:47:32 -07:00
ZappoMan
4895ee32f7 test and fix issues with exportEntities() 2014-08-26 15:59:49 -07:00
Atlante45
3826ed0d69 Added setFinalPitch/Yaw/Roll to HeadData 2014-08-26 15:36:08 -07:00
Atlante45
9e686b4096 Moved lean and head rotation inside Player class 2014-08-26 14:36:46 -07:00
ZappoMan
ef8feec91a fix referentials corruption and removed some debugging 2014-08-26 10:42:46 -07:00
Atlante45
cf14af0766 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-25 18:54:41 -07:00
Brad Hefta-Gaub
a51cace167 Merge pull request #3319 from Atlante45/sitting_points_not_disappearing_when_switching_to_fake_domain 
fix sitting points on domain switch
 2014-08-25 18:42:19 -07:00
Atlante45
1acce5c725 fix sitting points on domain switch 2014-08-25 18:02:30 -07:00
Andrzej Kapolka
e29a4e7683 Merge pull request #3312 from AndrewMeadows/ragdoll 
use dispatchTable for shape-vs-shape collision queries
 2014-08-25 15:43:48 -07:00
Andrew Meadows
8057071c12 put averageColor init closer to where it is used 2014-08-25 15:18:57 -07:00
Andrew Meadows
3ad9797607 fix crash: divide by zero when computing avg color 2014-08-25 15:15:27 -07:00
ZappoMan
4e38cb7c68 more debugging of referentials 2014-08-25 15:12:29 -07:00
ZappoMan
d6873f7b6c added some debugging for referentials 2014-08-25 14:48:08 -07:00
ZappoMan
1764839223 get basics of referentials working 2014-08-25 14:07:01 -07:00
Brad Hefta-Gaub
fe1a333ede Merge pull request #3316 from chansensturm/master 
add support for head-shadow/penumbra filter for positional audio streams
 2014-08-25 13:19:53 -07:00
Atlante45
88c8e5124e Merge branch 'master' of github.com:Atlante45/hifi 2014-08-25 12:47:01 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Andrew Meadows
6cdee21a50 fix for clearJointData() in JS scripts 
let the JointState class verify animation priority
 2014-08-25 10:40:28 -07:00
Craig Hansen-Sturm
848144d98c Merge remote-tracking branch 'upstream/master' 2014-08-24 22:17:30 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
ZappoMan
0207649d0c debug cleanup 2014-08-22 10:54:05 -07:00
AndrewMeadows
4f3f0989f5 Merge pull request #3313 from ctrlaltdavid/libovr_readme 
Bring libovr build instructions up to date
 2014-08-22 09:27:04 -07:00
David Rowe
cd81d6fc07 Bring libovr build instructions up to date 2014-08-21 19:24:09 -07:00
Andrzej Kapolka
5c77317cfd Fix for flashing when painting textures. 2014-08-21 18:07:30 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
Andrzej Kapolka
6e06b63709 For splat textures, use transparent white as a default. 2014-08-21 16:33:09 -07:00
Andrzej Kapolka
530f5b0df8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-21 16:00:30 -07:00
Atlante45
a9d3355f2e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-21 15:34:08 -07:00
Atlante45
f207abdd98 Move Player over to AvatarData for ACs to use 2014-08-21 15:24:19 -07:00
Andrzej Kapolka
e152e0c2be Detachment fix. 2014-08-21 15:22:34 -07:00
Atlante45
8760329323 Remove deprecated Audio class Player member 2014-08-21 11:08:37 -07:00
Clément Brisset
6a6670a962 Merge pull request #3307 from AndrewMeadows/inertia 
JS scripts can set spine rotation
 2014-08-21 11:07:39 -07:00
Andrew Meadows
1bc88a0224 merge upstream/master into andrew/ragdoll 2014-08-21 09:58:58 -07:00