Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 04:43:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16866 commits 76 branches 59 tags 1.2 GiB
Commit graph

5328 commits

Author SHA1 Message Date
Andrew Meadows
825be3e1e7 fix for ray-vs-AACubeShape intersection test 2014-09-12 08:40:48 -07:00
Andrew Meadows
a9957ac7df the real fix for ray-vs-plane intersection 2014-09-12 08:40:03 -07:00
Andrew Meadows
ff0872a5f0 add RayIntersectionInfo::getIntersectionPoint() 2014-09-12 08:38:44 -07:00
Andrew Meadows
46089a0611 fix ray-vs-AACube logic 2014-09-12 08:37:47 -07:00
ZappoMan
baaf01683e removed some verbose comments 2014-09-12 08:23:13 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
 2014-09-12 08:18:09 -07:00
ZappoMan
4bce7f8c0b removed debug 2014-09-12 08:14:28 -07:00
ZappoMan
54ef5d4698 fixed bugs in MovingEntitiesOperator, improved getDistanceToBottomOfEntity, isRestingOnSurface 2014-09-12 07:45:33 -07:00
Philip Rosedale
8428b1a4ba Merge pull request #3401 from chansensturm/audio-noise 
New stereo audio panning object
 2014-09-11 17:53:55 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Craig Hansen-Sturm
1d0ba52445 implemented new audio panning object which implements constant power sin^2+cos^2=1 law 2014-09-11 17:15:49 -07:00
ZappoMan
77dff69805 fix ray picking to work with registation points 2014-09-11 17:03:01 -07:00
ZappoMan
695569b64b reconcile use of getAACube() and handle rotations properly 2014-09-11 16:43:53 -07:00
ZappoMan
2148baae21 add boxInFrustum 2014-09-11 16:40:32 -07:00
ZappoMan
9f4d199440 move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes 2014-09-11 15:36:13 -07:00
ZappoMan
7db2930d91 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:33:38 -07:00
ZappoMan
ceb1740f38 handy conversions between AABox, AACube, and Extents 2014-09-11 12:33:24 -07:00
ZappoMan
a022d47792 improve constness for operators on PropertyFlags<> 2014-09-11 12:33:04 -07:00
ZappoMan
f88970f8fe moved Extents to shared 2014-09-11 12:32:47 -07:00
ZappoMan
2757f16045 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:29:47 -07:00
ZappoMan
d616c7fa0c handy conversions between AABox, AACube, and Extents 2014-09-11 12:23:35 -07:00
ZappoMan
7cadc3433a improve constness for operators on PropertyFlags<> 2014-09-11 12:13:34 -07:00
Stephen Birarda
23a0ef2de1 remove some spacing in AddressManager 2014-09-11 12:13:13 -07:00
ZappoMan
13cffa6e44 moved Extents to shared 2014-09-11 12:12:25 -07:00
Craig Hansen-Sturm
893d4686db comments 2014-09-11 11:18:05 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
Stephen Birarda
6d21c4bf0d make lookup for hostnames case insensitive 2014-09-11 11:07:42 -07:00
Craig Hansen-Sturm
0d5f28c7df audio buffer framing issue / comments 2014-09-11 11:05:27 -07:00
Stephen Birarda
684aa97b98 add port parsing for domain hostname in address bar 2014-09-11 11:00:24 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
ZappoMan
a3e3a1dc2b cleanup dead code 2014-09-10 20:07:45 -07:00
ZappoMan
a3e47aa301 fix angular velocity damping so we don't get bad quats 2014-09-10 17:46:50 -07:00
Andrew Meadows
0494ffcf38 implement Ray-vs-Capsule and Ray-vs-AACube 2014-09-10 17:01:51 -07:00
Craig Hansen-Sturm
18975aef57 log audio device framing errors, copy as much data as we can, but don't assert 2014-09-10 16:48:35 -07:00
ZappoMan
cbdaf76b88 dry up the EntityItemProperties::copyFromScriptValue() with macros for repeated blocks 2014-09-10 15:39:00 -07:00
Stephen Birarda
ee6a90dd54 allow domain to pass down its ID from config 2014-09-10 15:13:02 -07:00
ZappoMan
8339dfaeb3 fix EntityItemProperties::markAllChanged() 2014-09-10 15:05:27 -07:00
ZappoMan
8023735eb3 changed rotational to angular and added angular damping 2014-09-10 14:46:27 -07:00
Craig Hansen-Sturm
cb8e832257 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-10 13:14:21 -07:00
Craig Hansen-Sturm
015fdec6bd Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:05:52 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
ZappoMan
f33690cc38 fix velocity and gravity to be in meters 2014-09-10 11:55:23 -07:00
ZappoMan
bb52c4a1b3 store angular valocity as 3 vector 2014-09-10 11:28:45 -07:00
ZappoMan
d4dad8f4d8 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 2014-09-10 10:45:57 -07:00
ZappoMan
7283e7818f moved macros to sep file 2014-09-10 09:19:24 -07:00
ZappoMan
53da483381 more work on visible, registration point, and rotational velocity 2014-09-10 09:05:46 -07:00
AndrewMeadows
f3b8d68c65 Merge pull request #3381 from chansensturm/audio-noise 
Hot FIX:  pulse audio input device frame size
 2014-09-10 08:25:42 -07:00
Philip Rosedale
ccd57163d0 Merge pull request #3388 from ZappoMan/quietDebug 
silence some over active debug messages
 2014-09-09 20:58:54 -07:00
ZappoMan
e88726c7c5 silence some over active debug messages 2014-09-09 20:41:56 -07:00
ZappoMan
fac7d20c8a basic support for PROP_REGISTRATION_POINT, PROP_ROTATIONAL_VELOCITY, and PROP_VISIBLE 2014-09-09 20:38:58 -07:00
ZappoMan
fd59f58989 added script property to EntityProperties setting/getting and scripting 2014-09-09 20:18:01 -07:00
ZappoMan
e6fc9d68ff add getUnscaledMeshExtents to FBXGeometry 2014-09-09 17:51:35 -07:00
ZappoMan
44230a315b add naturalDimensions and moved sitting points to exclusively be in properties 2014-09-09 17:45:50 -07:00
ZappoMan
df0dc3bdd7 add getUnscaledMeshExtents to FBXGeometry 2014-09-09 17:44:23 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
ZappoMan
31fc5bb4f7 silence some over active debug messages 2014-09-09 13:19:06 -07:00
AndrewMeadows
912260d95f Merge pull request #3376 from huffman/patch-1 
Add include for QtGlobal to ensure OS global has been defined
 2014-09-09 11:58:48 -07:00
Craig Hansen-Sturm
87a6d5921f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-08 17:55:01 -07:00
Atlante45
da740e8a88 First cut at radio.js 2014-09-08 15:31:53 -07:00
Craig Hansen-Sturm
cb4aab3902 allocate 8x buffer size (for pulse audio) / more audioGain loop unrolling w/frame alignment check 2014-09-08 15:28:55 -07:00
AndrewMeadows
303bf3b29d Merge pull request #3378 from chansensturm/audio-noise 
Hot FIX:  update audio input device max buffer size
 2014-09-08 14:40:21 -07:00
Craig Hansen-Sturm
5a6f8015f6 unroll audio gain rendering loop 2014-09-08 14:05:47 -07:00
Clément Brisset
51e01bc6bc Merge pull request #3377 from AndrewMeadows/inertia 
fix for flickering avatars
 2014-09-08 13:37:55 -07:00
Andrew Meadows
15025bf8d8 fix for flickering avatars 2014-09-08 13:08:08 -07:00
Ryan Huffman
ecadf7dd33 Add include for QtGlobal to ensure OS global has been defined 2014-09-08 12:40:53 -07:00
AndrewMeadows
a6392e532a Merge pull request #3375 from chansensturm/audio-noise 
Hot FIX:  stereo input devices shouldn't trigger an assert
 2014-09-08 12:28:41 -07:00
Craig Hansen-Sturm
5b996046ba Hot FIX: stereo input devices shouldn't trigger an assert 2014-09-08 12:05:29 -07:00
Brad Hefta-Gaub
8068117f0c Merge pull request #3368 from chansensturm/audio-noise 
New Audio Buffer, Format, Tone Generator, Pink Noise Generator, and Gain objects
 2014-09-08 11:28:02 -07:00
Craig Hansen-Sturm
431fcbcf6c coding standard / SLOT selectAudioSourceSine440 linkage / tone gen amplitude parameter 2014-09-08 11:18:14 -07:00
Andrew Meadows
c9d5508f16 merge upstream/master into andrew/ragdoll 2014-09-08 10:21:32 -07:00
Philip Rosedale
68cc49f19e Merge pull request #3372 from ZappoMan/entitiesCrashes 
Fixes the several entity crashes
 2014-09-07 21:04:14 -07:00
ZappoMan
420f7de957 fix various crashes in entites 2014-09-07 20:31:54 -07:00
ZappoMan
9fdd1f422a fix crash on change domains while entities are animating or moving 2014-09-06 16:54:36 -07:00
ZappoMan
d734655ab6 fix some recently introduced warnings 2014-09-06 16:03:03 -07:00
Brad Hefta-Gaub
a77739f31c Merge pull request #3369 from ctrlaltdavid/20007 
Code Review for Job #20007
 2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -07:00
Craig Hansen-Sturm
2700d8c59d ubuntu build fix (remove std::memset ...) 2014-09-06 04:05:52 -07:00
Craig Hansen-Sturm
76adb952a3 ubuntu build fix (remove std::memset ...) 2014-09-06 03:57:11 -07:00
Craig Hansen-Sturm
e64c81420e ubuntu build fix (remove std::memset ...) 2014-09-06 03:29:14 -07:00
Craig Hansen-Sturm
e2f3392f09 formatting/renaming 2014-09-06 02:51:11 -07:00
Craig Hansen-Sturm
1eba20bc3b minor cleanup 2014-09-06 02:32:13 -07:00
Craig Hansen-Sturm
5bab1ee7f5 dependency on new audiobuffer and audioformat objects/render call now uses audiobuffers 2014-09-06 02:22:27 -07:00
Craig Hansen-Sturm
8ecf0870e7 dependency on new audiobuffer and audioformat objects 2014-09-06 02:20:14 -07:00
Craig Hansen-Sturm
0b33c344ff new audio buffer object 2014-09-06 02:18:35 -07:00
Craig Hansen-Sturm
f439475f3c new audio gain/mute object 2014-09-06 02:18:04 -07:00
Craig Hansen-Sturm
3a9a4a6402 new pink noise generator audio source object 2014-09-06 02:16:00 -07:00
Craig Hansen-Sturm
c6911274f6 new tone generator audio source object 2014-09-06 02:14:47 -07:00
Craig Hansen-Sturm
1cdb01e072 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-05 18:31:02 -07:00
Clément Brisset
f3344ac440 Merge pull request #3365 from AndrewMeadows/inertia 
remove warnings
 2014-09-05 18:00:35 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrew Meadows
51dca12a7b added default case for switch statements 
which avoids warnings about unhandled enum values
 2014-09-05 16:55:42 -07:00
Andrew Meadows
2fdfb125f2 removed signed/unsigned comparisons 2014-09-05 16:55:24 -07:00
Andrew Meadows
c089dbb0bb removed signed/unsigned comparisons 2014-09-05 16:44:33 -07:00
Andrew Meadows
e7b39ae119 removed unused variable 2014-09-05 16:42:24 -07:00
Andrew Meadows
3ae78da593 fixed signed/unsigned comparison 2014-09-05 16:41:51 -07:00
Andrew Meadows
62438bae6a fixed signed/unsigned comparison and unused variable 2014-09-05 16:41:01 -07:00
Andrew Meadows
0ddc8eb448 fix signed/unsigned comparison 2014-09-05 16:40:14 -07:00
Brad Hefta-Gaub
5942386383 Merge pull request #3364 from Atlante45/stereo_injections 
move isStereo packing to the correct position
 2014-09-05 16:37:58 -07:00
Atlante45
619aebcd67 move isStereo packing to the correct position 2014-09-05 16:18:02 -07:00
Andrew Meadows
6f22ff01d9 merge upstream/master into andrew/ragdoll 2014-09-05 16:04:01 -07:00
Philip Rosedale
1d2150e12d Merge pull request #3362 from Atlante45/stereo_injections 
Added stereo option to the AudioInjector
 2014-09-05 15:53:29 -07:00
Philip Rosedale
39ffd3dadd Merge pull request #3356 from ZappoMan/fixingOctreeSave 
voxel file corruption fixes
 2014-09-05 15:51:02 -07:00
ZappoMan
f0d72b83fa CR feedback 2014-09-05 15:39:29 -07:00
ZappoMan
1e6b49899a allow FBXReader to parse new format SVO files 2014-09-05 15:12:41 -07:00
Andrew Meadows
b953d880a3 minor optimization on CubeList and VoxelPool 2014-09-05 14:41:18 -07:00
Atlante45
507419162c Added stereo option to the AudioInjector 2014-09-05 14:34:55 -07:00
ZappoMan
a19ce6e859 clean up warning 2014-09-05 12:52:04 -07:00
ZappoMan
54a746a846 remove noise 2014-09-05 12:49:23 -07:00
ZappoMan
e1064d8da7 correctly implement data types who assume all child data must be included (e.g. voxels) 2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350 more work on fixing voxels 2014-09-05 11:51:17 -07:00
Andrew Meadows
ff09a0d41b merge upstream/master into andrew/inerita 2014-09-05 11:47:49 -07:00
Andrew Meadows
7be411b4ca expose _measured_ MyAvatar velocity to JS 2014-09-05 11:44:13 -07:00
Ryan Huffman
b0a0760be2 Update ShutdownEventListener to not stop event handling 2014-09-05 11:26:22 -07:00
Ryan Huffman
38a14c3864 Reapply "Update assignment client to close on WM_CLOSE message on Windows" 
This reverts commit a603453cf2.
 2014-09-05 11:19:36 -07:00
ZappoMan
f234dbf9a1 converting voxel files to new versioned format with buffer breaks 2014-09-05 10:51:08 -07:00
Leonardo Murillo
a603453cf2 Revert "Update assignment client to close on WM_CLOSE message on Windows" 2014-09-05 11:36:56 -06:00
Ryan Huffman
e590f992f6 Merge branch 'master' of git://github.com/highfidelity/hifi into 19831 2014-09-05 10:18:02 -07:00
ZappoMan
5c5658b6e7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave 2014-09-05 09:27:27 -07:00
ZappoMan
60e8056cd8 removed some debug code 2014-09-05 02:20:30 -07:00
ZappoMan
dc31381fc1 better handling of old model files 2014-09-05 02:19:17 -07:00
ZappoMan
3c2b534842 dead code cleanup and comment cleanup 2014-09-05 01:50:43 -07:00
ZappoMan
5ec98b8dec more guards to corrupt voxel files 2014-09-05 01:40:41 -07:00
ZappoMan
a189f077b8 fix huge-mega-voxels and voxel file corruption 2014-09-05 01:13:22 -07:00
Brad Hefta-Gaub
9648c0d64e Merge pull request #3343 from AndrewMeadows/ragdoll 
Ragdoll Part 12: first pass avatar skeleton collides with voxels
 2014-09-04 23:09:08 -07:00
Andrzej Kapolka
b275af48ed Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-04 17:26:34 -07:00
Andrzej Kapolka
83d209dbdc Remove unused variables. 2014-09-04 17:26:01 -07:00
Clément Brisset
fb8b3020e5 Merge pull request #3353 from ZappoMan/virtualEntities 
fix couple of Entities issues: possible static memory corruption, sphere colors
 2014-09-04 16:23:38 -07:00
ZappoMan
931e5fa408 fix potential static memory corruption 2014-09-04 15:43:51 -07:00
Andrew Meadows
7cde6811ca remove unecessary AACube::operator<() 2014-09-04 15:21:19 -07:00
Andrew Meadows
faf31f268e use QHash, not QVector, for Octree content query 2014-09-04 15:20:07 -07:00
Stephen Birarda
2678bd3d9e Merge pull request #3348 from ZappoMan/virtualEntities 
patch for possible static memory corruption on large edit entity messages
 2014-09-04 10:48:59 -07:00
ZappoMan
957991b67e patch for possible static memory corruption on large edit entity messages 2014-09-04 09:52:26 -07:00
Stephen Birarda
e338c600c3 add debug to show that domain connection is being attempted 2014-09-04 09:29:29 -07:00
ZappoMan
3e1401014d more model naming cleanup and fixing example scripts 2014-09-03 18:32:44 -07:00
ZappoMan
e680260c89 remove assert in favor of warning 2014-09-03 17:17:36 -07:00
ZappoMan
d89b29581b remove assert in favor of warning 2014-09-03 17:14:34 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967 
Code Review for Job #19967
 2014-09-03 16:51:19 -07:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close 
Update assignment client to close on WM_CLOSE message on Windows
 2014-09-03 16:43:12 -07:00
Andrew Meadows
e120697a9b merge upstream/master into andrew/ragdoll 2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Andrew Meadows
a3b26582ba fix for nan in sphereVsAACubeHelper() 2014-09-03 15:39:26 -07:00
ZappoMan
d08e7ef96d fix bug in way too small entities 2014-09-03 15:20:42 -07:00
Andrzej Kapolka
f33a33401f Merge pull request #3338 from Atlante45/rec_file_format_tweaks 
AC playback control scripts
 2014-09-03 15:05:20 -07:00
Andrzej Kapolka
a02656070f Added some comments. 2014-09-03 14:43:11 -07:00
Andrzej Kapolka
686ad4f0ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-03 14:43:01 -07:00
Andrew Meadows
4270c4d989 merge upstream/master into andrew/ragdoll 2014-09-03 14:42:17 -07:00
Andrzej Kapolka
0bd800faf2 Starting on materials attributes, fixed bug with Hermite deltas. 2014-09-03 14:09:04 -07:00