Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 10:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15645 commits 25 branches 0 tags 1.1 GiB
Commit graph

4712 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Andrzej Kapolka
56c6c3c972 Working on the height/ray queries. 2014-08-13 11:05:48 -07:00
Andrzej Kapolka
21d6c3c48a More work on edge rejiggery. 2014-08-12 18:21:04 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
Andrzej Kapolka
ee01d85b5e Attempting to remove some number magic. 2014-08-12 12:01:07 -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
Andrzej Kapolka
10315f15d4 Simplify image loading. 2014-08-11 15:15:33 -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
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
Craig Hansen-Sturm
3d95f28fb9 added apache licensing/removed implicit double<->float conversions/addressed style guide issues 2014-08-11 11:51:49 -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
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -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
Stephen Birarda
d8dadc3199 link the socket library to the hifi networking library 2014-08-08 13:31:09 -07:00
Stephen Birarda
6eb2c73624 add assert include to SharedUtil 2014-08-08 13:23:54 -07:00
Stephen Birarda
92b2fe6d68 remove ROOT_DIR param in include_glm, remove ROOT_DIR from root CMakeLists 2014-08-08 13:22:00 -07:00
Stephen Birarda
9d8818eee5 remove OpenSSL requirement from octree library 2014-08-08 13:18:32 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
27419b7b6b fix some build blockers in test directory 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
fc92b93326 fix typo in metavoxels library setup 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
a75a3f9434 don't look backwards for script-engine headers from particles library 2014-08-08 13:17:53 -07:00
Stephen Birarda
c63e886444 don't look backwards for fbx header from avatars library 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
93b6f167f5 change more CMakeLists to use simplified hifi library linker 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00