Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-27 07:06:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11679 commits 76 branches 59 tags 1.2 GiB
Commit graph

3395 commits

Author SHA1 Message Date
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
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -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
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -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
Stephen Birarda
f80a077637 fix memory overrun from silent sample writing 2014-03-18 13:33:29 -07:00
Andrzej Kapolka
24b2da1c0d Working on delta streaming. 2014-03-18 13:14:21 -07:00
Stephen Birarda
9fbb4f1428 spacing fix and silent sample read fix 2014-03-18 13:04:28 -07:00
Stephen Birarda
e7acd0bad3 don't use QDataStream in parseData since we don't really need it 2014-03-18 12:58:29 -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
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Andrzej Kapolka
a4cc15a2cd Collection streaming (untested). 2014-03-18 11:46:12 -07:00
Stephen Birarda
7ed982a073 cleanup writing of silent frame to ring buffer 2014-03-18 11:12:36 -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
b84499c83b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 10:18:12 -07:00
Andrzej Kapolka
6aa1f286bb Alpha is the new default. 2014-03-18 10:13:23 -07:00
Andrzej Kapolka
a38239b3d8 Working on collection streaming. 2014-03-18 10:11:25 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
b69c339279 don't send redundant head rot and hand pos info 2014-03-18 09:39:05 -07:00
Andrzej Kapolka
4ce953315b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 09:19:58 -07:00
ZappoMan
28766bebc8 pass down parents inFrustum() state to recursion to allow further optimization 2014-03-17 18:30:08 -07:00
Andrew Meadows
3296447af6 remove dupe hand data from avatar updates 
partial progress toward issue #2256
 2014-03-17 18:23:55 -07:00
ZappoMan
c09974bcda use parents inFrustum status to optimize children 2014-03-17 17:51:09 -07:00
Stephen Birarda
7ba595338e guard around update to last heard for a NULL matching node 2014-03-17 17:39:08 -07:00
Andrzej Kapolka
ec1e168423 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-17 17:30:14 -07:00
Andrzej Kapolka
d569802fbc More metadata fixes. 2014-03-17 17:21:46 -07:00
Stephen Birarda
7e0da71527 have agent optionally send silent stream flag 2014-03-17 16:38:39 -07:00
ZappoMan
9411519dc9 fix SimpleMovingAverage::reset() 2014-03-17 16:37:07 -07:00
Stephen Birarda
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
Andrzej Kapolka
eb95b01aa1 Fixes to, test for metadata streaming. 2014-03-17 16:10:30 -07:00
Andrzej Kapolka
d8b83fd308 More work on version-resilient type streaming. 2014-03-17 15:12:43 -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
679d09610c Merge upstream/master into "no hands" project. 2014-03-17 14:59:14 -07:00
Stephen Birarda
1428d2d1de take an absolute value for correct loudness 2014-03-17 14:35:04 -07:00
Stephen Birarda
bc9deb5db7 handle trivial case of not mixing silent audio streams 2014-03-17 14:29:53 -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
Andrzej Kapolka
61660f890e Working on metadata for metatypes. 2014-03-17 11:39:16 -07:00
ZappoMan
949678f74a Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:03:15 -07:00
Brad Hefta-Gaub
927006df91 Merge pull request #2331 from birarda/audio-scaling 
AudioMixer optimizations with MMX intrinsics
 2014-03-17 11:02:44 -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
96572d3752 fix some Q_OBJECT macros in class headers 2014-03-17 10:57:53 -07:00
ZappoMan
cbdd159213 fix constness 2014-03-17 10:55:43 -07:00
Stephen Birarda
8228d70248 resolve conflicts on merge with upstream master 2014-03-17 10:09:01 -07:00
ZappoMan
f8e38382a8 Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-16 19:37:41 -07:00
Andrzej Kapolka
95410d2b66 Cleaned up the preprocessor definitions. 2014-03-16 18:04:37 -07:00
Andrzej Kapolka
b21247ca67 Optional hash/full metadata streaming for QObjects. 2014-03-16 17:29:30 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
851764a705 more warning fixes 2014-03-15 22:36:43 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
ZappoMan
61a905961e darnit I hate casts.. 2014-03-14 22:48:32 -07:00
Brad Hefta-Gaub
1f77505871 more unix warnings cleanup 2014-03-14 18:35:34 -07:00
Andrzej Kapolka
35f57cb998 Working on streaming metadata. 2014-03-14 18:22:56 -07:00
Brad Hefta-Gaub
c6f8d34ded fix unix warning 2014-03-14 18:16:38 -07:00
Brad Hefta-Gaub
c0ee3fa1f0 fix unix warning 2014-03-14 18:14:54 -07:00
Brad Hefta-Gaub
0e7e337807 fixed uninitialized variable warning 2014-03-14 18:05:40 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
Atlante45
f07725d017 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-14 17:47:39 -07:00
Brad Hefta-Gaub
711e6ca3f5 clean up casts and types to fix warnings in a cleaner way 2014-03-14 17:43:55 -07:00
Atlante45
a88872a21f Simple class to download files (sync/async) 2014-03-14 17:41:22 -07:00
Andrzej Kapolka
fe3a3dc1b7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-14 16:23:46 -07: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
Andrzej Kapolka
ca95caebdc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-14 15:51:16 -07:00
Andrzej Kapolka
5aea9a670e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-14 15:17:39 -07:00
Andrew Meadows
d4c7e25f8e Merge branch upstream/master into "hands" project 2014-03-14 14:28:50 -07:00
Brad Hefta-Gaub
8f200e917b fix JS radians vs degrees issues 2014-03-14 13:03:14 -07:00
Andrew Meadows
a045a87cca Remove arm stretching, add sixense calibration 2014-03-14 11:11:00 -07:00
ZappoMan
0d4066a347 added note 2014-03-14 10:07:26 -07:00
ZappoMan
af71359c60 remove encode/deleting/start/done guards 2014-03-14 00:49:33 -07:00
ZappoMan
1f88ede1aa switch OctreeElementBag to use QSet as it's underlying data store 2014-03-14 00:47:50 -07:00
Atlante45
423f26f669 Review comments 2014-03-13 15:26:02 -07:00
Atlante45
e5b5778caf Upload FST 2014-03-13 15:04:22 -07:00
Atlante45
51585acd25 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 10:53:24 -07:00
Stephen Birarda
54d73d4a64 use floor since round is missing on windows 2014-03-12 17:50:58 -07:00
Stephen Birarda
bd6c42a685 define roundf for use on Win from ScriptEngine 2014-03-12 17:32:52 -07:00
Andrzej Kapolka
a67153caff Fix for bug with reliable messages. 2014-03-12 17:14:57 -07:00
Stephen Birarda
060d8be9f4 Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio 2014-03-12 17:07:21 -07:00
Stephen Birarda
3b653ca542 add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291 2014-03-12 17:00:12 -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
Andrzej Kapolka
6fb313cc43 Allow streaming uints. 2014-03-12 13:03:59 -07:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -07:00
Andrzej Kapolka
064f784db1 More OS X warning fixes. 2014-03-12 12:23:23 -07:00
Andrzej Kapolka
ffb9273da8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 12:11:43 -07:00
Andrzej Kapolka
4c7737443e Fix for OS X warning. 2014-03-12 12:11:30 -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
AndrewMeadows
b1f4edb3a5 Merge pull request #2271 from ZappoMan/QWaitCondition 
Fix runaway JurisdictionListener thread and other improvements
 2014-03-12 11:54:48 -07:00
Atlante45
3aa534d47c Added the send method 2014-03-12 11:48:41 -07: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
e72d3127bf fix comment and remove dead code 2014-03-11 21:25:30 -07:00
ZappoMan
025da315c6 removed dontSleep from JurisdictionListener 2014-03-11 21:11:47 -07:00
ZappoMan
8befefb054 first cut at making PacketSender use QWaitCondition 2014-03-11 20:45:46 -07:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
ZappoMan
f5cdb98efb switch ReceivedPacketProcessor to using QWaitCondition 2014-03-11 20:32:02 -07:00
Andrzej Kapolka
6c4223bcdf Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 18:12:12 -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
ZappoMan
0017625442 fix unix compiler issue 2014-03-11 16:48:49 -07:00
Dimitar Dobrev
60bf473be7 Improved the adherence to code conventions after a code review. 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
Dimitar Dobrev
07d3eb886a Added reading and storing of the XMPP password of the current user. 2014-03-12 01:16:10 +02: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
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
Andrzej Kapolka
66e322ec55 Added per-attribute LOD threshold multiplier; things like spanners need 
different LOD thresholds than, say, voxels.
 2014-03-11 12:21:58 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -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
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
802cc3eeed Some untested ray intersection bits. 2014-03-10 14:58:31 -07:00
Andrzej Kapolka
7fc55e5596 Better merging for normals. 2014-03-10 13:00:58 -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
Andrzej Kapolka
9731159b82 Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-10 10:57:48 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -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
ZappoMan
e2415642f0 temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager 2014-03-09 00:10:31 -08:00
ZappoMan
f4d487464a more constructor cleanup 2014-03-09 00:01:47 -08:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Atlante45
8faaa28bc1 FST ploader base 2014-03-07 11:55:02 -08:00
Andrew Meadows
9d2758ee14 fix warning about malformed case statement 2014-03-07 09:32:12 -08:00
Andrew Meadows
47e340dafe Merge upstream/master 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-07 09:16:33 -08:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -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
ZappoMan
c81bac2ac4 Merge pull request #2224 from birarda/resources 
cleanup switchToResourcesParentIfRequired hack
 2014-03-06 16:51:31 -08:00
Stephen Birarda
0f22168e42 Merge pull request #2230 from ey6es/master 
Add a five second download timeout timer: if that much time passes witho...
 2014-03-06 16:22:54 -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
Andrzej Kapolka
8ec7a5e600 When we time out, report the last received/total counts. 2014-03-06 15:08:34 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Andrzej Kapolka
787230c062 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:46:29 -08:00
Andrew Meadows
0b2c399713 memcmp() returns a signed int! 2014-03-06 14:33:59 -08:00
Andrzej Kapolka
1468bd1b49 Add a five second download timeout timer: if that much time passes without 
any progress, consider it an error.
 2014-03-06 14:31:13 -08:00
Andrew Meadows
868e92c0fa Merge upstream/master' into shapes branch 2014-03-06 12:45:43 -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
bca0ea1502 Adding per-palm penetration accumulator 2014-03-06 12:36:52 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -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
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
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
828159cdcb Merge pull request #2204 from ZappoMan/flocking_birds 
Flocking birds & more
 2014-03-05 18:01:41 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00
Andrzej Kapolka
60b0281095 Ordered visitation bits. 2014-03-05 17:12:02 -08:00
Stephen Birarda
ede32b5f1a resolve conflicts on merge with upstream master 2014-03-05 15:31:00 -08:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
Andrzej Kapolka
c4f29005a0 Working on subdivision. 2014-03-05 14:13:20 -08:00
Andrew Meadows
a014d7883e minor whitespace formatting 2014-03-05 07:05:27 -08:00
ZappoMan
cba55282db cleanup headers 2014-03-05 02:42:49 -08:00
ZappoMan
15b5bb4385 Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds 
Conflicts:
	examples/bot.js
 2014-03-05 02:21:40 -08:00
Andrzej Kapolka
63b4a2453b Lots of work on metavoxel LODs and spanners. 2014-03-04 21:27:13 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
Stephen Birarda
b78e723253 fix a NaN in ViewFrustum and BuckyBalls 2014-03-04 15:53:05 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
ZappoMan
c90d4a9514 fix failed lock causing particle collisions to not work 2014-03-04 15:07:30 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -08:00
Andrzej Kapolka
7a182ed659 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 13:10:23 -08:00
Stephen Birarda
a48185053e repair a typo in particles link to widgets lib 2014-03-04 12:42:08 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
57e217c7fb Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 12:10:12 -08:00
AndrewMeadows
ea0fe95baa Merge pull request #2191 from birarda/null-checks 
more null pointer cleanup
 2014-03-04 12:07:39 -08:00
Andrew Meadows
455ef15754 fix warning about signed/unsigned comparison 2014-03-04 12:05:00 -08:00
Andrew Meadows
0f586cc0fb fix warning about unused variable 2014-03-04 12:03:48 -08:00
ZappoMan
f7a0d878dd Merge pull request #2182 from Atlante45/local_voxels 
Local voxels
 2014-03-04 11:48:10 -08:00
Andrew Meadows
2ba05f2cb8 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 2014-03-04 11:45:31 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Andrzej Kapolka
6ff629dcfd Use different unused variable warning suppressor for GCC. 2014-03-04 11:23:44 -08:00
Andrzej Kapolka
13b712592f Use different unused variable warning suppressor for GCC. 2014-03-04 11:21:59 -08:00
Andrew Meadows
427cf02d03 Merge branch 'cleanup' to 'cleanup2' 2014-03-04 11:20:42 -08:00
Andrzej Kapolka
cbfc60d017 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 11:18:54 -08:00
Andrzej Kapolka
47fe928995 Workin on LOD support in streaming. 2014-03-04 11:18:31 -08:00
Andrew Meadows
1b2db1f7ab fix for warnings about signed/unsigned comparison 2014-03-04 11:07:15 -08:00
Andrew Meadows
c8149f95a3 fix warning for unused variable (we forgot to use it) 2014-03-04 11:06:23 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Andrew Meadows
78b92516d9 fix warning about signed/unsigned comparison 2014-03-04 10:43:49 -08:00
Andrew Meadows
5252f22d82 fix warning about signed/unsigned comparison 2014-03-04 10:42:10 -08:00
Stephen Birarda
f5aaad1f33 remove if checks in cases where delete handles null 2014-03-04 10:05:43 -08:00
Andrew Meadows
e22e022252 Fixing warnings and out-of-range index. 2014-03-04 09:55:32 -08:00
Andrew Meadows
343998a4a8 Adding virtual destructor to Shape class 2014-03-04 09:55:08 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Atlante45
de679b20ad Removed deadlock from merge 2014-03-03 18:48:11 -08:00
Atlante45
84f8e6ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 17:55:30 -08:00
Atlante45
357d71e637 Added stuff to localVoxelsExample.js 2014-03-03 17:52:49 -08:00
Andrew Meadows
f23dda7317 Less math for the same effect. 2014-03-03 17:34:16 -08:00
Andrzej Kapolka
dd679d52f3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:33:11 -08:00
Philip Rosedale
d38df21960 Merge pull request #2181 from ZappoMan/bugfixes 
particle deadlock and crash fixes a different way
 2014-03-03 17:31:29 -08:00
Andrzej Kapolka
dae8ed6417 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:27:16 -08:00
ZappoMan
d01090afbc reversing some changes 2014-03-03 17:13:06 -08:00
ZappoMan
493648b56e reversing some changes 2014-03-03 17:06:46 -08:00
Andrzej Kapolka
71931d85d9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:03:18 -08:00
Atlante45
f1ce034c35 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 16:47:42 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Andrzej Kapolka
f5eaa330d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-03 15:48:38 -08:00
Philip Rosedale
5c0ec0ff6b Merge pull request #2175 from ZappoMan/bugfixes 
Fixes to particle deadlock, and some other crashes
 2014-03-03 15:42:09 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we 
read from the cache, we're reading synchronously from a file.  Closes #2171.
 2014-03-03 15:16:13 -08:00
Andrzej Kapolka
9759cd70c0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-03 14:20:21 -08:00
ZappoMan
3684359c5f removed some debug 2014-03-03 13:57:05 -08:00
ZappoMan
98bf85173a more octree locking cleanup 2014-03-03 13:54:07 -08:00
Andrzej Kapolka
85083d74bc Fix for annoying "QThreadStorage" warning. 2014-03-03 13:39:01 -08:00
Stephen Birarda
1b7d24a79c keep known nodes alive when we receive a packet from them 2014-03-03 12:49:46 -08:00
ZappoMan
fd47602945 various particle crash and deadlock fixes 2014-03-03 12:49:34 -08:00
Stephen Birarda
5c1ba4264a Merge pull request #2173 from birarda/null-checks 
fix a flipped NULL pointer check
 2014-03-03 12:47:49 -08:00
Stephen Birarda
500f678595 fix a flipped null check 2014-03-03 12:47:26 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
ZappoMan
0285fe51e8 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-03-03 12:14:11 -08:00
ZappoMan
8e553c7497 fix potential crash in setIsOptionChecked() added support for positioning separators 2014-03-03 12:03:56 -08:00
Andrzej Kapolka
7fbcd7ce0b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 11:53:44 -08:00
Andrzej Kapolka
949e40a10e Revert complicated system of "soft" pointers, instead use hard references in 
write mappings and listen for object destruction.
 2014-03-03 11:44:45 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
Andrzej Kapolka
55dca45feb Working on tests for shared objects. 2014-03-03 10:20:50 -08:00
ZappoMan
372561195a remove voxel drumming from C++ 2014-03-03 04:00:06 -08:00
ZappoMan
59eefa314c add support for Audio.startDrumSound() to allow drum sound procedural audio in JS 2014-03-03 03:17:16 -08:00
ZappoMan
2c7d9d7a06 removed unneeded class declaration 2014-03-03 00:35:46 -08:00
ZappoMan
6ddc6132fd removed unneeded class def 2014-03-02 21:53:36 -08:00
ZappoMan
bde39d9832 expose getVoxelEnclosingPoint() to JS, and clean up JS version of findRayIntersection() 2014-03-02 20:28:20 -08:00
ZappoMan
f245aa6ac5 remove more cruft from VoxelSystem, move getElementEnclosingPoint() to Octree class where it belongs 2014-03-02 20:12:52 -08:00
ZappoMan
855e351f39 remove some ray pick helper code that was only used by hover voxel, main ray pick still exists 2014-03-02 19:37:40 -08:00
Andrzej Kapolka
f910c4471b Distinguish between "hard" and "soft" references to shared objects. Sending 
bitstreams use soft references and remove their mappings when only soft
references remain.
 2014-03-02 17:40:58 -08:00
ZappoMan
176270f639 more VoxelSystem vs VoxelTree cleanup 2014-03-02 16:51:40 -08:00
ZappoMan
f0e73d2f98 removed VoxelSystem::findRayIntersection() use tree directly 2014-03-02 15:46:33 -08:00
ZappoMan
9bd29bdd92 removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree 2014-03-02 15:34:36 -08:00
ZappoMan
ded7328959 clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly 2014-03-02 15:17:49 -08:00
ZappoMan
de0baddef6 remove scene utils from voxels 2014-03-02 13:42:33 -08:00
Andrzej Kapolka
7992d2796e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-02 12:48:03 -08:00
ZappoMan
5b72f01b99 more cruft removal getting rid of false color in VoxelTreeElement 2014-03-02 12:33:52 -08:00
ZappoMan
b66c346f20 more cruft removal 2014-03-02 12:19:50 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
64a3fb950b fix warning 2014-03-01 11:54:24 -08:00
Andrzej Kapolka
c1a89517a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-28 18:11:46 -08:00
Andrzej Kapolka
3ae98a81fc Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-28 17:03:15 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	libraries/shared/src/ResourceCache.cpp
 2014-02-28 16:58:43 -08:00
Andrzej Kapolka
d157428704 When we send data to the avatar mixer, send the tweaked head rotation. Closes 2014-02-28 16:58:22 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
d2faca9767 fixed some warnings 2014-02-28 16:17:30 -08:00
Andrzej Kapolka
2f27d8ecd3 Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
Atlante45
af691e1f75 Some comments and debug messages 2014-02-28 15:14:01 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Atlante45
fb10676121 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-28 11:32:27 -08:00
Atlante45
4a9415faeb Prevent users from modifying the domain tree with the LocalVoxels interface 2014-02-28 11:31:37 -08:00
Atlante45
20b921f4f8 Fixed typo 2014-02-28 11:26:17 -08:00
Atlante45
b854c450f4 Moved LocalVoxels class 2014-02-28 11:25:07 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
5d4ed4c85e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-27 18:14:18 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of 
resources being requested at any one time.
 2014-02-27 18:13:40 -08:00
Atlante45
2ee7974fa8 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 17:53:59 -08:00
Atlante45
11e80e0aaa Added getVoxelAt for LocalVoxels + handle the case of the domain tree 2014-02-27 17:52:44 -08:00
Andrew Meadows
b8c1bab4ae Using pre-computed Model shapes for collisions 
...instead of generating collision shapes on the fly
 2014-02-27 17:52:35 -08:00
Atlante45
b07081407a Made commom string name static const 2014-02-27 14:47:05 -08:00
Atlante45
b033432684 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 14:36:44 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
Andrzej Kapolka
3fefec5545 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-26 16:29:31 -08:00
Andrew Meadows
25bdfd7677 Update to comment. 2014-02-26 15:38:33 -08:00
Andrew Meadows
5954bb91d4 ListShape now handled by ShapeCollider 2014-02-26 15:36:19 -08:00
Andrzej Kapolka
4130d0f28b Added spheres as simpler spanners for testing. 2014-02-26 15:01:01 -08:00
Andrew Meadows
07eb366138 stubbed out collision handlers for ListShape 2014-02-26 14:32:46 -08:00
ZappoMan
d361c75b50 more work on seeing voxels 2014-02-26 14:16:22 -08:00
Philip Rosedale
b27e9b03d4 removed bad include 2014-02-26 14:15:00 -08:00
Andrzej Kapolka
9d95ff16b7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-26 13:50:32 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument 
Also, adding first pass at ListShape
 2014-02-26 12:10:16 -08:00
ZappoMan
dee9d48b5f adding OctreeHeadlessViewer::queryOctree() 2014-02-26 01:55:04 -08:00
ZappoMan
a28f016de0 removing VoxelQuery 2014-02-26 01:28:08 -08:00
ZappoMan
e96206914e early cut at headless viewers 2014-02-26 01:24:12 -08:00
ZappoMan
5fdfee4cd5 cleaning up some stuff 2014-02-26 00:48:38 -08:00
ZappoMan
cbca298717 cruft cleanup 2014-02-26 00:31:05 -08:00
ZappoMan
b08a1708f5 hide some slots from JS 2014-02-26 00:18:15 -08:00
ZappoMan
d765e250d5 removed AbstractMenuInterface.h 2014-02-25 20:42:59 -08:00
ZappoMan
42ddc82ac4 possible fix to windows assert 2014-02-25 20:23:38 -08:00
ZappoMan
4b3911c5c1 Merge pull request #2101 from birarda/authentication 
fixes to login/logout flow when jumping domains
 2014-02-25 18:25:17 -08:00
Stephen Birarda
bf3b5c07d5 Merge pull request #2093 from ZappoMan/menu_js 
Adds support for editing application Menus to JS
 2014-02-25 17:40:39 -08:00
ZappoMan
3943c49dcc rename MenuType and other CR feedback 2014-02-25 17:32:16 -08:00
Atlante45
96d4f38e42 Modified the Script engine for Local voxel handling 2014-02-25 16:29:59 -08:00
Atlante45
4130313618 Added meta object for js LocalVoxels object 2014-02-25 16:29:54 -08:00
Atlante45
80337d2409 Base classe for shared named trees 2014-02-25 16:29:48 -08:00
Stephen Birarda
d5fc1caaaf fix wording for access token change signal 2014-02-25 16:12:25 -08:00
Stephen Birarda
2496c6252f fix login/logout flow when jumping domains 2014-02-25 16:10:08 -08:00
Stephen Birarda
6d847f29fb currently support system wide auth only via hifi data-web 2014-02-25 16:05:05 -08:00
Stephen Birarda
6c27b99aba Merge pull request #2099 from birarda/authentication 
fix oauth early token expiry
 2014-02-25 14:45:02 -08:00
Stephen Birarda
d0269761b6 remove unecessary qDebug include 2014-02-25 14:39:33 -08:00
Stephen Birarda
27be157d70 fix oauth early token expiry 2014-02-25 14:38:19 -08:00
Philip Rosedale
6b128466a9 Merge pull request #2094 from birarda/authentication 
reset nodelist if domain-server stops talking to you, closes #2092
 2014-02-25 14:10:24 -08:00
Philip Rosedale
dd93eff26e Merge pull request #2096 from birarda/scripted-billboard 
add option for fake bot billboard from URL
 2014-02-25 14:07:39 -08:00
Andrzej Kapolka
5d7eadcca3 Working on better streaming for spanners. 2014-02-25 13:48:46 -08:00
Stephen Birarda
ee70c93a3e have scripted avatars send billboard, if they have one 2014-02-25 13:42:07 -08:00
Stephen Birarda
f2a70bf275 add support for billboard setting from URL 2014-02-25 13:38:20 -08:00
Philip Rosedale
70c1f8290e assume RAW audio if not processed as WAV 2014-02-25 13:21:02 -08:00
Stephen Birarda
ce3d6d2fca reset nodelist if domain-server stops talking to you, closes #2092 2014-02-25 13:07:39 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -08:00
Andrzej Kapolka
ad51016409 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-25 11:23:29 -08:00
Andrzej Kapolka
92ab3cd09a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-25 11:21:35 -08:00
Andrew Meadows
362708be60 fix another missing semicolon 2014-02-25 11:19:07 -08:00
Andrew Meadows
28d9fb9747 fix missing semicolon 2014-02-25 11:17:48 -08:00
Andrew Meadows
9a70a50bdb capsuleCapsule() collision with preliminary tests 2014-02-25 10:59:12 -08:00
Stephen Birarda
1163cfd07e if the domain-server provides no auth, assume default 2014-02-25 10:58:32 -08:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
ZappoMan
0b6e81b8a6 remove more cruft 2014-02-25 10:31:29 -08:00
ZappoMan
74d48ab239 added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement 2014-02-25 10:23:59 -08:00
Philip Rosedale
e637e48598 Merge pull request #2076 from birarda/authentication 
groundwork for secure node communication via data-server
 2014-02-25 10:07:55 -08:00
Stephen Birarda
45429fa1e1 fix default node auth URL 2014-02-25 09:38:22 -08:00
ZappoMan
a3d0c20516 better support for shortcuts 2014-02-24 20:49:06 -08:00
ZappoMan
09fc58763f Merge pull request #2054 from gaitat/19499 
Worklist Job #19499
 2014-02-24 19:10:31 -08:00
Andrzej Kapolka
3ca6c32c66 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-24 17:33:53 -08:00
Andrzej Kapolka
718439014a Compute the mesh extents for geometry and use them to set the spanner bounds. 2014-02-24 17:28:11 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Stephen Birarda
6d56ab3a30 use toDouble instead of toInt for Qt 5.1 compatibility 2014-02-24 15:27:12 -08:00
Stephen Birarda
672c6a9ed1 fix complaint for incomplete type QStringList 2014-02-24 15:23:47 -08:00
Stephen Birarda
c1b45d7eaa Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-24 15:18:21 -08:00
Stephen Birarda
f20808b47f remove option to drive from transmitter 2014-02-24 15:11:02 -08:00
Stephen Birarda
050d223b3a add domain connection reset to NodeList reset 2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b add auth to assignment-client, fix refresh of static assignments 2014-02-24 13:29:32 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Stephen Birarda
9dc460bab4 make multiple instances of scripted assignment use diff UUID 2014-02-24 11:56:14 -08:00
Andrew Meadows
8a3640f016 Adding CapsuleSphere collisions with tests. 2014-02-24 11:38:27 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00
Philip Rosedale
907740eb8e Merge pull request #2047 from ey6es/metavoxels 
Another metavoxel checkpoint: more work on streaming, editable attributes, changed to use existing session code, work on "spanners" (objects that span multiple octree nodes).
 2014-02-23 21:39:44 -08:00
Philip Rosedale
26541e12b6 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 21:08:54 -08:00
Andrzej Kapolka
ba327232d5 Fixed another Window signed/unsigned mismatch. 2014-02-23 21:07:00 -08:00
Andrzej Kapolka
5cf6c43414 Fix for Windows build error. 2014-02-23 20:29:54 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -08:00
ZappoMan
766a922fb3 add work around for voxel add of larger voxel on top of smaller voxels 2014-02-23 19:02:10 -08:00
ZappoMan
24a5cbfbfd Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js 
Conflicts:
	examples/editVoxels.js
 2014-02-23 18:32:53 -08:00
Philip Rosedale
9b463dd8cf Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78 Adding mouse wheel sizing voxel 2014-02-23 17:26:09 -08:00
Philip Rosedale
b0f3ab3ccd Merge pull request #2057 from ey6es/master 
I believe this is what was intended for the voxel edit orbit behavior.  Yaw the body, pitch the head.
 2014-02-23 17:22:07 -08:00
ZappoMan
892cc01dd9 added Voxels.getVoxelAt() to inspect local tree 2014-02-23 13:18:36 -08:00
ZappoMan
f1577d12a0 make changes to local tree in Voxels JS interface 2014-02-23 12:36:38 -08:00
ZappoMan
03d6173c90 add Voxels.getFaceVector() to JS 2014-02-23 11:38:23 -08:00
gaitat
a1e773eb2d Worklist Job #19499 
Kick of the build
 2014-02-23 11:24:45 -05:00
Andrew Meadows
0e28e0947c Adding ShapeColliderTests.* 2014-02-22 13:20:47 -08:00
gaitat
edd99f93de Worklist Job #19499 Mac compile fix 
third time's the charm
 2014-02-21 21:48:44 -05:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
gaitat
e2b20d2475 Worklist Job #19499 Mac compile fix 2014-02-21 21:13:31 -05:00