Brad Hefta-Gaub
c865df8b82
Merge pull request #2613 from Atlante45/more_upload_work
...
More upload work
2014-04-08 08:16:07 -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
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
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
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
Andrzej Kapolka
0011276b0b
Added back the download stats, which got lost in a merge.
2014-04-07 14:19:17 -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
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
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
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
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
ba4ccc22ef
Changed FstReader name to ModelUploader
2014-04-03 16:19:33 -07:00
AndrewMeadows
4a98f9f159
Merge pull request #2485 from kordero/19498
...
Code Review for Job #19498
2014-04-03 12:58:47 -07:00
Lucas Crisman
793179dc72
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-03 16:24:32 -03:00
Andrzej Kapolka
061d7719d4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-03 11:55:50 -07:00
Andrzej Kapolka
840847cf54
Don't refer to the QM file.
2014-04-03 11:42:43 -07:00
Andrzej Kapolka
22710af111
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/interface_en.ts
2014-04-03 11:37:27 -07:00
Andrzej Kapolka
df4fd9df5f
Remove translations for now, but use correct translation keys for the only
...
translations we had (days/weeks/etc.)
2014-04-03 11:30:06 -07:00
Andrzej Kapolka
407a6ecc70
More work on voxelizing.
2014-04-03 11:26:54 -07:00
Atlante45
df718c430a
Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata
2014-04-03 11:20:24 -07:00
Stephen Birarda
cc199364e2
Merge pull request #2596 from ddobrev/master
...
Informed users who want to chat they have to log in first
2014-04-03 10:27:37 -07:00
Dimitar Dobrev
716858e6f6
Informed users who want to chat they have to log in first.
2014-04-03 20:09:54 +03:00
Andrew Meadows
7a602aedd1
Fix crash: don't simulate until geometry exists
2014-04-03 09:06:49 -07:00
Andrzej Kapolka
4375fe85f1
Working on voxelizing spanners using a set of six rendered images.
2014-04-02 18:56:18 -07:00
Atlante45
4a1687c023
Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
Andrew Meadows
db40a955c9
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:50:08 -07:00
Andrew Meadows
aad945c180
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:45:01 -07:00
