Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 03:56:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12225 commits 25 branches 0 tags 1.1 GiB
Commit graph

6501 commits

Author SHA1 Message Date
matsukaze
7542917922 Fix tab with space. 2014-04-02 14:22:17 -07:00
matsukaze
94a23b7ffc Fix brace location and replace tab with space. 2014-04-02 14:15:20 -07:00
matsukaze
952ca928f1 More audio fixes. Fix audio buffer size on Win. 2014-04-02 12:28:22 -07:00
Philip Rosedale
e53bfe4ea1 Merge pull request #2585 from ey6es/master 
Align forearms with wrists again, fix for annoying intermittent seg fault on Linux exit.
 2014-04-01 20:59:51 -07:00
Andrew Meadows
515593e41c modify avatar thrust during collisions 2014-04-01 17:25:26 -07:00
Philip Rosedale
0b792985d3 Tweaks to VU meter, tone injector, and fix to noise gate 2014-04-01 16:43:18 -07:00
Andrzej Kapolka
865ca7de20 Align forearms with wrists. Closes #2577. 2014-04-01 16:01:29 -07:00
matsukaze
c3934d9e86 Fix heap corruption. 2014-04-01 15:49:08 -07:00
Philip Rosedale
36c41a1fd3 test other way of doing loudness 2014-04-01 15:35:46 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Andrew Meadows
b65855a384 merge upstream/master into avatar-interaction 2014-04-01 12:53:47 -07:00
Andrew Meadows
59bba99c6f Resolve body-body collisions with other avatars 2014-04-01 12:48:17 -07:00
Atlante45
f87c82450a Modified dialog default size 2014-04-01 12:20:08 -07:00
Atlante45
bdd5c291b0 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -07:00
Andrew Meadows
3d43956c11 bounding shape relative to model's root Joint 2014-04-01 11:39:40 -07:00
Andrew Meadows
9f9127b716 draw head bounding shape first 2014-04-01 11:39:24 -07:00
Andrzej Kapolka
fb37ef5bca Fix for annoying intermittent seg fault on Linux exit. Closes #2542. 2014-04-01 11:25:39 -07:00
Andrzej Kapolka
afb5711879 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-01 10:40:38 -07:00
Andrew Meadows
03d04e194d Init bounding Extents for more correct shapes 2014-04-01 10:39:58 -07:00
AndrewMeadows
f12da05722 Merge pull request #2581 from Atlante45/more_upload_fixes 
More upload fixes
 2014-04-01 09:51:25 -07:00
AndrewMeadows
ff211dbc2b Merge pull request #2573 from PhilipRosedale/master 
Audio VU level meter to replace scope
 2014-04-01 09:41:39 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model 
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
 2014-04-01 09:25:25 -07:00
Philip Rosedale
7d12fcee9d 220Hz tone injection option for easier audio quality checks 2014-03-31 21:55:29 -07:00
James Brotchie
19b8f101d8 Improved hifi:// style URL scheme handling. 
First steps towards implementing #1463.

 - Moved url parsing code from Application::event to
   Menu::goTo(QString).
 - Handle destination component of URL as either a @username,
   #place, or x-xx,y-yy,z-zz style coordinate.
 - Added support for entering hifi:// style URL into @ invoked
   goto menu option.
 2014-04-01 11:31:43 +10:00
Philip Rosedale
81d1eb7ed2 removed unused procedural movement code 2014-03-31 18:24:58 -07:00
Andrzej Kapolka
929f08dec2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-31 18:22:43 -07:00
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -07:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00
James Brotchie
da116608a0 Hitting enter no longer shows chat window when chat is disabled. 
When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
 2014-04-01 07:38:22 +10:00
Stephen Birarda
dc38b27485 using GnuTLS read self-signed key and cert on DS load 2014-03-31 12:31:34 -07:00
Philip Rosedale
3babb5e0bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-31 07:25:46 -07:00
James Brotchie
6880160bc0 Remember most recently opened script location. 
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
 2014-03-31 22:08:38 +10:00
Philip Rosedale
27f0214032 first pass audio VU scope 2014-03-28 23:09:51 -07:00
Philip Rosedale
78ee8706d6 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-28 16:48:15 -07:00
Stephen Birarda
89aeb034d1 add find module for QCA and link to interface and DS 2014-03-28 15:22:44 -07:00
Andrzej Kapolka
176d8f746e Finally at the point of actually getting spanners to turn into voxels. 2014-03-28 15:19:40 -07:00
Andrzej Kapolka
78896d6af9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 13:29:11 -07:00
Dimitar Dobrev
f9cee2ccfa Fixed a typo that resulted in a wrong padding of a widget. 2014-03-28 22:21:55 +02:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Andrew Meadows
5406490719 rename _shapes -> _jointShapes 
also stubbed Model::createBoundingShape()
 2014-03-28 11:00:30 -07:00
Dimitar Dobrev
9b43508098 Restored code that Git had somehow deleted. 2014-03-28 19:26:16 +02:00
Dimitar Dobrev
6fd1bf7edb Simplified the new goToUser function. 2014-03-28 18:44:06 +02:00
Dimitar Dobrev
3907c563df Put the chat window above the 3D view and animated its showing. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
4374e28e9c Changed the highlighting of own messages to occupy the whole row. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413 Changed the dock widget for the chat so that it replicates the agreed 
upon design.
 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
5073439007 Highlighted the user's own chat messages. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
d764ef79ed Gave more space to the user in sent messages so that resizing of the 
column for messages occurs for really long user names.
 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
a48ca65236 Enabled going to the clicked user in the chat. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
65f912249d Moved user names in the char 1 pixel to the bottom. 2014-03-28 18:36:52 +02:00
Stephen Birarda
3c8aa90ae0 Merge pull request #2559 from AndrewMeadows/avatar-interaction-2 
split lean input from lean perturbations
 2014-03-28 09:25:36 -07:00
Stephen Birarda
be5888e692 Merge pull request #2549 from AndrewMeadows/avatar-interaction 
name changes to get rid of "tweaked" angles in Head code
 2014-03-28 09:19:45 -07:00
Stephen Birarda
7b840f760c Merge pull request #2538 from AndrewMeadows/enforce-standard 
making some type casts abide by coding standard
 2014-03-28 09:19:16 -07:00
Andrzej Kapolka
d3fe6f21ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-27 17:03:24 -07:00
Andrzej Kapolka
361276d133 Use a spherical estimate of the shadowed region to avoid growing and shrinking 
it as we turn around.  Also, might as well render shadows for the billboards.
 2014-03-27 16:19:21 -07:00
Andrzej Kapolka
aee15e0496 Don't render display name/chat message for own avatar in first person mode. 2014-03-27 15:38:21 -07:00
Andrew Meadows
796d20168e splitting lean input from lean perturbations 2014-03-27 15:30:30 -07:00
Philip Rosedale
c8cacf75f3 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-27 15:16:11 -07:00
Philip Rosedale
41e9017953 more audio level meter work, improved gun 2014-03-27 15:14:38 -07:00
Andrzej Kapolka
077df3906f Make sure we reset our LOD adjustments before we switch back from throttling 
the renderer.
 2014-03-27 15:02:26 -07:00
Andrzej Kapolka
eab4b4bc5d Make sure we process the model root nodes in alphabetic order. 2014-03-27 14:47:46 -07:00
Andrzej Kapolka
9078d9a0f2 Fix for avatar LOD's getting into a degenerate state. Don't persist the 
avatar LOD, since we adjust it more rapidly.
 2014-03-27 14:14:31 -07:00
stojce
2523267269 i18n file updates 2014-03-27 22:02:45 +01:00
stojce
07282b462d Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.cpp
 2014-03-27 21:54:29 +01:00
stojce
8b6db350da Switched to QDockWidget 2014-03-27 21:50:41 +01:00
Andrzej Kapolka
563725e781 Use the "correct" shadow strategy: include only ambient term when in shadow. 2014-03-27 13:44:34 -07:00
Andrzej Kapolka
7cc7230745 Adjust the shadow shader to prevent seeing shadows on the opposite sides of 
objects.  Closes #2544.
 2014-03-27 13:18:45 -07:00
Andrew Meadows
a978f533e1 update a comment 2014-03-27 11:24:03 -07:00
Andrew Meadows
7949be0319 PitchTweak and friends become DeltaPitch 2014-03-27 11:14:26 -07:00
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a 
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
 2014-03-27 11:08:55 -07:00
Andrew Meadows
c354e980a8 getTweakedOrientation() to getFinalOrientation() 2014-03-27 11:03:42 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard 
Conflicts:
	interface/src/avatar/Hand.cpp
 2014-03-27 10:53:54 -07:00
Andrew Meadows
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00
Atlante45
11f40258b3 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-27 10:12:34 -07:00
Philip Rosedale
101de1e0e5 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 23:24:44 -07:00
Philip Rosedale
56492e3ac8 Merge pull request #2536 from ey6es/master 
Provide a simple means of tracking download progress, increase speed at which we adjust avatar LOD.
 2014-03-26 23:23:27 -07:00
Philip Rosedale
7d168b5b1f Merge pull request #2537 from ZappoMan/bugfixes 
some windows bug fixes
 2014-03-26 23:22:06 -07:00
Philip Rosedale
ff8d154412 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 22:38:35 -07:00
Andrzej Kapolka
f339a3c0d7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 18:30:23 -07:00
Andrzej Kapolka
7f3977578e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 18:30:06 -07:00
Stephen Birarda
206096465b Merge branch 'master' of https://github.com/highfidelity/hifi into flock-bots 2014-03-26 17:46:48 -07:00
Stephen Birarda
7eab276122 suppress debug in ScriptEngine, fix spatialization from FS head changes 2014-03-26 17:19:23 -07:00
Stephen Birarda
87cbe9a1f4 Merge pull request #2524 from AndrewMeadows/shapes 
avatar responds to hand-vs-head collisions again
 2014-03-26 17:10:43 -07:00
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Brad Hefta-Gaub
0435b16668 fix formatting 2014-03-26 16:52:24 -07:00
ZappoMan
11c089c221 add support for getting the actual default audio devices in windows by name 2014-03-26 16:48:57 -07:00
Andrzej Kapolka
26da3bcefd Bump up the rate at which we increase detail. 2014-03-26 16:28:03 -07:00
Andrzej Kapolka
1cae0dc94c Adjust avatar LOD faster. Closes #2496. 2014-03-26 16:01:07 -07:00
Andrzej Kapolka
52c8a865f1 Provide a means of tracking resource download progress. Until we have a 
user-friendly progress meter/throbber, put the download progress in the
extended stats.
 2014-03-26 15:53:19 -07:00
Brad Hefta-Gaub
411ebf805a use InvokeMethod() for all menu scripting operations 2014-03-26 15:42:53 -07:00
Brad Hefta-Gaub
2257afd390 removed unneeded call to disconnect() 2014-03-26 15:20:27 -07:00
Atlante45
718b8f7eb9 Changed back to upload either head or skeleton 2014-03-26 15:07:19 -07:00
Andrew Meadows
63c4af8950 remove cruft: Head::applyCollision() 2014-03-26 14:10:43 -07:00
Andrew Meadows
7a649084bd reduce the lean recovery timescale 2014-03-26 14:07:21 -07:00
Andrew Meadows
9a4db152ff avatar responds to hand-vs-head collisions again 2014-03-26 13:20:18 -07:00
Andrzej Kapolka
99704aee94 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 13:06:37 -07:00
Andrzej Kapolka
97b895be16 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 12:43:33 -07:00
Andrzej Kapolka
c18d0ccf8f Formatting fixes. 2014-03-26 12:34:46 -07:00
Andrzej Kapolka
c31b04af4c Fix for Windows initial device selection. 2014-03-26 12:23:08 -07:00
Philip Rosedale
caed600817 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 12:14:12 -07:00
Andrzej Kapolka
b88708a991 Added mono to stereo conversion to fix Linux audio. Closes #2508. 2014-03-26 11:01:58 -07:00
Philip Rosedale
d90244c01e first pass, clipping audio meter 2014-03-25 22:31:44 -07:00
Andrzej Kapolka
5934a7fbea Working on voxelizing spanners. 2014-03-25 20:41:19 -07:00
stojce
22a8693b89 Overlay behaviour 2014-03-26 00:05:11 +01:00
Andrew Meadows
fff7a36b54 merge upstream/master into physics project 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
 2014-03-25 15:55:26 -07:00
Andrew Meadows
d90b325b1c Add penetration resolution helper for Hand class 2014-03-25 15:31:46 -07:00
stojce
547f33f4d6 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-25 22:15:52 +01:00
Philip Rosedale
ec3a83820e Merge pull request #2488 from birarda/avatar-scaling 
avatar-mixer tuning for identity and billboard packets
 2014-03-25 11:46:25 -07:00
Stephen Birarda
8a796be785 only fade avatars if they have ever been initialized 2014-03-25 11:10:28 -07:00
AndrewMeadows
5551396a7b Merge pull request #2480 from ZappoMan/scripting_improvements 
Scripting improvements
 2014-03-25 10:49:14 -07:00
Lucas Crisman
c78bcc6d2f Merge branch 'master' of git://github.com/worklist/hifi into 19498 2014-03-25 14:45:08 -03:00
Stephen Birarda
f763859fd0 don't attempt to render avatars until they are initialized 2014-03-25 10:44:52 -07:00
Lucas Crisman
8ed30d9da2 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-03-25 14:43:40 -03:00
Brad Hefta-Gaub
7dce4fdf19 Merge pull request #2484 from AndrewMeadows/sanity-checking 
Sanity check AvatarData packets as they are unpacked
 2014-03-25 10:26:37 -07:00
Andrew Meadows
c0177e80a7 use glm::isnan() everywhere for portable code 2014-03-25 09:56:15 -07:00
ZappoMan
f10d5e23f8 set firstRun so it only happens once 2014-03-25 00:57:29 -07:00
ZappoMan
571ecf0964 add first cut at firstrun support 2014-03-25 00:45:31 -07:00
ZappoMan
c34b64e296 add load script from URL support 2014-03-25 00:17:19 -07:00
Andrzej Kapolka
81ae18a3bf Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 17:25:34 -07:00
Andrzej Kapolka
21728dc604 Merge pull request #2474 from ZappoMan/js_prefs 
Add a JS example for selecting the input/output audio devices from a menu
 2014-03-24 17:21:08 -07:00
Andrzej Kapolka
47f0af818a Adjust avatar LOD more aggressively: raise detail slowly when above our target 
window, lower it in proportion to the ratio between desired and actual rates.
 2014-03-24 16:45:44 -07:00
ZappoMan
778209ffe4 fix bug in Menu.removeMenu() for trees of menus 2014-03-24 16:28:07 -07:00
Andrzej Kapolka
d3618aa839 Yeesh, another translation update. 2014-03-24 15:11:14 -07:00
Andrzej Kapolka
7bc0c8eff0 Missed a spot. 2014-03-24 15:07:57 -07:00
Andrzej Kapolka
f1fd8175d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 14:53:00 -07:00
Andrzej Kapolka
210af25396 When rendering avatar shadows, check bounds against shadow frustum. Closes 2014-03-24 14:52:02 -07:00
matsukaze
0f147871f4 Merge remote-tracking branch 'upstream/master' 2014-03-24 16:41:19 -04:00
Andrzej Kapolka
62884f1f4f Don't use textures/fancy shaders when rendering shadow map. Closes #2270. 2014-03-24 13:15:03 -07:00
ZappoMan
da763671fa fix crash when no output audio device selected, add get/set volume support for input devices 2014-03-24 12:52:34 -07:00
Lucas Crisman
9af1ddb37a Stats: fix for stats panels positioning when mirror is enabled 2014-03-24 15:27:17 -03:00
Lucas Crisman
e545c2ac65 Stats tweaks: fonts adjustments 2014-03-24 14:57:40 -03:00
ZappoMan
7ef1fe3a74 add support for listing all audio devices and default device in JS 2014-03-24 09:15:03 -07:00
ZappoMan
82d620b1d9 add support for AudioDevice scripting interface, and switching audio input/output device on the fly 2014-03-23 11:26:27 -07:00
stojce
32502d7b0d layout improvements 2014-03-23 16:20:29 +01:00
stojce
7c36c4a2b7 Layout fixes 2014-03-23 13:20:24 +01:00
ZappoMan
938959a9f6 expose application settings to JS 2014-03-22 21:20:35 -07:00
ZappoMan
b7243b0bfe more cleanup 2014-03-22 20:42:34 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
stojce
beb8fb5cc7 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-22 10:19:30 +01:00
ZappoMan
c70bbda10a kill local voxels on domain change 2014-03-21 18:16:28 -07:00
Brad Hefta-Gaub
5abe044c30 Merge pull request #2412 from AndrewMeadows/emergency-fixes 
datalength sanity checking for AvatarData packet
 2014-03-21 14:48:07 -07:00
stojce
3eb64f5b29 updated interface_en.ts file 2014-03-21 22:45:15 +01:00
stojce
aaa5e15035 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	assignment-client/src/audio/AudioMixerClientData.cpp
	interface/interface_en.ts
	interface/src/Menu.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-03-21 22:35:57 +01:00
stojce
9077a05f9d - Layout fix 
- Model browsers
- merge
 2014-03-21 22:34:10 +01:00
Andrzej Kapolka
5b3340ce49 Add Ryan's updated smoothing factors. 2014-03-21 10:38:29 -07:00
Lucas Crisman
5fe59acb87 Stats variable width for panels 2014-03-21 14:10:00 -03:00
Philip Rosedale
b49058ea77 Merge pull request #2402 from Atlante45/inspect_js 
Inspect js
 2014-03-20 17:21:21 -07:00
Andrew Meadows
22aa9b075d datalength sanity checking for AvatarData packet 2014-03-20 16:52:40 -07:00
Atlante45
746d109025 Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 16:10:33 -07:00
Atlante45
c8d81e1ed6 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload 2014-03-20 15:32:26 -07:00
Andrzej Kapolka
56ff423cf5 Let's actually use the result of our format conversion. 2014-03-20 14:27:38 -07:00
Atlante45
a908c23f61 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload 2014-03-20 13:58:44 -07:00
Atlante45
e68500e11f Made models line edit editable 2014-03-20 12:49:51 -07:00
Atlante45
c658b1dded Modified menu upload categories 2014-03-20 12:45:19 -07:00
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Atlante45
39a6e03476 Modified MyAvatar to support more JS 2014-03-20 12:09:33 -07:00
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
stojce
b417851dde Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-20 12:10:53 +01:00
matsukaze
1244613b68 Merge remote-tracking branch 'upstream/master' 2014-03-19 22:46:19 -04: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
Atlante45
d239aecbfb Added names to signals argument 2014-03-19 10:17:28 -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
stojce
a0a6e537f0 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-19 14:21:48 +01: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
Andrew Meadows
4a1a7898ea Merge branch 'cleanup' into 'shapes' 2014-03-18 12:53:45 -07:00
Andrew Meadows
02c58447df merge upstream/master into "shapes" project 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	libraries/avatars/src/HandData.h
	libraries/shared/src/SharedUtil.h
 2014-03-18 12:41:20 -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
stojce
913783c0f1 resizing 
- fixed layout
 2014-03-16 22:47:03 +01:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
stojce
21b54fd07a Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.h
 2014-03-16 09:25:31 +01: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
ebd7dff4b9 QSpinBox, QDoubleSpinBox styling 2014-03-15 22:07:29 +01:00
stojce
19e60a1fc0 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
stojce
716979071c Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-15 19:35:34 +01:00
ZappoMan
0200ac9da8 more unix warnings fixes 2014-03-14 22:43:31 -07:00
Brad Hefta-Gaub
2766860b52 fix some windows warnings in fsbinarystream.cpp 2014-03-14 18:11:22 -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
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
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
stojce
4e2d3c9549 styling QSlider 2014-03-14 23:24:32 +01:00
Andrew Meadows
d4c7e25f8e Merge branch upstream/master into "hands" project 2014-03-14 14:28:50 -07:00
stojce
6d15fb548c Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-14 21:05:30 +01: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
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
stojce
4b182bb3e2 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-14 18:22:03 +01:00
stojce
72a92a16e6 Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	interface/interface_en.ts
 2014-03-14 01:52:53 +01:00
stojce
a29025a739 New layout 2014-03-14 01:51:22 +01: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
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
Andrzej Kapolka
007bfa8866 Tweak to Visage toggle. 2014-03-13 15:26:07 -07:00
Atlante45
423f26f669 Review comments 2014-03-13 15:26:02 -07:00
Andrzej Kapolka
fc32d9581d Visage toggle bits. 2014-03-13 15:17:16 -07:00
Atlante45
0748682119 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 15:04:49 -07:00
Andrzej Kapolka
5b30f932c1 Fix for slight graphical glitches on loading avatars. 2014-03-13 14:09:12 -07:00
Andrzej Kapolka
b4cb1457a2 Do a simple frustum check for rendering the avatar or doing a full joint 
update.  Closes #2071.
 2014-03-13 13:29:18 -07:00
Andrzej Kapolka
43feef3ebd Only update the full set of joints when we've received new data from the 
mixer.  Closes #2274.
 2014-03-13 12:03:02 -07:00
Geenz
4d5b4081e1 Merge branch 'master' of https://github.com/Geenz/hifi into 19514 2014-03-13 14:40:10 -04:00
Andrzej Kapolka
b2a29cb84f Fixes for Linux build. 2014-03-13 10:56:19 -07:00
Atlante45
51585acd25 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 10:53:24 -07:00
stojce
939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/src/Menu.h
 2014-03-13 18:41:58 +01:00
Stephen Birarda
e8a6ab6831 Merge pull request #2297 from ddobrev/xmppchat 
Hid the chat window rather than close it in order to preserve sent messages.
 2014-03-13 09:40:23 -07:00
Geenz
f9be989a98 Merge branch 'master' of https://github.com/Geenz/hifi into 19514 2014-03-13 11:43:43 -04:00
Geenz
2e119fa0fe Skip rendering when we're minimized. 2014-03-13 11:41:15 -04:00
Dimitar Dobrev
442ca145da Hid the chat window rather than close it in order to preserve sent 
messages.
 2014-03-13 14:07:21 +02:00
stojce
be804e0f86 Fixes for linux build 2014-03-13 09:30:59 +01:00
stojce
e964b846de - url encoding for get requests 2014-03-13 08:03:23 +01:00
stojce
e231c8486b Using singleton for location manager 2014-03-13 07:47:33 +01:00
stojce
cd1ec97d28 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-13 07:42:31 +01:00
Brad Hefta-Gaub
cbe9480171 Merge pull request #2293 from ddobrev/xmppchat 
Changed the chat window to a popup with a custom closing button.
 2014-03-12 20:15:29 -07:00
Dimitar Dobrev
727903b216 Changed the chat window to a popup with a custom closing button. 2014-03-13 04:07:33 +02:00
Brad Hefta-Gaub
79b1465cb0 Merge pull request #2275 from Atlante45/editVoxels 
Edit voxels
 2014-03-12 18:52:55 -07:00
Geenz
d580f177a3 Refactor if..else into a switch. 
Also support the hidden and suspended states.
 2014-03-12 21:17:54 -04:00
Geenz
292f37154b Use the applicationStateChanged signal. 2014-03-12 21:08:55 -04:00
Geenz
e27af75ad2 Use QApplication::applicationState to detect if we're in the background. 
May want to expand upon this at some point; if we’re hidden we most
definitely *do not* want to render anything
 2014-03-12 20:49:58 -04:00
Geenz
9c61f12926 Support for an idle render time step. 
The basics of this is, if the application has changed its active state
then we only call paintGL every N milliseconds.  Currently the default
time step is 100 milliseconds.
 2014-03-12 19:10:26 -04:00
Dimitar Dobrev
6d4d61c38a Removed the double border between the sent messages and the entry. 2014-03-13 01:06:11 +02:00
Atlante45
424afaa36b Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-12 15:59:17 -07:00
Andrew Meadows
cd7da205de improved index sanity checking 2014-03-12 15:49:46 -07:00
Andrew Meadows
5e494d522d fixing signed/unsigned comparison 2014-03-12 15:49:17 -07:00
Andrzej Kapolka
9ad2ea9059 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 15:30:39 -07:00
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing 
Voxel/Particle Server Scaling Work
 2014-03-12 15:24:29 -07:00
stojce
e6ea51a8bd Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-12 23:11:55 +01:00
stojce
d92426c37d translation auto corrected 2014-03-12 23:11:44 +01:00
Andrzej Kapolka
ffe3717573 Enable back face culling on the opaque parts of avatars. 2014-03-12 15:10:33 -07:00
stojce
004e8e02d5 Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	interface/interface_en.ts
 2014-03-12 23:03:26 +01:00
stojce
fd201c450b Multiple destinations implementation 2014-03-12 23:02:21 +01:00
Andrzej Kapolka
bab74e9cd4 Push the distance back even more. 2014-03-12 15:01:09 -07:00
Andrzej Kapolka
889c1358fc Increase the distance at which avatars glow when moving. 2014-03-12 14:56:52 -07:00
Dimitar Dobrev
d67381d85e Changed the font used in the chat to Helvetica, with Arial as a 
fallback.
 2014-03-12 23:45:10 +02:00
Atlante45
728a5f6251 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-12 14:09:27 -07:00
Atlante45
5941ad0dd1 Changed lockForWrite() to lockForRead() 2014-03-12 14:08:23 -07:00
Andrzej Kapolka
f85f49caa6 Might as well update this. 2014-03-12 14:03:22 -07:00
Andrzej Kapolka
43ad9b4048 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 13:54:45 -07:00
Andrzej Kapolka
800be7eef4 One more degree conversion. 2014-03-12 13:38:16 -07:00
Dimitar Dobrev
6caf6b2c31 Filtered received messages, accepting only group ones. 2014-03-12 22:36:50 +02:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -07:00
Andrzej Kapolka
f1145272eb Signed/unsigned fix. 2014-03-12 12:29:01 -07:00
Atlante45
a2acdc01ab Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-12 12:21:56 -07:00
Atlante45
9402a5852c Fixed review comments 2014-03-12 12:20:43 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Andrew Meadows
e68241d2a9 using glm::degrees() instead of DEGREES_PER_RADIAN 2014-03-12 12:08:27 -07:00
Andrew Meadows
c3e8d51694 orientation stored in dataserver is in degrees 2014-03-12 12:06:59 -07:00
Atlante45
5cb9ea8402 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-12 11:49:20 -07:00
Atlante45
b9ee60ba41 FstReader not a member anymore 2014-03-12 11:47:47 -07:00
Atlante45
855f6fcf59 Moved Avatar upload to file Menu 2014-03-12 11:46:41 -07:00
AndrewMeadows
1f80a5a074 Merge pull request #2269 from ey6es/master 
Fix for white flashes when loading avatars, performance improvements.
 2014-03-12 11:43:13 -07:00
AndrewMeadows
0d38f1c320 Merge pull request #2260 from ey6es/metavoxels 
Yet another metavoxel checkpoint: work on streaming spanners, LOD/subdivision bits, etc.
 2014-03-12 11:34:59 -07:00
ZappoMan
4b60c549e7 add LOD to overlay display 2014-03-12 11:10:52 -07:00
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02:00
stojce
7afd6c3d0c Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	libraries/shared/src/AccountManager.h
 2014-03-12 18:54:59 +01:00
stojce
95d0128c74 Using new API client 2014-03-12 18:53:25 +01:00
Atlante45
1c4051b288 Added importBoundaries 2014-03-12 10:35:22 -07:00
Atlante45
5ccba0b080 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-12 10:27:27 -07:00
Dimitar Dobrev
acb4047b54 Increased the right margin of sent messages for better visibility. 2014-03-12 17:33:25 +02:00
ZappoMan
86feabee99 add last scene packets, bytes and pps 2014-03-12 02:22:24 -07:00
ZappoMan
7ce741762e Merge branch 'master' of https://github.com/worklist/hifi into server_scale_testing 2014-03-12 01:21:33 -07:00
ZappoMan
a95fd55172 suppress sending of extra queries when the client's view hasn't changed 2014-03-12 01:11:21 -07:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
Atlante45
72e1810df5 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-11 18:15:58 -07:00
Andrzej Kapolka
6c4223bcdf Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 18:12:12 -07:00
Atlante45
6fcb802a94 Added preview deplacement + fixed locking issue 2014-03-11 18:01:38 -07:00
Andrzej Kapolka
c21e18c220 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-11 17:35:52 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
bf9929e64d Since the bucky balls are showing up in the hot spots list when profiling, 
don't simulate them if they're disabled.
 2014-03-11 17:16:49 -07:00
Dimitar Dobrev
f427f524bf Patched the Qt CMake function for auto-translations so that *.ts files 
are not deleted on clean.
 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
52c8ccb698 Added a define to ensure the build works without qxmpp. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
fe2f9f5253 Prevented empty time stamps - when less then a minute has passed - from 
appearing.
 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
858e9fa7df Ensured sent chat messages are always wholly visible. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
ed90e45c96 Ensured messages are always aligned at the top to user names, and users 
onine are deleted.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
60bf473be7 Improved the adherence to code conventions after a code review. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
acb2793053 Ensured messages are sent to the group chat rather than to individual 
users.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
9eb217794c Added time stamps to the chat. Enabled translations. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
437cadf360 Added a basic version of the chat window. 2014-03-12 01:24:30 +02:00
ZappoMan
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
Dimitar Dobrev
1c2e752f3c Integrated QXmpp in the build system. 2014-03-12 01:16:10 +02:00
Clement
be6e7d0e97 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-11 16:03:43 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
Andrzej Kapolka
5bfe2c2ed5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-11 15:42:07 -07:00
Andrzej Kapolka
8d69eff867 Need to reorder includes due to HANDLE definition conflict. 2014-03-11 15:38:19 -07:00
Andrzej Kapolka
ecb54600eb Another compile fix. 2014-03-11 15:34:41 -07:00
Andrzej Kapolka
f8e6593bcf Turn off mipmaps. Performance is actually substantially better without them. 2014-03-11 15:24:14 -07:00
Andrzej Kapolka
3d9d89e4a7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-11 15:11:32 -07:00
Andrzej Kapolka
a4fc2397c7 Fixed Visage includes. 2014-03-11 14:36:29 -07:00
Andrzej Kapolka
e96e591481 Build fix for Visage: added missing include. 2014-03-11 14:25:34 -07:00
Andrzej Kapolka
bc3bba9240 Get rid of unused, expensive "average color" nonsense. 2014-03-11 14:01:23 -07:00
Andrzej Kapolka
35d0fa7189 Don't render avatars until they've been simulated, init before first simulate. 
Closes #2262.
 2014-03-11 13:46:58 -07:00
Andrzej Kapolka
7d1a44fbea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 12:52:13 -07:00
Brad Hefta-Gaub
c09b5aec5e Merge pull request #2257 from ey6es/master 
Applied Ryan's tweaks to Visage mapping and config file.
 2014-03-11 12:39:23 -07:00
Brad Hefta-Gaub
df4128a2dd Merge pull request #2255 from ey6es/joints 
Rather than unloading resources immediately when unused, use a simple LRU cache.
 2014-03-11 12:38:42 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -07:00
Andrzej Kapolka
35be8cd941 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:23:13 -07:00
Andrzej Kapolka
4e37586577 Merge pull request #2250 from birarda/windows-build 
windows build cleanup after dependencies work, BUILD guide updates
 2014-03-11 10:22:53 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Stephen Birarda
2f95f3b3a2 Merge pull request #2245 from ZappoMan/cruft_cleanup 
Cruft cleanup
 2014-03-11 09:45:40 -07:00
Stephen Birarda
778ad1411f resolve conflicts on merge with upstream master 2014-03-11 09:39:00 -07:00
Andrzej Kapolka
ae6a59ef78 Ray intersections for models, don't load resources if there's no network 
manager installed.
 2014-03-10 17:53:20 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
Andrzej Kapolka
2005b8dd9d Slight tweak to Visage instructions (in order not to overwrite our custom 
configuration).
 2014-03-10 15:16:48 -07:00
Andrzej Kapolka
853bba27ca Applied Ryan's tweaks to Visage mapping and config file. 2014-03-10 15:13:24 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
Andrzej Kapolka
34ddddae1b Basic LRU cache. Closes #2234. 2014-03-10 12:06:07 -07:00
stojce
3753c01e31 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-10 20:03:55 +01:00
Andrzej Kapolka
9731159b82 Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-10 10:57:48 -07:00
Andrzej Kapolka
c6655382d6 Initialize scale to unity. Closes #2232. 2014-03-10 10:52:46 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07:00
Stephen Birarda
741bf9fe9c remove double definition of GLEW_STATIC 2014-03-10 09:22:51 -07:00
Andrew Meadows
3a0a3f484a Merge upstream master into "shapes" project 2014-03-10 08:39:55 -07:00
Andrew Meadows
817ae8e052 degrees instead of radians for head lean deltas 2014-03-10 08:38:17 -07:00
stojce
bd3a5a767f Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-09 10:15:21 +01:00
stojce
ba0bf75d56 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-09 10:12:46 +01:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
stojce
8decf55e3f Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-08 13:19:45 +01:00
ZappoMan
68c3e0e54d Merge pull request #2236 from Atlante45/fst_upload 
FST ploader base
 2014-03-07 15:42:52 -08:00
Stephen Birarda
3eace31dde add a definition so that static GLEW works without DLL 2014-03-07 14:53:13 -08:00
Stephen Birarda
6f81803a3d don't have GLUT find module look for the DLL 2014-03-07 14:47:24 -08:00
Stephen Birarda
a72cac8c9c default to using Release LibOVR, include instructions for OS X rebuild 2014-03-07 14:31:59 -08:00
Stephen Birarda
e96e88b3b3 remove a warning that no longer needs to be heeded 2014-03-07 14:19:45 -08:00
Stephen Birarda
720846fa62 fix FindGLUT to get path to GLUT dll 2014-03-07 14:11:45 -08:00
Stephen Birarda
b8a03cf0f4 glew to be linked statically so dll not required at runtime 2014-03-07 14:08:30 -08:00
Stephen Birarda
1bd3529395 more module fixes and sixense readme change for OS X dylib 2014-03-07 13:59:50 -08:00
Stephen Birarda
569dd694fe cmake styling cleanup in Visage find module and interface CMakeLists 2014-03-07 13:42:13 -08:00
Stephen Birarda
23249866f7 have cmake copy dlls for glut and glew beside executable 2014-03-07 13:41:00 -08:00
Stephen Birarda
e3363dd304 conditionally include the OPENGL_INCLUDE_DIR since it is empty on windows 2014-03-07 12:22:58 -08:00
Stephen Birarda
1ec48b5999 fix a dumb elseif in custom find glut module 2014-03-07 12:16:09 -08:00
Stephen Birarda
dbf8021ccd include GLUT and OpenGL dirs as system includes 2014-03-07 12:07:19 -08:00
Atlante45
8faaa28bc1 FST ploader base 2014-03-07 11:55:02 -08:00
Stephen Birarda
cabbfb9a9e fix typos in updated sixense and oculus READMEs 2014-03-07 10:36:19 -08:00
Stephen Birarda
68c5d72a0f update sixense and oculus readme to suggest use of HIFI_LIB_DIR 2014-03-07 10:30:43 -08:00
Stephen Birarda
3b06bbd88d move sixense directory to lowercase, have find module look in env dir 2014-03-07 09:59:24 -08:00
Stephen Birarda
a364655f63 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-07 09:40:50 -08:00
Andrew Meadows
47e340dafe Merge upstream/master 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-07 09:16:33 -08:00
ZappoMan
92d39b3c47 Merge pull request #2229 from birarda/master 
make LibOVR (for oculus) an external dependency
 2014-03-06 22:43:32 -08:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Stephen Birarda
b91a55d89d tweak the GLEW and glut modules to be more hifi specific 2014-03-06 17:53:07 -08:00
Stephen Birarda
594d43db84 add a find module for glew and tweak glm module 2014-03-06 17:41:14 -08:00
Stephen Birarda
cfc55c0435 cleanup interface CMakeLists for freeglut and GLEW finding 2014-03-06 17:23:56 -08:00
Stephen Birarda
d64be26e41 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-06 17:12:08 -08:00
Stephen Birarda
0f5fbb5fab pull out glew and freeglut so they can be external dependencies 2014-03-06 17:09:59 -08:00
Andrzej Kapolka
c5ab32235f Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-06 17:09:24 -08:00
Andrzej Kapolka
3adea84b81 Basic joint data sending. Closes #2166. 2014-03-06 17:07:29 -08:00
Stephen Birarda
d51deca0fe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 16:45:41 -08:00
Stephen Birarda
1ef780c6cb make headers coding standard compliant 2014-03-06 16:24:58 -08:00
Stephen Birarda
7ef882c525 make sure InterfaceConfig is included before Qt headers 2014-03-06 16:14:18 -08:00
Stephen Birarda
8cbdf5d94a Merge branch 'master' of https://github.com/highfidelity/hifi into resources 2014-03-06 15:49:45 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Stephen Birarda
c2faf86201 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 15:24:37 -08:00
Stephen Birarda
4a1cb63d7b remove an blank line in Application headers 2014-03-06 15:09:35 -08:00
Stephen Birarda
87d908a3bc resolve conflicts on merge with upstream master 2014-03-06 15:03:03 -08:00
Stephen Birarda
2d10995d01 Merge pull request #2219 from ZappoMan/cruft_removal 
Fix Crash and Cruft Removal
 2014-03-06 15:01:31 -08:00
Stephen Birarda
721047234c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:53:57 -08:00
Stephen Birarda
5373cbbb9b Merge pull request #2228 from josecpujol/fix_2198 
Changed the up vector for computing the scale factor: it failed when
 2014-03-06 14:49:13 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:45:02 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Stephen Birarda
1bcb595f57 add missing interface config includes for windows 2014-03-06 13:52:06 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Jose Carlos
8e81c4c467 Changed the up vector for computing the scale factor: it failed when 
there was a roll in the view
 2014-03-06 21:49:36 +01:00
Stephen Birarda
06743f771f remove a double InterfaceConfig incldue in AmbientOcclusionEffect 2014-03-06 12:49:01 -08:00
Stephen Birarda
b670859aaa reference SharedUtil from LogDialog as a library header 2014-03-06 12:46:06 -08:00
Andrew Meadows
868e92c0fa Merge upstream/master' into shapes branch 2014-03-06 12:45:43 -08:00
Stephen Birarda
820dc7f45f include cstdio for sprintf call 2014-03-06 12:41:25 -08:00
Andrzej Kapolka
23556f0cf7 Fix for merging after streaming, added ability to "set" a spanner's attributes 
in the actual metavoxel data.
 2014-03-06 12:38:11 -08:00
Andrew Meadows
37b088ebfa Hands can collide with avatar head again 2014-03-06 12:38:07 -08:00
Stephen Birarda
e7b166a304 Revert "include InterfaceConfig before Application to fix win build" 
This reverts commit dde2b199c9.
 2014-03-06 12:35:20 -08:00
Andrew Meadows
778bdec6d8 Model now knows its bounding radius 2014-03-06 12:34:21 -08:00
Stephen Birarda
dde2b199c9 include InterfaceConfig before Application to fix win build 2014-03-06 12:14:14 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
c737283935 qrc references should only use a single slash 2014-03-06 10:45:47 -08:00
Stephen Birarda
94a0db04f9 don't copy resources into OS X bundle 2014-03-06 10:41:44 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
cc554c53f1 use Qt Resource System to compile in resources 2014-03-06 10:25:15 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
ZappoMan
d5c18a54fa removed dead code 2014-03-06 01:32:58 -08:00
ZappoMan
a887baf081 fix warning 2014-03-05 21:22:08 -08:00
ZappoMan
13985f8149 fix crash in Menu.removeSeparator() if the menu item doesn't exist or isn't a separator 2014-03-05 21:17:25 -08:00
ZappoMan
7a8d26247a remove piemenu 2014-03-05 21:03:32 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2014-03-05 18:28:25 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Andrzej Kapolka
78221c7de2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 17:13:00 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00