Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-15 20:50:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10754 commits 6 branches 1 tag 1.1 GiB
Commit graph

10754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
6d14ad6ab5 Missed a spot. 2014-03-17 15:13:14 -07:00
Andrzej Kapolka
d8b83fd308 More work on version-resilient type streaming. 2014-03-17 15:12:43 -07:00
Andrzej Kapolka
61660f890e Working on metadata for metatypes. 2014-03-17 11:39:16 -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
Andrzej Kapolka
35f57cb998 Working on streaming metadata. 2014-03-14 18:22:56 -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
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
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
fe3a3dc1b7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-14 16:23:46 -07: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
ca95caebdc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-14 15:51:16 -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
612a83245c Updated translations. 2014-03-14 15:18:51 -07:00
Andrzej Kapolka
5aea9a670e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-14 15:17:39 -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
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
Philip Rosedale
88a0aa4221 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-13 21:37:40 -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