Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 21:34:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11869 commits 71 branches 56 tags 1.2 GiB
Commit graph

11869 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
00829e0289 The actual animation business. 2014-04-16 21:10:59 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
Andrzej Kapolka
38c0e99cbe More work on animation loading. 2014-04-14 18:12:32 -07:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
Andrzej Kapolka
c5ffe54a91 Working on loading animation data. 2014-04-14 16:26:30 -07:00
Andrzej Kapolka
01ca37f64e Merge branch 'master' of https://github.com/highfidelity/hifi into animate 2014-04-14 14:09:11 -07:00
Stephen Birarda
d8cc626ed8 Merge pull request #2667 from birarda/master 
more cleanup to build guide for windows
 2014-04-14 12:41:46 -07:00
Stephen Birarda
55172c6f43 more cleanup to BUILD guide for windows 2014-04-14 12:39:45 -07:00
Stephen Birarda
4f10c4b5d4 Merge pull request #2666 from birarda/master 
fix for DLL section of build guide
 2014-04-14 12:36:56 -07:00
Stephen Birarda
d3776afc93 fix for DLL section in BUILD guide 2014-04-14 12:36:13 -07:00
Stephen Birarda
2a38c01668 Merge pull request #2665 from birarda/master 
changes to build guide for win32 GnuTLS
 2014-04-14 12:32:28 -07:00
Stephen Birarda
1aacba3b46 changes to Windows instructions for GnuTLS 2014-04-14 12:31:53 -07:00
Andrzej Kapolka
873620e601 Make sure we set the texture data even if the texture URL is invalid. 2014-04-14 12:27:15 -07:00
Andrzej Kapolka
e5f6445a6a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-14 11:04:32 -07:00
Stephen Birarda
0f9a00aacf Merge pull request #2664 from birarda/authentication 
update cmake required version
 2014-04-14 10:57:50 -07:00
Stephen Birarda
c5c8327359 update required version of cmake to 2.8.12.2 2014-04-14 10:57:34 -07:00
Stephen Birarda
8f23b12081 Merge pull request #2662 from birarda/authentication 
update build guide with extra info for GnuTLS
 2014-04-14 10:52:09 -07:00
Stephen Birarda
70191111c7 remove GnuTLS DLL tip since DLL section is right below 2014-04-14 10:51:36 -07:00
Stephen Birarda
95abc74d83 add GnuTLS to example windows folder structure 2014-04-14 10:50:57 -07:00
Stephen Birarda
1c7f8c87bc don't codify directories in OS X section 2014-04-14 10:50:03 -07:00
Stephen Birarda
6cb5497242 codify some library names and fix some other spelling 2014-04-14 10:49:11 -07:00
Stephen Birarda
007a477400 fix a typo in build guide 2014-04-14 10:46:42 -07:00
Stephen Birarda
6b4a7d365f update build guide with extra info for GnuTLS 2014-04-14 10:43:42 -07:00
Andrzej Kapolka
880736c30e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-14 10:24:58 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
Andrzej Kapolka
25d25b1472 Merge pull request #2658 from AndrewMeadows/inertia 
don't render avatar boundary shapes in first person
 2014-04-14 10:23:43 -07:00
Philip Rosedale
e3eddadd10 Merge pull request #2651 from AndrewMeadows/avatar-interaction 
protection against bad avatar-avatar collisions
 2014-04-11 21:23:57 -07:00
Leonardo Murillo
13b12f48c2 Merge pull request #2659 from murillodigital/master 
switching to https
 2014-04-11 19:59:22 -06:00
Leonardo Murillo
f84249ac6c switching to https 2014-04-11 19:58:49 -06:00
Andrzej Kapolka
0ca68e4cb4 Adjust the size when we toggle the avatar LOD options. 2014-04-11 17:53:02 -07:00
Andrew Meadows
0ad841edfb don't render avatar boundary shapes in first person 2014-04-11 17:44:51 -07:00
Andrzej Kapolka
39135d3d5f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-11 16:37:49 -07:00
Andrew Meadows
fd3b317c09 merge 2014-04-11 16:36:42 -07:00
Andrzej Kapolka
2fdb8d935b Merge pull request #2654 from Atlante45/remove_qrc_from_sources 
Remove qrc from sources
 2014-04-11 16:35:48 -07:00
Andrzej Kapolka
91c21ced5d Merge pull request #2652 from AndrewMeadows/inertia 
save settings whenever menu items are changed
 2014-04-11 16:35:01 -07:00
Andrzej Kapolka
4265617c3e Add missing include. 2014-04-11 16:02:46 -07:00
Andrew Meadows
b5e7c30178 merge 2014-04-11 16:00:34 -07:00
Andrew Meadows
017d410c48 merge upstream/master -> andrew/avatar-interaction 2014-04-11 15:59:48 -07:00
Andrzej Kapolka
fe7a359545 Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624. 2014-04-11 15:55:48 -07:00
Andrew Meadows
508d4f216d fix #2656 avatar jumps very far away 
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule.  The
penetration against such a shape could be arbitrarily large.
 2014-04-11 15:55:18 -07:00
Andrew Meadows
5ac7be8945 merge upstream/master -> andrew/inertia 2014-04-11 12:20:00 -07:00
Philip Rosedale
d3b43a9a89 Merge pull request #2653 from ey6es/master 
In addition to pushing the camera back to avoid intersecting, also narrow the field of view.
 2014-04-11 12:11:36 -07:00
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
Atlante45
18b364d9d9 Removed QResources from Interface 2014-04-11 11:57:25 -07:00
Stephen Birarda
1cd5fec71c push packet version for assignments 2014-04-11 11:42:33 -07:00
Andrzej Kapolka
d6534d6026 Tweak to zoom on pushback. 2014-04-11 11:10:22 -07:00
Stephen Birarda
6431d35f86 add a missing newline to DomainHandler 2014-04-11 10:19:31 -07:00
Andrzej Kapolka
b7725f094d Trying the narrowing effect with pushback for other avatars. 2014-04-11 10:19:16 -07:00