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

10801 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
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
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
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
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
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
Philip Rosedale
2b7cc43172 Merge pull request #2323 from ZappoMan/throttlerenderingtweaks 
make throttle rendering not adjust LOD
 2014-03-14 17:50:52 -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
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
Philip Rosedale
ab05e4ba69 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-14 16:45:59 -07:00
Philip Rosedale
8968cf4af3 Merge pull request #2320 from Geenz/master 
Fix the "ringing" issue when we're throttling the frame rate.
 2014-03-14 16:45:35 -07:00
Geenz
fe124f5c03 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-14 19:38:32 -04:00
Geenz
d02f0ba687 Fix for the “ringing” issue. Don’t let Qt handle our buffer swaps. Handle the swaps ourselves. 2014-03-14 19:38:17 -04:00
Andrzej Kapolka
4ca7e873f6 Merge pull request #2319 from AndrewMeadows/warnings 
removing a few compile warnings
 2014-03-14 16:23:35 -07:00
Andrew Meadows
ab84526a1b removing compile warnings 2014-03-14 16:12:32 -07:00
Andrzej Kapolka
d9c1a47de8 Merge pull request #2316 from AndrewMeadows/hands 
remove stretchy arms
 2014-03-14 15:50:48 -07:00
Andrzej Kapolka
608fa5869d Return the legs to the default position when we stop the script. 2014-03-14 14:51:33 -07:00
Philip Rosedale
85cc04f172 merge with upstream/master 2014-03-14 14:35:48 -07:00
Andrew Meadows
d4c7e25f8e Merge branch upstream/master into "hands" project 2014-03-14 14:28:50 -07:00
Andrzej Kapolka
37ae5142a6 Merge pull request #2315 from ZappoMan/fix_lookWithTouch_and_more 
fix JS radians vs degrees issues
 2014-03-14 14:13:25 -07:00
Brad Hefta-Gaub
8d3da1ba70 Merge pull request #2311 from ey6es/master 
Make the chat window a Qt dock widget; that seems to be what it was trying to emulate.  This fixes the issue on startup that Ryan and I experienced.
 2014-03-14 13:05:16 -07:00
Brad Hefta-Gaub
8f200e917b fix JS radians vs degrees issues 2014-03-14 13:03:14 -07:00
stojce
576b8acef3 CR fixes 2014-03-14 20:09:03 +01:00
Andrzej Kapolka
4366b45445 Changed orientation tweak names, restore tweaked orientation rather than 
primary one.  Closes #2310.
 2014-03-14 11:13:15 -07:00
Andrew Meadows
a045a87cca Remove arm stretching, add sixense calibration 2014-03-14 11:11:00 -07:00