Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 22:42:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10978 commits 6 branches 1 tag 1.1 GiB
Commit graph

10978 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
a1fe41fc1d repair a conflicted translation file 2014-03-17 10:10:26 -07:00
Atlante45
3cd4761fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-17 10:10:00 -07:00
Stephen Birarda
8228d70248 resolve conflicts on merge with upstream master 2014-03-17 10:09:01 -07:00
Stephen Birarda
5182ab1904 Merge pull request #2332 from birarda/master 
BUILD.md changes to reduce confusino
 2014-03-17 10:06:32 -07:00
Stephen Birarda
2478c995f2 clarifications to BUILD to remove confusing instructions, closes #2327 2014-03-17 10:05:44 -07:00
Stephen Birarda
05d6522279 more MMX optimizations to AudioMixer for delayed samples 2014-03-17 10:02:00 -07:00
Brad Hefta-Gaub
4a65449763 Merge pull request #2330 from birarda/domain-break 
fix for domain-server packets > MTU
 2014-03-17 09:51:19 -07:00
Stephen Birarda
f652df9399 break on MTU size packets from domain-list, closes #2312 2014-03-17 09:19:05 -07:00
ZappoMan
f8e38382a8 Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-16 19:37:41 -07:00
Andrzej Kapolka
95410d2b66 Cleaned up the preprocessor definitions. 2014-03-16 18:04:37 -07:00
Andrzej Kapolka
b21247ca67 Optional hash/full metadata streaming for QObjects. 2014-03-16 17:29:30 -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
7d7e1ff28a one more crack at this signedness comparisons on unix 2014-03-15 23:37:52 -07:00
ZappoMan
5709a8893e more unix signedness warnings 2014-03-15 23:19:16 -07:00
ZappoMan
08d89a4565 arg windows signedness warnings 2014-03-15 23:17:03 -07:00
Brad Hefta-Gaub
c24abb644d Merge pull request #2296 from stojce/19495 
Code Review for Job #19495
 2014-03-15 23:06:33 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
777e306d09 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 22:36:53 -07:00
ZappoMan
851764a705 more warning fixes 2014-03-15 22:36:43 -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
Atlante45
2567c4d4e1 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-15 18:55:12 -07:00
stojce
19e60a1fc0 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
ZappoMan
61a905961e darnit I hate casts.. 2014-03-14 22:48:32 -07:00
ZappoMan
0200ac9da8 more unix warnings fixes 2014-03-14 22:43:31 -07:00
Brad Hefta-Gaub
1f77505871 more unix warnings cleanup 2014-03-14 18:35:34 -07:00
Andrzej Kapolka
35f57cb998 Working on streaming metadata. 2014-03-14 18:22:56 -07:00
Brad Hefta-Gaub
c6f8d34ded fix unix warning 2014-03-14 18:16:38 -07:00
Brad Hefta-Gaub
c0ee3fa1f0 fix unix warning 2014-03-14 18:14:54 -07:00
Brad Hefta-Gaub
2766860b52 fix some windows warnings in fsbinarystream.cpp 2014-03-14 18:11:22 -07:00
Brad Hefta-Gaub
0e7e337807 fixed uninitialized variable warning 2014-03-14 18:05:40 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
Philip Rosedale
2b7cc43172 Merge pull request #2323 from ZappoMan/throttlerenderingtweaks 
make throttle rendering not adjust LOD
 2014-03-14 17:50:52 -07:00
Atlante45
f07725d017 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-14 17:47:39 -07:00
Brad Hefta-Gaub
c958ae8cfb fix LocalVoxelsOverlay types to match 2014-03-14 17:47:19 -07:00
Brad Hefta-Gaub
711e6ca3f5 clean up casts and types to fix warnings in a cleaner way 2014-03-14 17:43:55 -07:00
Atlante45
a88872a21f Simple class to download files (sync/async) 2014-03-14 17:41:22 -07:00
Andrzej Kapolka
ee084d1afd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-14 17:31:21 -07:00
Brad Hefta-Gaub
6588002c8b Merge pull request #2317 from ey6es/master 
Return the legs to the default position when we stop "crazylegs."
 2014-03-14 17:25:56 -07:00
Brad Hefta-Gaub
aa2536c551 Merge pull request #2322 from PhilipRosedale/master 
Fix magic number in idle FPS, adding skeet to gun.js
 2014-03-14 17:25:36 -07:00
Brad Hefta-Gaub
a5eb5d6515 handle minimize case 2014-03-14 17:22:35 -07:00
Brad Hefta-Gaub
2a03cf1bab make throttle rendering not adjust LOD 2014-03-14 17:17:38 -07:00
Philip Rosedale
3e1bf7fbb8 Add variable name for throttled frame rate, change to multiple of 60FPS 2014-03-14 17:09:09 -07:00
Andrzej Kapolka
c9adfb92ed Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-14 17:07:06 -07:00
Philip Rosedale
ab05e4ba69 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-14 16:45:59 -07:00