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

5351 commits

Author SHA1 Message Date
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
Andrew Meadows
361d1e83b0 use PhysicsEntity::stepForward() in simulation loop 2014-09-03 13:18:35 -07:00
Andrew Meadows
6454fd2627 add PhysicsEntity::stepForward() 2014-09-03 13:18:12 -07:00
Andrew Meadows
54463ab668 add findContentInCube() and typedef CubeList 2014-09-03 13:17:47 -07:00
Andrew Meadows
06e1d4a8bc init Shape::_mass in all ctors 2014-09-03 13:16:49 -07:00
ZappoMan
76511762dc fix bug in getContainingElement() found by andrew, allow sciprting interface to return properties of local only entities 2014-09-03 13:14:06 -07:00
Andrew Meadows
0cc6f559d4 add AACube::operator<() so they can be sorted 2014-09-03 13:13:54 -07:00
ZappoMan
756840d541 CR feedback 2014-09-03 12:48:39 -07:00
ZappoMan
29bbeadbc7 fix method names for CR feedback 2014-09-03 12:44:57 -07:00
ZappoMan
ca3cf6d517 removed dead code 2014-09-03 12:42:51 -07:00
ZappoMan
59d0bb29a2 useless semicolon removal 2014-09-03 12:28:35 -07:00
ZappoMan
9a02545d9e useless semicolon removal 2014-09-03 12:26:05 -07:00
ZappoMan
f5b9fabdb9 fix CR feedback 2014-09-03 12:12:08 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
Ryan Huffman
5937830443 Update getWindowTitleBarHeight signature 2014-09-03 08:27:18 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
Ryan Huffman
1ee23a1661 Add Windows.h include to ShutdownEventListener 2014-09-03 08:04:39 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
ZappoMan
446daa81a5 fix issue of server clock skew changing without breaking animation and moving 2014-09-02 20:01:41 -07:00
ZappoMan
e8b1497d60 revert to old _lastUpdated behavior to fix animations and movement 2014-09-02 19:28:33 -07:00
ZappoMan
9cf6fcdaab warning fix 2014-09-02 18:45:38 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -07:00
Andrzej Kapolka
33faffd9d4 Sphere tools for voxel editing. 2014-09-02 17:45:37 -07:00
ZappoMan
9fa087571b tweak to save SVO logic 2014-09-02 17:10:41 -07:00
Andrew Meadows
7c04a25095 fix whitespace formatting of curly braces 2014-09-02 16:29:20 -07:00
Atlante45
5c88485eb9 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-02 13:58:05 -07:00
Ryan Huffman
67cefc8d54 Reduce height of RunningScripts so titlebar is inside main window 2014-09-02 13:12:52 -07:00
Atlante45
a1e6d9e7a1 Protections against null pointers 2014-09-02 12:56:12 -07:00
Andrzej Kapolka
50a250ce01 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 12:03:47 -07:00
ZappoMan
10d581925c DRY up the property reading code by using macro for repeated pattern 2014-09-02 10:31:26 -07:00
ZappoMan
799931aa6c DRY up the property setting code by using macro for repeated pattern 2014-09-02 09:30:28 -07:00
ZappoMan
033017346c removed debug code 2014-09-02 08:53:19 -07:00
ZappoMan
2b5d631290 removed a ton of old dead debug code 2014-09-02 08:44:43 -07:00
ZappoMan
0f2a14a359 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-09-02 07:52:51 -07:00
ZappoMan
fa5c2b9638 removed todo file 2014-09-01 23:09:18 -07:00
ZappoMan
ea22073ddc removed some accidentally added code 2014-09-01 23:05:23 -07:00
ZappoMan
f16a48e187 quiet some debugging 2014-09-01 22:38:18 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
ZappoMan
1fa587b88a suppress unchanged entities 2014-08-29 21:51:08 -07:00
ZappoMan
d1a046e6ed properly handle LOD in rendering by not rendering small entities 2014-08-29 21:18:31 -07:00
ZappoMan
ed670ff48e fix bug with animations randomly not working 2014-08-29 20:19:24 -07:00
ZappoMan
2fab662e8c fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit 2014-08-29 17:48:14 -07:00
Andrew Meadows
a71823353b merge upstream/master into andrew/ragdoll 2014-08-29 16:46:33 -07:00
AndrewMeadows
431d69e9d9 Merge pull request #3330 from Atlante45/rec_file_format_tweaks 
Rec file format tweaks
 2014-08-29 16:10:03 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions 
so that I don't break anything when this merges with upstream
 2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Craig Hansen-Sturm
974c88442c new audio format object 2014-08-29 14:36:11 -07:00
Atlante45
9b5b83117f CR 2014-08-29 14:25:05 -07:00
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face 
with unit tests
 2014-08-29 14:23:00 -07:00
Andrzej Kapolka
120563951d Fixed bug in edge vertex generation. 2014-08-29 12:10:25 -07:00
ZappoMan
f654fac851 fixed a couple crashes in editing entities 2014-08-29 10:56:07 -07:00
ZappoMan
06a9116082 updated TODO 2014-08-28 22:15:22 -07:00
ZappoMan
97706e3aed updated TO DO 2014-08-28 22:05:01 -07:00
ZappoMan
93511616d6 prevent editing of entities out of doamin 2014-08-28 21:54:25 -07:00
ZappoMan
ad9ce2edd3 delete moving entities that travel outside of domain 2014-08-28 21:34:12 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrzej Kapolka
78a03fb31a More progress toward dual contour rendering. 2014-08-28 20:01:55 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
ZappoMan
de968ba4f6 fix the issue with moving entities not being simulated makes motion smoother 2014-08-28 16:44:52 -07:00
Andrzej Kapolka
f02f95c460 Hermite data computation. 2014-08-28 14:53:48 -07:00
ZappoMan
c83cb6386a updated to do list 2014-08-28 14:32:13 -07:00
ZappoMan
eab9f391ee fix getProperties() for age 2014-08-28 14:02:05 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
Clément Brisset
1b5a6cf671 Merge pull request #3325 from chansensturm/audio-filter 
left/right channels of head shadow filter now have independent gain calculations
 2014-08-28 11:51:09 -07:00
Atlante45
a6bf9d7b90 Handle URL recordings + some safety checks 2014-08-28 11:42:39 -07:00
Craig Hansen-Sturm
3e3090f1ea coding standard 2014-08-28 11:12:17 -07:00
Atlante45
9df68dc2f1 CR 2014-08-28 10:58:07 -07:00
Andrzej Kapolka
2b2bc9179a More progress towards computing Hermite data. 2014-08-27 19:09:10 -07:00
Atlante45
691ace7cc6 Looping option 2014-08-27 19:05:39 -07:00
Andrzej Kapolka
96b4a1080c More voxel editing bits. 2014-08-27 18:15:29 -07:00
Craig Hansen-Sturm
0881959750 left/right channels of head shadow filter now have independent gain + implemented all-pass filter 2014-08-27 17:30:11 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
Andrzej Kapolka
9a4d56b4e9 Working on voxel bits. 2014-08-27 14:41:23 -07:00
ZappoMan
ed6363ca02 fixed bug in processing of entity erase messages 2014-08-27 14:21:06 -07:00
Andrew Meadows
921c8cfec3 fix broken build for using unititialized const float 2014-08-27 12:21:15 -07:00
Andrew Meadows
e133a696f5 merge andrew/ragdoll into some ShapeCollider work 2014-08-27 12:12:08 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests 
Sphere is unit tested.
Also removed the shape collision query against Octree
 2014-08-27 12:09:41 -07:00
ZappoMan
5c2b674a0d verify delete behavior actually frees memory associated with EntityItems 2014-08-27 12:07:11 -07:00
ZappoMan
30e00bbd69 final pass on entities import/export/overlays working as well as production 2014-08-27 11:34:50 -07:00
Brad Hefta-Gaub
e8c3125985 Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer 
Merge of Yixin's PR #3281 to head
 2014-08-27 11:14:52 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Atlante45
465b076998 Removed debug + ignore frame 0 2014-08-26 18:19:26 -07:00
Atlante45
056cd0a4d1 extra line 2014-08-26 18:06:10 -07:00
Andrzej Kapolka
e87556450e More voxel edit bits. 2014-08-26 18:02:55 -07:00
Atlante45
41461cd322 Added option to playback from current location 2014-08-26 17:23:50 -07:00
Andrzej Kapolka
9c0888afff Working on voxel edits. 2014-08-26 17:15:02 -07:00
ZappoMan
fb25314248 mark one more item off to do 2014-08-26 17:13:38 -07:00
ZappoMan
b14158385c first cut at getting pastEntities() working 2014-08-26 16:47:32 -07:00
ZappoMan
4895ee32f7 test and fix issues with exportEntities() 2014-08-26 15:59:49 -07:00
Atlante45
dda02b5dcf Fake faceshift connection while playing back 2014-08-26 15:54:16 -07:00
Atlante45
3826ed0d69 Added setFinalPitch/Yaw/Roll to HeadData 2014-08-26 15:36:08 -07:00
Andrzej Kapolka
c6486b7f23 Voxel material bits. 2014-08-26 14:43:54 -07:00
Atlante45
9e686b4096 Moved lean and head rotation inside Player class 2014-08-26 14:36:46 -07:00
Atlante45
90d8626615 Fix for audio on ACs 2014-08-26 14:35:35 -07:00
Atlante45
b92ae53753 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-26 14:34:39 -07:00
ZappoMan
53db93c7d7 updated to do list 2014-08-26 13:25:19 -07:00
ZappoMan
8d947662c8 fix conversion from old format to new format of entity IDs 2014-08-26 13:21:49 -07:00
Brad Hefta-Gaub
9b35dc784d Merge pull request #3320 from chansensturm/master 
added high-shelf and low-shelf filters, positional audio now uses high-shelf filter
 2014-08-26 13:13:10 -07:00
ZappoMan
edf7866c08 to do edits 2014-08-26 12:25:08 -07:00
Andrzej Kapolka
4f730e4185 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-26 11:35:23 -07:00
Andrzej Kapolka
337fe42390 Method renaming. 2014-08-26 11:34:46 -07:00
ZappoMan
3e5af5e815 removed some debug 2014-08-26 10:45:40 -07:00
ZappoMan
ef8feec91a fix referentials corruption and removed some debugging 2014-08-26 10:42:46 -07:00
ZappoMan
74585bc593 fix bug in referentials 2014-08-26 10:14:28 -07:00
Andrzej Kapolka
e454a08e57 HeightfieldTexture -> MaterialObject (we want to use it for voxels, too, and 
eventually include components other than diffuse color).
 2014-08-25 18:57:45 -07:00
Atlante45
cf14af0766 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-25 18:54:41 -07:00
Craig Hansen-Sturm
2abaa387d2 Merge remote-tracking branch 'upstream/master' 2014-08-25 18:18:01 -07:00
Craig Hansen-Sturm
950862839e added high-shelf and low-shelf filters, positional audio now uses high-shelf filter, significant reformatting/renaming of AudioFilter.h for coding standard 2014-08-25 18:17:32 -07:00
Andrzej Kapolka
14ed281528 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-25 15:44:31 -07:00
Andrzej Kapolka
7aa2a1d53f Working on voxel representations. 2014-08-25 15:44:12 -07:00
Andrzej Kapolka
e29a4e7683 Merge pull request #3312 from AndrewMeadows/ragdoll 
use dispatchTable for shape-vs-shape collision queries
 2014-08-25 15:43:48 -07:00
Andrew Meadows
7a5c4fdb16 remove commented out #includes 2014-08-25 15:25:46 -07:00
ZappoMan
4e38cb7c68 more debugging of referentials 2014-08-25 15:12:29 -07:00
ZappoMan
d6873f7b6c added some debugging for referentials 2014-08-25 14:48:08 -07:00
ZappoMan
1764839223 get basics of referentials working 2014-08-25 14:07:01 -07:00
Craig Hansen-Sturm
4f346bfe62 addresses more coding-standard spacing issues 2014-08-25 13:07:52 -07:00
ZappoMan
314e299ba5 get sit points working 2014-08-25 13:03:38 -07:00
Atlante45
88c8e5124e Merge branch 'master' of github.com:Atlante45/hifi 2014-08-25 12:47:01 -07:00
ZappoMan
1663ff86d7 removed dead code 2014-08-25 12:45:09 -07:00
Craig Hansen-Sturm
bf6d34b6f3 windows/linux build break + addresses zappoman review comments 2014-08-25 11:43:49 -07:00
ZappoMan
700b945d71 disabled some debugging 2014-08-25 11:35:28 -07:00
ZappoMan
d0ceca1935 moved EntityTree operator related classes to own files to match coding standard 2014-08-25 11:29:11 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Andrew Meadows
681c526fe1 exploit symmetry of collision pairings 2014-08-25 08:52:45 -07:00
Andrew Meadows
f684608d1f Added AACubeShape with stubbed collision functions 2014-08-25 08:24:44 -07:00
Craig Hansen-Sturm
848144d98c Merge remote-tracking branch 'upstream/master' 2014-08-24 22:17:30 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
Andrew Meadows
1bd7734ec1 sometimes swap order of shapes for simpler code 2014-08-22 18:07:11 -07:00
ZappoMan
73d5e8c519 more quieting of debug messages 2014-08-22 17:21:27 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
Andrew Meadows
1be922f986 add shapeVsList etc to dispatch table 
renamed some functions for more readability
 2014-08-22 11:20:53 -07:00
ZappoMan
75bb42fb73 debug cleanup 2014-08-22 10:54:00 -07:00
Andrzej Kapolka
e9e3671710 Increment the version number. 2014-08-21 18:14:10 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
Andrzej Kapolka
530f5b0df8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-21 16:00:30 -07:00
Atlante45
f207abdd98 Move Player over to AvatarData for ACs to use 2014-08-21 15:24:19 -07:00
Andrzej Kapolka
e152e0c2be Detachment fix. 2014-08-21 15:22:34 -07:00
Andrzej Kapolka
74b39773d6 Don't merge after expansion; it breaks stuff. 2014-08-21 14:50:58 -07:00
Andrzej Kapolka
72500630b0 Basic splatting. 2014-08-20 19:26:06 -07:00
ZappoMan
17426a1c71 removed tons of debugging 2014-08-20 17:47:16 -07:00
ZappoMan
ef86d86234 split out entity rendering into subclasses, improved rendering of models 2014-08-20 15:49:50 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Clément Brisset
c76afe7d4a Merge pull request #3298 from PhilipRosedale/master 
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
 2014-08-20 10:16:25 -07:00
Philip Rosedale
8e958b49c0 Merge pull request #3303 from Atlante45/record_feature 
Record feature JS API + File Format
 2014-08-19 21:25:18 -07:00
Andrzej Kapolka
540d074270 More texture bits. 2014-08-19 17:20:14 -07:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Andrzej Kapolka
3136e4df76 More texture progress. 2014-08-19 15:28:15 -07:00
ZappoMan
ddae85ce4a updated todo 2014-08-19 14:24:39 -07:00
Andrzej Kapolka
a9c4ce2a6a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-19 14:21:42 -07:00
Andrzej Kapolka
e854656a7f Rather than using a boolean to indicate "colorness," use a different class. 
More texture bits.
 2014-08-19 14:20:47 -07:00
Andrew Meadows
f511fe2657 Ragdoll cannot assume skeleton's rootIndex is 0 
some Models have extra "joints" not part of the normal skeleton
 2014-08-19 11:31:50 -07:00
ZappoMan
3a5a38c342 support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file 2014-08-19 10:53:45 -07:00
ZappoMan
960e9eb2f4 debugging tweaks 2014-08-19 09:43:09 -07:00
ZappoMan
7d675b78fe more todo 2014-08-19 09:41:46 -07:00
Philip Rosedale
7b86f668a6 Add SPACE to scripting JS, change reset to apostrophe 2014-08-18 23:22:55 -07:00
Atlante45
45ccb01297 Update options position and orientation correctly in the AudioInjector 2014-08-18 21:05:03 -07:00
Andrzej Kapolka
5b8ff07449 Working on heightfield textures. 2014-08-18 18:21:48 -07:00
Andrzej Kapolka
c2a5c33b7b Added ability to encode subdivisions relative to ancestor (not currently using 
for heightfields, since absolute lossy encoding is more efficient).
 2014-08-18 16:07:15 -07:00
ZappoMan
daffb00bf2 build issues fixed after merge 2014-08-18 15:41:20 -07:00
Atlante45
6d567e67a9 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 15:41:19 -07:00
Clément Brisset
bec149ebb9 Merge pull request #3295 from AndrewMeadows/ragdoll 
Ragdoll Part 11: ragdoll collisions move avatar
 2014-08-18 15:38:25 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
AndrewMeadows
86aa9a1dcf Merge pull request #3289 from ctrlaltdavid/19840 
Code Review for Job #19840
 2014-08-18 15:05:26 -07:00
ZappoMan
1b1c386e78 handle root element data that spans multiple MTU 2014-08-18 14:53:57 -07:00
Atlante45
1d30b52ec2 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 14:23:40 -07:00
Atlante45
52640c8482 Various tweaks and code cleanup 2014-08-18 14:23:29 -07:00
ZappoMan
49cf6dff3a more DIDNT_FIT logic improvements/fixes 2014-08-18 14:09:01 -07:00
ZappoMan
588d051595 use memmove() instead of memcpy() for overlapping updates and some debugging 2014-08-18 14:07:39 -07:00
Andrew Meadows
b2d3830057 merge upstream/master into andrew/ragdoll 2014-08-18 12:56:11 -07:00
Andrew Meadows
543bf5224c add VerletPoint::shift() 2014-08-18 12:54:26 -07:00
Andrew Meadows
7e7978de1a compute and store Ragdoll::_accumulatedMovement 2014-08-18 12:53:04 -07:00
Andrew Meadows
fe5f9f8fe5 use relative mass when enforcing ContactPoint 2014-08-18 12:49:47 -07:00
Andrew Meadows
54851c5ced add Ragdoll::_accumulatedMovement 2014-08-18 12:49:12 -07:00
Clément Brisset
ddc67a8edb Merge pull request #3285 from AndrewMeadows/ragdoll 
Cleanup of Ragdoll API
 2014-08-18 12:36:27 -07:00
Atlante45
2eb1321cc2 Sound and AudioInjector tweaks 2014-08-18 12:28:44 -07:00
Andrzej Kapolka
b7bdaae691 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-18 11:40:16 -07:00
AndrewMeadows
4b7208ac53 Merge pull request #3280 from huffman/19907 
Code Review for Job #19907
 2014-08-18 10:20:01 -07:00
ZappoMan
a3bb8b1239 have partial elements set a stop reason of DIDNT_FIT to fix partial encoding issues 2014-08-18 09:37:07 -07:00
Atlante45
47685b0e88 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-17 12:56:19 -07:00
Andrzej Kapolka
a83ff45335 Working on custom encodings for subdivisions. 2014-08-15 18:09:58 -07:00
ZappoMan
f8f0da189f more work on more entities in a cell 2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4 work on reseved bytes in octree packet data 2014-08-15 11:26:55 -07:00
Philip Rosedale
28abc6ab2a Merge pull request #3290 from ey6es/metavoxels 
Big change in the way shared borders are handled in order to fix seams between blocks.  Fixes for height/ray queries.  Minimal rectangles for deltas, switch between PNG and deflated JPG encodings.
 2014-08-15 07:57:46 -07:00
Ryan Huffman
082f618479 Fix bug with KeyEvent key values on lowercase characters 2014-08-14 22:27:43 -07:00
Andrzej Kapolka
67266b41df Deflated JPEG encoding for blocks above 16x16. 2014-08-14 19:21:32 -07:00
Andrzej Kapolka
05d6b628fa Alllmost ready with the big edge sharing rejiggery. 2014-08-14 17:10:45 -07:00
AndrewMeadows
1a5230ef08 Merge pull request #3286 from birarda/mixer-analytics 
de-couple audio mixer packet receive thread from processing
 2014-08-14 16:42:21 -07:00
Atlante45
9e5b68fa9d Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 15:38:03 -07:00
Andrew Meadows
432c14408c removed hackery from ContactPoint enforcement 2014-08-14 15:29:57 -07:00
Andrew Meadows
98d27ad2b5 more correct names for ContactPoint API 
renamed (and disabled) the useless enforce() to applyFriction()
changed the buildConstraints() method to more correct name: enforce()
will eventually change how ContactPoint actually works, but later
 2014-08-14 15:17:03 -07:00
Andrew Meadows
60d411ead5 cleanup Ragdoll API (less "ragdoll" qualifiers) 2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9 split SkeletonModel and Ragdoll classes apart 2014-08-14 14:29:03 -07:00
Stephen Birarda
c58bae9021 attempt to change buffers to 1MB only 2014-08-14 14:27:09 -07:00
Stephen Birarda
1e65a093f2 decouple audio-mixer packet receipt from main thread 2014-08-14 12:37:57 -07:00
Atlante45
2981132395 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 11:39:44 -07:00
ZappoMan
abe892ddc3 quiet some debugging 2014-08-14 11:36:53 -07:00
ZappoMan
fbe409a0c2 added lots of debugging for octree edit packet sender bug fixed threading issue 2014-08-14 11:23:56 -07:00
Stephen Birarda
64c11ebf8f don't change the socket buffer sizes if it is already larger 2014-08-14 10:36:54 -07:00
Andrew Meadows
ee0d0a1566 remove ragdoll from simulation in dtor 2014-08-14 09:20:53 -07:00
Philip Rosedale
395f643f1b Merge pull request #3277 from AndrewMeadows/ragdoll 
Ragdoll Part 10: a little more stability
 2014-08-13 19:05:01 -07:00
ZappoMan
b7e258519b fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet 2014-08-13 17:12:03 -07:00
wangyix
81fa5ed41f readPendingDatagrams stats printed and sent to domain page 
jittertester now prints out send or receive error msgs
 2014-08-13 16:48:06 -07:00
Stephen Birarda
ec260dbab2 change both send and receive socket buffers 2014-08-13 15:50:11 -07:00
Andrzej Kapolka
62b84edc7f Brush fix. 2014-08-13 15:13:06 -07:00
Andrew Meadows
f66398d366 adding comment about parameter's purpose 2014-08-13 15:06:34 -07:00
Andrew Meadows
7852321152 merge upstream/master into andrew/ragdoll 2014-08-13 14:52:14 -07:00
Andrew Meadows
b177686f74 minor tweak to how ContactPoint is updated 2014-08-13 14:50:25 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
Andrew Meadows
2f1a56a87c ContactPoint tries to help maintain collisions 
so that collision events will continue to update the contact
 2014-08-13 13:48:04 -07:00
wangyix
b17c9102c9 added stats for readPendingDatagrams in audiomixer 2014-08-13 13:30:02 -07:00
Andrew Meadows
bc432aa8e8 use relative masses for ContactPoint contsrtaint 2014-08-13 11:29:54 -07:00
Andrew Meadows
4de43b7cbe cleanup and reordering of code 2014-08-13 11:19:32 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
Andrzej Kapolka
56c6c3c972 Working on the height/ray queries. 2014-08-13 11:05:48 -07:00
wangyix
a405cd9a72 repetition-with-fade ready for commit 2014-08-13 11:01:15 -07:00
wangyix
746893cc94 updateLastOutputLoudnessAndTrailingLoudness 2014-08-13 10:48:47 -07:00
wangyix
ddc8bec1ec moved lastpopframeloudness calculation to checkBuffersBeforeFrameSend 2014-08-13 10:41:25 -07:00
ZappoMan
4bdb8765f5 implement improved pruning on updates/moves/delete passes of the tree added some debug support 2014-08-13 10:29:25 -07:00
wangyix
f34f0a719b fixed lastPopOutput null ptr errors for frame loudness check 2014-08-13 10:26:01 -07:00
wangyix
23b3d06260 forgot null check for AudioMixer repeat mix of lastPopOutput 2014-08-13 09:46:49 -07:00
Andrzej Kapolka
21d6c3c48a More work on edge rejiggery. 2014-08-12 18:21:04 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
ff0a5df2d6 Joint rotations manipulation helper 2014-08-12 16:12:34 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
ZappoMan
6ce6d8ae47 dont try to create child elements that are smaller than the entities 2014-08-12 14:29:55 -07:00
ZappoMan
8339f1059e clean up more debugging noise 2014-08-12 13:29:14 -07:00
ZappoMan
3551bd676f quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds 2014-08-12 13:14:28 -07:00
wangyix
7f53ae0e4f fixed warnings 2014-08-12 12:22:13 -07:00
Andrzej Kapolka
ee01d85b5e Attempting to remove some number magic. 2014-08-12 12:01:07 -07:00
wangyix
8565e93ba4 more test code (10% drop both directions) 2014-08-12 10:50:34 -07:00
ZappoMan
76308738e0 added pruning support, some cleanup 2014-08-12 07:16:32 -07:00
Philip Rosedale
0e72c6a0b6 Merge pull request #3269 from ey6es/metavoxels 
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
 2014-08-12 00:40:14 -07:00
David Rowe
fbaeeef014 Merge branch 'master' into 19840 
Resolved conflicts in editModels.js
 2014-08-11 20:59:37 -07:00
Ryan Huffman
cb76e3ead0 Merge branch 'master' of github.com:highfidelity/hifi into 19907 2014-08-11 18:44:31 -07:00
Ryan Huffman
d1672b510d Add DomainHandler::disconnectedFromDomain signal 2014-08-11 18:41:07 -07:00
wangyix
a31d53544b repetition-with-fade seems good; continue testing 2014-08-11 17:58:01 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
Andrzej Kapolka
10315f15d4 Simplify image loading. 2014-08-11 15:15:33 -07:00
ZappoMan
466b4c5e40 add some basic support for coming to a rest on the ground plane in case of downward gravity 2014-08-11 14:52:19 -07:00
Andrzej Kapolka
ffe87ad8c6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-11 14:32:24 -07:00
Andrzej Kapolka
8804fa3710 Switch to PNG encoding, send only the changed portion of the image for deltas. 2014-08-11 14:29:53 -07:00
ZappoMan
779d846f1e add gravity to the editModels property 2014-08-11 13:27:19 -07:00
AndrewMeadows
0650169c25 Merge pull request #3270 from chansensturm/audio-filter 
Added support for biquad, parametric, and multi-band filter eq
 2014-08-11 12:22:40 -07:00
ZappoMan
b89c740e17 improved velocity behavior, handling lastUpdated better, changing state when velocity reaches zero 2014-08-11 11:56:05 -07:00
Craig Hansen-Sturm
3d95f28fb9 added apache licensing/removed implicit double<->float conversions/addressed style guide issues 2014-08-11 11:51:49 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
ZappoMan
7c8163c475 first cut at getting velocity to work in entity base class 2014-08-11 10:36:03 -07:00
AndrewMeadows
e5c2a099b8 Merge pull request #3268 from birarda/take-out-the-trash 
cmake (in)sanity
 2014-08-11 09:15:38 -07:00
wangyix
a1ea393324 added a comment 2014-08-11 09:14:01 -07:00
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -07:00
ZappoMan
a96aa5f937 clean up subclass properties, properly handle new baseclass props like damping 2014-08-10 14:20:37 -07:00
Ryan Huffman
fc82dfc958 Add Quat::rotate 2014-08-09 23:31:02 -07:00
wangyix
7a063b8bc8 scope seems to be working now using networkSamples 2014-08-08 18:16:25 -07:00
ZappoMan
55e12baf78 more base class properties work 2014-08-08 18:06:16 -07:00
ZappoMan
eda5614a75 implement readEntitySubclassDataFromBuffer() for BoxEntityItem 2014-08-08 17:59:32 -07:00
ZappoMan
2892c37210 implement readEntitySubclassDataFromBuffer() for EntityItem 2014-08-08 17:55:56 -07:00
ZappoMan
90c7989765 implement appendSubclassData() for EntityItem 2014-08-08 17:38:26 -07:00
wangyix
fea97f8fe8 added networkSamples buffer to MixedProcessedAudioStream 2014-08-08 17:17:30 -07:00
wangyix
7aa5a1f830 fixed function name 2014-08-08 17:02:13 -07:00
wangyix
4ec84b32b0 updated AudioRingBuffer bytes vs samples returns 2014-08-08 17:00:39 -07:00
wangyix
f71e1edd30 removed parseSilentPacketStreamProperties() 2014-08-08 16:46:12 -07:00
ZappoMan
ebc3013904 more work on more properties 2014-08-08 16:42:31 -07:00
ZappoMan
b509eed59a more property work 2014-08-08 16:20:03 -07:00
ZappoMan
914b20a862 more entity item base class properties 2014-08-08 15:57:43 -07:00
ZappoMan
f899dc1f79 moving entity edit packet encode/decode to the EntityItemProperties class 2014-08-08 15:41:55 -07:00
ZappoMan
275a5c4a47 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 15:13:55 -07:00
ZappoMan
b7767b7971 get referentials compiling with new Entity ID changes 2014-08-08 15:12:57 -07:00
wangyix
a2d66b9a8f fixed audio scope; added parseSilentPacketStreamProperties() 2014-08-08 14:55:38 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Andrzej Kapolka
b7910cfe74 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-08 14:20:38 -07:00
Andrzej Kapolka
468a3d4d67 Bump up the packet version. 2014-08-08 14:18:32 -07:00
Andrzej Kapolka
768410ca0b A couple comments, let right mouse button decrease height. 2014-08-08 14:14:35 -07:00
Andrzej Kapolka
e24ff0130f Basic color/height painting. 2014-08-08 14:10:44 -07:00
Stephen Birarda
d5b1bee13c resolve conflicts on merge with upstream master 2014-08-08 13:48:32 -07:00
wangyix
bf8188c6ff removed duplicate definition 2014-08-08 13:38:28 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
Stephen Birarda
d8dadc3199 link the socket library to the hifi networking library 2014-08-08 13:31:09 -07:00