Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10950 commits 76 branches 59 tags 1.2 GiB
Commit graph

5902 commits

Author SHA1 Message Date
Andrzej Kapolka
20ae5c15f7 Added a "flat" mode for environments that makes them follow you around on the 
X/Z axes.  The default environment is flat.  Closes #2378.
 2014-03-20 12:09:20 -07:00
Andrzej Kapolka
3bd8cddc31 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-20 11:19:05 -07:00
Andrzej Kapolka
f92f45df63 Keep track of keys pressed, synthesize release events when focus is lost. 
Closes #2375.
 2014-03-20 11:17:36 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing 
Model browsing
 2014-03-20 11:15:35 -07:00
Philip Rosedale
f2793d74ad Merge pull request #2391 from ey6es/master 
Remove file texture loading (since we can just use file URLs), don't add...
 2014-03-19 16:55:02 -07:00
Andrzej Kapolka
418fc9f69c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-19 16:52:46 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling 
Voxel Server Performance Improvements
 2014-03-19 16:24:47 -07:00
Andrzej Kapolka
e34f2ca69b Remove file texture loading (since we can just use file URLs), don't add alpha 
channels for opaque textures (and note when textures with alpha channels are
entirely opaque), enforce a maximum texture size of 1024 by 1024.
 2014-03-19 16:11:15 -07:00
Philip Rosedale
a1e07374d4 Merge pull request #2369 from ey6es/master 
Perform blending in worker threads and only do it when we have new data.  Removed some unused code and fixed a couple warnings.
 2014-03-19 08:59:20 -07:00
Atlante45
a80f81c246 typo 2014-03-18 17:48:17 -07:00
Atlante45
76c2a9fdad Modified Browser to be able to dowload all the fst file when there are more than 1000 2014-03-18 17:36:05 -07:00
Andrzej Kapolka
0fc0d50bda Only post the blender if we have blendable meshes to blend. 2014-03-18 17:19:42 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually 
received new data.  Closes #2075.  Closes #2348.
 2014-03-18 16:38:05 -07:00
Ryan
07497ea4f7 removing fly to voxel option 2014-03-18 15:35:25 -07:00
Atlante45
1e2dabfd5e Changed addresses to new models locations 2014-03-18 15:09:54 -07:00
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -07:00
Atlante45
0a80f8fcd6 Added browse buttons in the menu 2014-03-18 13:59:08 -07:00
Atlante45
388f8d480a Added the model browser 2014-03-18 13:58:23 -07:00
Andrzej Kapolka
137cbe2cf4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 13:58:11 -07:00
Andrzej Kapolka
299dbb93ea Removed "springiness" bits. 2014-03-18 13:57:36 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup 
Don't send redundant avatar hand/head data, and cleanup.
 2014-03-18 13:57:30 -07:00
Andrzej Kapolka
5c7d8e7c70 Merge pull request #2351 from AndrewMeadows/warnings 
removal of more compilation warnings
 2014-03-18 13:54:17 -07:00
Andrzej Kapolka
8413a3cacd Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 13:41:43 -07:00
Stephen Birarda
db25ae8865 remove extra debug 2014-03-18 12:27:45 -07:00
Stephen Birarda
201117c343 Merge branch 'master' of https://github.com/highfidelity/hifi into orientation-fix 2014-03-18 12:26:51 -07:00
Stephen Birarda
c7c51c7504 remove orientation string debug 2014-03-18 12:05:32 -07:00
Stephen Birarda
05e2bb8022 keep storing degrees in data-web but convert on receipt 2014-03-18 12:04:03 -07:00
Stephen Birarda
1d944ac829 reset orientation to identity with spacebar, fix orientation storing 2014-03-18 12:02:12 -07:00
Stephen Birarda
c8d3cd2a1b fix go to orientation to not put the user sideways 2014-03-18 11:55:11 -07:00
Andrew Meadows
9079c3ecd8 explicit casts to remove warnings 2014-03-18 10:41:14 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrzej Kapolka
f2cc227331 Ryan's requested change for rotation smoothing. 2014-03-18 10:17:32 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrzej Kapolka
d80f110961 Prevent audio average from becoming less than zero (thus causing sqrt to 
return nan, thus making our fake blendshape coefficient nan, thus making the
jaw disappear).  Closes #2334.
 2014-03-18 09:12:23 -07:00
Andrew Meadows
75ab970c0d fix bug: bad offset into avatar data during decode 2014-03-17 18:23:09 -07:00
Stephen Birarda
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
Stephen Birarda
9f24bd9c47 have the AudioMixer handle silent audio, send silence from Interface when gate closed 2014-03-17 15:12:02 -07:00
Andrew Meadows
ed3cf36045 cleanup: AvatarData doesn't derive from NodeData 
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
 2014-03-17 14:10:42 -07:00
ZappoMan
aab2ca826f Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:01:25 -07:00
ZappoMan
a448b90726 fix some Q_OBJECT macros in class headers 2014-03-17 10:57:39 -07:00
Andrew Meadows
c329cebf92 Merge upstream/master into "no-hands" project 2014-03-17 10:48:26 -07:00
Andrew Meadows
68ba2201df cleanup of Avatar:: and MyAvatar::render() 
MyAvatar now calls Avatar::render() which does most of the work.
Also, made ::renderBody() a proper virtual function
 2014-03-17 10:22:02 -07:00
AndrewMeadows
da58a2f4cd Merge pull request #2324 from ZappoMan/warningsfixes 
Warning Fixes for Windows and Unix
 2014-03-17 10:13:56 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
777e306d09 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 22:36:53 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Brad Hefta-Gaub
2567e296e1 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 21:31:16 -07:00
Brad Hefta-Gaub
4a6cc99be6 slightly different approach to windows warning fix 2014-03-15 21:30:45 -07:00
stojce
19e60a1fc0 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
ZappoMan
0200ac9da8 more unix warnings fixes 2014-03-14 22:43:31 -07:00