Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 11:27:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11623 commits 25 branches 0 tags 1.1 GiB
Commit graph

5809 commits

Author SHA1 Message Date
Atlante45
4a1687c023 Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
 2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Andrew Meadows
db40a955c9 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:50:08 -07:00
Andrew Meadows
aad945c180 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:45:01 -07:00
Andrew Meadows
715f2c53d5 merge upstream/master into avatar-interaction 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:28:22 -07:00
Atlante45
c2f0545d96 Setup for actual metadata 2014-04-02 17:12:11 -07:00
Atlante45
cf20c448a3 Few tweaks before PR 2014-04-02 16:46:03 -07:00
Andrew Meadows
933cade6b0 Re-add fullUpdate hint to Model::simulate() 2014-04-02 16:34:33 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Lucas Crisman
76921d9b52 Merge branch 'master' of git://github.com/worklist/hifi into 19498 2014-04-02 17:18:27 -03:00
Andrew Meadows
97ba5250a5 Only simulate() Avatar Models when necessary 
Also: rebuild collision shapes when Model scale changes
 2014-04-02 12:01:18 -07:00
Atlante45
b73598ae8a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:40:41 -07:00
Atlante45
e60e1929f3 Review comments 2014-04-02 11:36:52 -07:00
Lucas Crisman
1a468ab8ca Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-02 01:26:25 -03:00
Philip Rosedale
ca863e77f4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/interface_en.ts
 2014-04-01 21:14:51 -07:00
Philip Rosedale
389091ace6 Merge pull request #2587 from matsukaze/nocrAudioFixes 
Audio fixes for win OS.
 2014-04-01 21:03:26 -07:00
matsukaze
d28d686ceb Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit. 2014-04-02 17:45:22 -07:00
matsukaze
f305b81655 Merge upstream master into audio fixes. 2014-04-02 17:34:41 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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