Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 07:36:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12666 commits 74 branches 59 tags 1.2 GiB
Commit graph

6807 commits

Author SHA1 Message Date
AndrewMeadows
7a191961cf Merge pull request #2793 from PhilipRosedale/master 
Further improvements to avatar eye contact based on head direction
 2014-05-06 09:08:19 -07:00
Stojce Slavkovski
0b03421046 trivial commit - trigger build 2014-05-06 08:37:49 +02:00
Stojce Slavkovski
aedc7eda3e Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 08:27:55 +02:00
Stojce Slavkovski
14fee3b727 trivial commit - trigger build 2014-05-06 08:27:46 +02:00
Philip Rosedale
bb20762083 Merge pull request #2791 from AndrewMeadows/thermonuclear 
fix avatar motor to point in direction of camera
 2014-05-05 22:10:13 -07:00
Philip Rosedale
e3ab16997a tweaks to roll (back to no magnify) and lookAt indicator dot 2014-05-05 22:06:28 -07:00
Philip Rosedale
e1a6a824a3 remove model loader debug 2014-05-05 20:28:12 -07:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Andrew Meadows
e33ef1a571 fix avatar motor to point in direction of camera 2014-05-05 17:35:23 -07:00
Andrzej Kapolka
710cc3ec2a Comment fix. 2014-05-05 17:08:10 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Andrzej Kapolka
fd0a39df12 Always update attachments. 2014-05-05 16:19:33 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Stojce Slavkovski
13922171ea removed build warnings 2014-05-06 01:08:24 +02:00
Stojce Slavkovski
bcad49d0a9 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 01:05:13 +02:00
Stojce Slavkovski
519b36240c build fix 2014-05-06 01:05:04 +02:00
Brad Hefta-Gaub
e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia 
improved avatar walking on voxels
 2014-05-05 15:49:44 -07:00
Andrzej Kapolka
f37460e39a Basic attachment rendering. 2014-05-05 15:46:09 -07:00
Stojce Slavkovski
a5c6d8d996 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 00:24:49 +02:00
AndrewMeadows
1c9cc03693 Merge pull request #2784 from ZappoMan/modelserver 
LOD support to Models & Particles, and some other tweaks
 2014-05-05 15:13:18 -07:00
ZappoMan
b10d9e3903 add LOD support for model and particle rendering 2014-05-05 14:26:51 -07:00
Andrew Meadows
39196501f1 removed some unhelpful comments 2014-05-05 14:23:50 -07:00
Stephen Birarda
9ffd93a167 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 13:57:19 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrew Meadows
301c3c5649 don't ignore wall collisions when walking 
also reduced max walk speed
 2014-05-05 13:47:11 -07:00
Andrzej Kapolka
65e34f9697 More work on attachment interface. 2014-05-05 13:41:50 -07:00
Andrew Meadows
0c78449cf7 reduce movement speed when walking 2014-05-05 13:28:42 -07:00
Andrew Meadows
815262b802 update _lastFloorContactPoint 2014-05-05 13:06:55 -07:00
Stojce Slavkovski
09c385ba0d Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 21:46:17 +02:00
Stojce Slavkovski
56e7900aa6 Merge fix 2014-05-05 21:36:05 +02:00
Andrew Meadows
ec65940212 remove debug #include <StreamUtils.h> 2014-05-05 12:34:56 -07:00
Andrew Meadows
6b129c86d0 reduce snagging when walking across voxel seams 2014-05-05 12:33:05 -07:00
Atlante45
31b5c39f16 Fix warnings 2014-05-05 11:17:11 -07:00
Atlante45
7f7cd6f654 Fix for OS X Fullscreen (closes #2414) 2014-05-05 11:15:55 -07:00
Andrzej Kapolka
e898b4a900 More attachment bits. 2014-05-04 17:24:15 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Stojce Slavkovski
01ebefde11 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 01:24:15 +02:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrzej Kapolka
2bc605e193 Merge pull request #2779 from PhilipRosedale/master 
Remove dead ‘play slaps’ code
 2014-05-04 13:33:03 -07:00
Stojce Slavkovski
37664d3877 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-04 18:32:01 +02:00
Philip Rosedale
ab0e854336 Removed session UUID from interface title bar 2014-05-03 11:33:39 -07:00
Philip Rosedale
eb991b60ce Remove dead ‘play slaps’ code 2014-05-03 09:08:26 -07:00
Andrzej Kapolka
3a4dfb92f6 Let's try using the neck parent rotation, rather than the neck, to fix 
separate heads.
 2014-05-02 19:37:42 -07:00
Stephen Birarda
7921d33716 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:47:48 -07:00
Andrzej Kapolka
b458cd1297 Default joint mappings for Makehuman models. 2014-05-02 17:29:38 -07:00
Andrzej Kapolka
93cb5fc330 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:21:51 -07:00
Philip Rosedale
9aac74035c Merge pull request #2771 from birarda/oauth-ds 
restrict access to domains using user roles retreived from data-web
 2014-05-02 17:09:52 -07:00
Andrzej Kapolka
4c49d00683 Scale adjustment for Makehuman models. 2014-05-02 17:01:07 -07:00