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

10742 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Andrzej Kapolka
5f7e41b79b More dock widget tweaks. 2014-03-14 10:55:27 -07:00
Andrzej Kapolka
a7d35944cc Use an inner widget for the dock. 2014-03-14 10:48:57 -07:00
Andrzej Kapolka
b721533f0b Make chat a dock widget, since that's the behavior it's emulating anyway 
(and for some reason, the current strategy causes a problem on at least Ryan's
and my machine).
 2014-03-14 10:43:12 -07:00
Brad Hefta-Gaub
2f13d1e30c Merge pull request #2305 from ey6es/master 
Avatar performance improvements, toggle for Visage (and code to allow it to play nice with Faceshift).  Closes #2300.
 2014-03-13 21:17:27 -07:00
Andrzej Kapolka
3f78ef40f1 Fixed the translation file. 2014-03-13 17:08:23 -07:00
Andrzej Kapolka
38d03febbc Add this file back. Hope it didn't have anything important! 2014-03-13 16:58:15 -07:00
Andrzej Kapolka
95e59d7004 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.h
 2014-03-13 16:56:06 -07:00
Andrzej Kapolka
5f6f4b3d37 Fixes required since enabling Faceshift is now the default. 2014-03-13 16:45:27 -07:00
Brad Hefta-Gaub
89a6ecd1c1 Merge pull request #2301 from Geenz/19514 
Code Review for Job #19514
 2014-03-13 16:31:06 -07:00
Stephen Birarda
c9c76ca30f Merge pull request #2303 from ddobrev/xmppchat 
Moved the chat from a window to a built-in panel
 2014-03-13 16:30:44 -07:00
Andrzej Kapolka
92bc675c97 Make sure to stop Visage before deleting it. 2014-03-13 16:21:45 -07:00
Andrzej Kapolka
9d1278b663 Wait until we know that Faceshift didn't connect before we attempt to 
initialize Visage.
 2014-03-13 16:18:47 -07:00
Dimitar Dobrev
85a15a2284 Moved the chat from a window to a built-in panel. 2014-03-14 01:12:25 +02:00
Geenz
55d0835ba1 Indentation! 2014-03-13 19:08:18 -04:00
Dimitar Dobrev
881ecb07cd Changed the font of the entire chat window to Helvetica/Arial. 2014-03-14 01:07:21 +02:00
Geenz
b34921ea6d Merge branch 'master' of https://github.com/Geenz/hifi into 19514 2014-03-13 18:55:36 -04:00
Geenz
4523ae742e Tweak in code styling per Brad’s feedback, along with using SIGNAL and SLOT instead of function pointers directly. 2014-03-13 18:51:14 -04:00
Stephen Birarda
1303c19498 Merge pull request #2302 from Atlante45/avatar_uploader 
Avatar uploader
 2014-03-13 15:42:27 -07:00
Andrzej Kapolka
007bfa8866 Tweak to Visage toggle. 2014-03-13 15:26:07 -07:00