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
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
Andrzej Kapolka
d4706bba8a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-08 10:21:13 -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
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
Andrzej Kapolka
404b804b2f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 16:41:43 -07:00
Andrzej Kapolka
2d535f3b86
Removed debugging code.
2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd
Extent tweaks.
2014-04-04 16:32:14 -07:00
Andrzej Kapolka
72d09a5cbe
Merge pull request #2605 from AndrewMeadows/say-no-to-warnings
...
removing a warning about hidden virtual override
2014-04-04 16:00:57 -07:00
Andrzej Kapolka
1c822542c1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 15:29:13 -07:00
Andrzej Kapolka
10288bce35
Merge pull request #2604 from AndrewMeadows/oculus-with-thrust
...
fix #2567 thrust + oculus doesn't change body rotation
2014-04-04 15:19:44 -07:00
Andrzej Kapolka
1f3a5d09d9
Merge pull request #2593 from Atlante45/display_models_metadata
...
Display models metadata
2014-04-04 15:18:18 -07:00
Andrew Meadows
403ad5e984
removing a warning about hidden virtual override
2014-04-04 15:18:12 -07:00
Andrew Meadows
01c42c741c
fix #2567 thrust + oculus doesn't change body rot
2014-04-04 14:46:54 -07:00
Andrzej Kapolka
468a4b79fd
Merge pull request #2603 from ey6es/master
...
Increase the rate at which we increase detail and put a limit on the LOD
2014-04-04 14:41:17 -07:00
Andrzej Kapolka
3a125db1f8
Increase the rate at which we increase detail and put a limit on the LOD
...
multiplier so that it never takes more than about five seconds to return to
default detail. Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
2014-04-04 14:31:30 -07:00
Andrzej Kapolka
a2b94aa433
Working on render modes.
2014-04-04 14:22:01 -07:00
Andrzej Kapolka
550a8fdb99
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 13:00:51 -07:00
Andrzej Kapolka
a0c7e4d3cc
Working on model rendering modes.
2014-04-04 11:45:03 -07:00
Andrew Meadows
5e2b8bb2c3
connect SIGNAL to SIGNAL to avoid forwarding slot
2014-04-04 10:43:06 -07:00
Andrew Meadows
f6c98a1cc2
fix bug in gun.js: unplayed target delete sound
2014-04-04 10:40:55 -07:00
Clément Brisset
a57002038b
Merge pull request #2601 from Atlante45/error_or_success_model_upload_msg
...
Error or success model upload msg
2014-04-04 10:16:42 -07:00
Andrzej Kapolka
38022d2440
Fix for voxelizing models.
2014-04-04 00:33:33 -07:00
Andrzej Kapolka
1bf19111dc
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34
Blend when setting.
2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012
Basic voxelization.
2014-04-03 23:47:31 -07:00
Atlante45
eb8cf15942
Merge branch 'error_or_success_model_upload_msg' of https://github.com/Atlante45/hifi into error_or_success_model_upload_msg
2014-04-03 16:19:41 -07:00
