Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 04:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11556 commits 71 branches 56 tags 1.2 GiB
Commit graph

11556 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
cbfaf9709e Faceplus fixes. 2014-04-09 15:18:22 -07:00
Andrzej Kapolka
28d3eae12b Move Faceplus reading to its own thread to avoid blocking the main one. 2014-04-09 14:52:27 -07:00
Andrzej Kapolka
79455d5850 More Faceplus work. Starting to get results. 2014-04-09 13:07:02 -07:00
Andrzej Kapolka
4d9f3a4aee Added basic mappings to start off with. 2014-04-09 12:36:02 -07:00
Andrzej Kapolka
4deb052d5d More work on Faceplus integration. 2014-04-09 11:54:55 -07:00
Andrzej Kapolka
55e0035fc8 More progress on Faceplus integration. 2014-04-09 11:14:47 -07:00
Andrzej Kapolka
5b0e7f818d More work on Faceplus integration/cleaning up support for multiple face 
trackers.
 2014-04-08 18:03:49 -07:00
Andrzej Kapolka
98011da1ef Starting on Faceplus integration. 2014-04-08 17:07:45 -07:00
Philip Rosedale
220ccdf163 Merge pull request #2622 from ey6es/master 
Pull camera back to avoid head's intersecting near clip plane in full screen mirror mode.
 2014-04-08 15:48:06 -07:00
Andrzej Kapolka
94a7ded212 Slip in a fix for Windows build warnings on mtc-generated code. 2014-04-08 15:36:21 -07:00
Andrzej Kapolka
597d750af9 Better radius. 2014-04-08 15:25:10 -07:00
Andrzej Kapolka
083e9076a9 Missed a spot. 2014-04-08 15:17:05 -07:00
Andrzej Kapolka
faf8c35358 Head height's kind of screwy; let's use the eye position. 2014-04-08 15:01:56 -07:00
Andrzej Kapolka
add7bb26ed Use the head height to determine the pushback amount. 2014-04-08 14:55:46 -07:00
Andrzej Kapolka
5776514e6a Working on pushing the mirror camera back to prevent intersecting the near 
clip plane.  Closes #2617.
 2014-04-08 14:48:01 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
c865df8b82 Merge pull request #2613 from Atlante45/more_upload_work 
More upload work
 2014-04-08 08:16:07 -10:00
Brad Hefta-Gaub
d2e7f9e17b Merge pull request #2606 from ey6es/metavoxels 
Basic (meta)voxelization from a set of six rendered images.  Still needs tweaking, etc.
 2014-04-08 08:15:44 -10:00
Atlante45
22cab29d25 Code review 2014-04-08 11:06:48 -07:00
Andrzej Kapolka
ccd7106527 Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows 
build.
 2014-04-08 10:54:41 -07:00
Atlante45
eaca699a6d Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work 2014-04-08 10:35:23 -07:00
Atlante45
e1a1ff3988 Code review 2014-04-08 10:32:49 -07:00
Brad Hefta-Gaub
db1a622040 Merge pull request #2612 from Atlante45/fix_editVoxels_inspect_conflict 
Fix for editVoxels/inspect conflict
 2014-04-08 07:24:51 -10:00
Atlante45
ee5ebae89e Code review 2014-04-08 10:22:50 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Atlante45
174f37f531 Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed Merge pull request #2615 from ey6es/master 
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
 2014-04-08 07:20:00 -10:00
Andrzej Kapolka
5a61009099 Add metavoxel bandwidth to details. 2014-04-08 10:19:39 -07:00
Andrzej Kapolka
a157c67901 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 09:56:07 -07:00
Brad Hefta-Gaub
aad3085e08 Merge pull request #2611 from AndrewMeadows/avatar-speed 
fix for sometimes slow avatar
 2014-04-08 06:54:21 -10:00
Brad Hefta-Gaub
881383a5f2 Merge pull request #2609 from AndrewMeadows/avatar-interaction 
More details in JS collision events
 2014-04-08 06:52:04 -10:00
Brad Hefta-Gaub
247d8bc540 Merge pull request #2571 from birarda/ds-web 
put servers alphabetically first in node list
 2014-04-08 06:32:59 -10:00
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Atlante45
46f0e78039 Erased deprecated code 2014-04-07 17:28:03 -07:00
Atlante45
d213cd7840 More work on Undo/Redo 2014-04-07 17:10:15 -07:00
Atlante45
d7b3c8b8fa Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-07 17:02:00 -07:00
Andrew Meadows
bf0eb69e2c fix for sometimes slow avatar 2014-04-07 16:28:55 -07:00
Atlante45
3be2319081 Removed all the temporaryDir junk 2014-04-07 16:18:23 -07:00
Andrzej Kapolka
2a58a863fd Fix for rotation placement. 2014-04-07 15:48:34 -07:00
Andrzej Kapolka
15e9d45dc3 Switched from storing Euler angles to using quaternions along with a 
quaternion editor.  Also, use a default step of 0.01 for floats/doubles.
 2014-04-07 15:41:42 -07:00
Atlante45
56b0583600 Fix for editVoxels/inspect conflict 2014-04-07 14:42:35 -07:00
Atlante45
262c6d3206 Fixed double JSON callback when http error occurs 2014-04-07 14:35:13 -07:00
Andrzej Kapolka
0011276b0b Added back the download stats, which got lost in a merge. 2014-04-07 14:19:17 -07:00
Atlante45
e85703d25b Added feedback and a better success check 2014-04-07 13:48:28 -07:00
Atlante45
b21fe02fa2 Put ModelUploder on a different thread, not to block the rendering of the main window 2014-04-07 13:46:38 -07:00
Atlante45
cec99caa47 Added upload progress tracking to AccountManager via JSON 2014-04-07 13:45:30 -07:00
Andrew Meadows
84d7e39d72 merge upstream/master into avatar-interaction 2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Stephen Birarda
5adcf68752 sort nodes on DS page by their uptime 2014-04-07 09:08:51 -07:00
Stephen Birarda
97a919a0c2 Merge branch 'master' of https://github.com/highfidelity/hifi into ds-web 2014-04-07 08:45:51 -07:00