Stephen Birarda
|
7ce91b3f96
|
fix headers who had their comments removed
|
2014-04-08 17:43:35 -07:00 |
|
Stephen Birarda
|
387179b38f
|
add Norman's tagline back to PrimitiveRenderer
|
2014-04-08 17:31:53 -07:00 |
|
Stephen Birarda
|
ab3a9af6bf
|
repair the starfield renderer
|
2014-04-08 17:31:30 -07:00 |
|
Stephen Birarda
|
638b49e47d
|
switch to apache license in root license file
|
2014-04-08 17:31:02 -07:00 |
|
Stephen Birarda
|
6a51df9e38
|
initial regex replacement of headers
|
2014-04-08 17:30:36 -07:00 |
|
Stephen Birarda
|
f3cbd120ce
|
header comment tweaks prior to regex match
|
2014-04-08 17:19:23 -07:00 |
|
Andrzej Kapolka
|
98011da1ef
|
Starting on Faceplus integration.
|
2014-04-08 17:07:45 -07:00 |
|
Atlante45
|
7e33ed0c91
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-08 16:35:46 -07:00 |
|
Atlante45
|
039450aeec
|
Checking model name is present in the .fst file
|
2014-04-08 16:35:07 -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 |
|
Thijs Wenker
|
6754a6ca69
|
Fixed some style
|
2014-04-08 23:45:27 +02:00 |
|
Stephen Birarda
|
6681754994
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-04-08 14:26:10 -07:00 |
|
Stephen Birarda
|
ea61ccff7f
|
add some more debugging when reading X509 cert files for DTLS
|
2014-04-08 14:10:04 -07:00 |
|
Stephen Birarda
|
e417e7670b
|
cleanup DomainServer debug during config parsing
|
2014-04-08 14:07:31 -07:00 |
|
Stephen Birarda
|
9ca864bb50
|
don't parse excluded types from config variant map
|
2014-04-08 14:05:26 -07:00 |
|
Stephen Birarda
|
9a9939c11a
|
repairs for assignment parsing from command line and JSON
|
2014-04-08 14:03:42 -07:00 |
|
Atlante45
|
8ad7c3b239
|
Moved ModelUploader to interface + New error messages
|
2014-04-08 14:03:27 -07:00 |
|
Stephen Birarda
|
c2ff438182
|
add a CL + JSON settings reader
|
2014-04-08 13:37:07 -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 |
|
Stephen Birarda
|
080b0d7221
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-04-08 10:28:14 -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 |
|